Explorar o código

* Move message definition, must be available in web workers as well

Michaël Van Canneyt %!s(int64=3) %!d(string=hai) anos
pai
achega
729cd0db81
Modificáronse 2 ficheiros con 17 adicións e 15 borrados
  1. 2 15
      packages/rtl/web.pas
  2. 15 0
      packages/rtl/weborworker.pas

+ 2 - 15
packages/rtl/web.pas

@@ -48,6 +48,8 @@ Type
 
   TJSServiceWorker = weborworker.TJSServiceWorker;
   TJSServiceWorkerRegistration = weborworker.TJSServiceWorkerRegistration;
+  TJSMessageEvent = weborworker.TJSMessageEvent;
+  TJSMessagePortArray = TJSMessagePortDynArray;
 
   { TEventListenerEvent }
 
@@ -2944,22 +2946,7 @@ TEventListenerEvent = class external name 'EventListener_Event' (TJSObject)
     TJSWebSocket
     --------------------------------------------------------------------}
 
-  TJSMessagePortArray = Array of TJSMessagePort;
 
-  { TJSMessageEvent }
-
-  TJSMessageEvent = class external name 'MessageEvent' (TEventListenerEvent)
-  private
-    FData: JSValue; external name 'data';
-    FLastEventID: String; external name 'lastEventID';
-    FOrigin: String;  external name 'origin';
-    FPorts: TJSMessagePortArray; external name 'ports';
-  Public
-    Property Data : JSValue Read FData;
-    Property LastEventID : String Read FLastEventID;
-    Property Origin : String Read FOrigin;
-    Property Ports : TJSMessagePortArray Read FPorts;
-  end;
 
   TJSWebSocket = class external name 'WebSocket'  (TJSEventTarget)
   Private

+ 15 - 0
packages/rtl/weborworker.pas

@@ -131,6 +131,21 @@ type
   end;
   TJSMessagePortDynArray = Array of TJSMessagePort;
 
+  { TJSMessageEvent }
+
+  TJSMessageEvent = class external name 'MessageEvent' (TJSEvent)
+  private
+    FData: JSValue; external name 'data';
+    FLastEventID: String; external name 'lastEventID';
+    FOrigin: String;  external name 'origin';
+    FPorts: TJSMessagePortDynArray; external name 'ports';
+  Public
+    Property Data : JSValue Read FData;
+    Property LastEventID : String Read FLastEventID;
+    Property Origin : String Read FOrigin;
+    Property Ports : TJSMessagePortDynArray Read FPorts;
+  end;
+
   { TJSExtendableMessageEvent }
 
   TJSExtendableMessageEvent = class external name 'ExtendableMessageEvent' (TJSExtendableEvent)