Browser: Window: Added test for animation frame.

Moved MessagePort from Browser to Core since Node.js has it too.

Author: FunctionPoint

Browser/src/Test/TestMyWindow.st

@@ -18,9 +18,20 @@ onCanceledCallback
 	self assert: [ false ].
 !
 testAnimation
-	"Todo: Test this with Animation class:
-		requestAnimationFrame: callback
-		cancelAnimationFrame: requestId"
+	| window requestId |
+	window := Window default.
+	requestId := window requestAnimationFrame: [ :time | self onAnimationFrame: time ].
+	self assert: [ requestId class = Integer ].
+	requestId := window requestAnimationFrame: [ :time | self onCanceledAnimationFrame: time ].
+	"Cancel previous request before it executes."
+	window cancelAnimationFrame: requestId.
+!
+onAnimationFrame: time
+	self assert: [ ( time class = Float ) & ( time > 0 ) ].
+!
+onCanceledAnimationFrame: time
+	"This method should not get called."
+	self assert: [ false ].
 !
 testOtherMethods
 	| window element |

Smalltalk/Browser/Window/Window.st

@@ -174,7 +174,11 @@ cancelIdleCallback: handle
 "Animation."
 
 requestAnimationFrame: callback
-	INLINE 'this.js.requestAnimationFrame( callback.js )'.
+	"Callback should have 1 argument: the frame timestamp in milliseconds.
+	 Returns the request id, to be used with cancelAnimationFrame:."
+	| jsCallback |
+	jsCallback := [ :jsTime | callback value: ( Float fromJs: jsTime ) ].
+	^ Integer fromJs: INLINE 'this.js.requestAnimationFrame( jsCallback.js )'.
 !
 cancelAnimationFrame: requestId
 	INLINE 'this.js.cancelAnimationFrame( requestId.js )'.

Smalltalk/Browser/Workers/Test/MyTestSharedWorker.st

@@ -11,7 +11,7 @@ start
 !
 onConnect: event
 	| port |
-	port := ( event portsAs: MessagePort ) first.
+	port := event ports first.
 	port onMessage: [ :messageEvent | self onMessage: messageEvent port: port ].
 !
 onMessage: event port: port

Smalltalk/Browser/Workers/Test/MyTestWorker.st

@@ -18,7 +18,7 @@ onMessage: event
 
 	"Reply on the port transferred with the message."
 	message = 'Port' ifTrue: [
-		port := ( event portsAs: MessagePort ) first.
+		port := event ports first.
 		port postMessage: 'Hello, port!'.
 		port close ].
 

…lltalk/Browser/Workers/MessageChannel.st Smalltalk/Core/Event/MessageChannel.stSmalltalk/Browser/Workers/MessageChannel.st renamed to Smalltalk/Core/Event/MessageChannel.st Smalltalk/Browser/Workers/MessageChannel.st renamed to Smalltalk/Core/Event/MessageChannel.st

@@ -1,4 +1,4 @@
-CLASS MessageChannel EXTENDS JsObject MODULE Browser CLASSVARS '' VARS ''
+CLASS MessageChannel EXTENDS JsObject MODULE Core CLASSVARS '' VARS ''
 
 "Implements JS MessageChannel: a channel with 2 entangled MessagePorts.
  A message posted on one port is received on the other port."

Smalltalk/Core/Event/MessageEvent.st

@@ -24,12 +24,8 @@ origin
 	^ String fromJs: INLINE 'this.js.origin'.
 !
 ports
-	"The ports are MessagePorts of the platform (Browser or Node).
-	 Use portsAs: to get them as instances of a specific ST class."
-	^ self portsAs: EventTarget.
-!
-portsAs: elementClass
-	^ Array fromJs: INLINE 'this.js.ports' elementClass: elementClass.
+	"The MessagePorts transferred with the message."
+	^ Array fromJs: INLINE 'this.js.ports' elementClass: MessagePort.
 !
 source
 	"A MessagePort, WindowProxy or ServiceWorker, or nil."

Smalltalk/Browser/Workers/MessagePort.st Smalltalk/Core/Event/MessagePort.stSmalltalk/Browser/Workers/MessagePort.st renamed to Smalltalk/Core/Event/MessagePort.st

@@ -1,4 +1,4 @@
-CLASS MessagePort EXTENDS EventTarget MODULE Browser CLASSVARS '' VARS ''
+CLASS MessagePort EXTENDS EventTarget MODULE Core CLASSVARS '' VARS ''
 
 "Implements JS MessagePort: one of the two ports of a MessageChannel."
 

…owser/Workers/Test/TestMessageChannel.st …lk/Core/Event/Test/TestMessageChannel.stSmalltalk/Browser/Workers/Test/TestMessageChannel.st renamed to Smalltalk/Core/Event/Test/TestMessageChannel.st Smalltalk/Browser/Workers/Test/TestMessageChannel.st renamed to Smalltalk/Core/Event/Test/TestMessageChannel.st

@@ -1,4 +1,4 @@
-CLASS TestMessageChannel EXTENDS Test MODULE TestBrowser CLASSVARS '' VARS ''
+CLASS TestMessageChannel EXTENDS Test MODULE TestCore CLASSVARS '' VARS ''
 
 METHODS
 

Smalltalk/Core/Event/Test/TestMessageEvent.st

@@ -26,15 +26,13 @@ testOptions
 !
 testPortsAndSource
 	| jsChannel options event jsPort jsSource |
-	"MessageChannel is not in Core, but its JS class exists in both Browser and Node."
-	jsChannel := INLINE 'new MessageChannel()'.
+	jsChannel := MessageChannel new js.
 	options := JsObject fromJs: INLINE '{ ports: [ jsChannel.port1 ], source: jsChannel.port2 }'.
 	event := MessageEvent type: 'message' options: options.
 	self assert: [ event ports length = 1 ].
-	self assert: [ event ports first class = EventTarget ].
+	self assert: [ event ports first class = MessagePort ].
 	jsPort := event ports first js.
 	self assert: [ Boolean fromJs: INLINE 'jsPort === jsChannel.port1' ].
-	self assert: [ ( event portsAs: JsObject ) first class = JsObject ].
 	self assert: [ event source class = EventTarget ].
 	jsSource := event source js.
 	self assert: [ Boolean fromJs: INLINE 'jsSource === jsChannel.port2' ].

…/Browser/Workers/Test/TestMessagePort.st …ltalk/Core/Event/Test/TestMessagePort.stSmalltalk/Browser/Workers/Test/TestMessagePort.st renamed to Smalltalk/Core/Event/Test/TestMessagePort.st Smalltalk/Browser/Workers/Test/TestMessagePort.st renamed to Smalltalk/Core/Event/Test/TestMessagePort.st

@@ -1,4 +1,4 @@
-CLASS TestMessagePort EXTENDS Test MODULE TestBrowser CLASSVARS '' VARS ''
+CLASS TestMessagePort EXTENDS Test MODULE TestCore CLASSVARS '' VARS ''
 
 "Most MessagePort tests are async: the asserts run in the message handlers."