Changeset 56780 in webkit

Timestamp:

Mar 30, 2010 6:08:22 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-30 Andrey Kosyakov <​caseq@chromium.org>

Reviewed by Pavel Feldman.

Support EventTarget interface in fake workers (both for Worker object
and WorkerContext). Use MessagePort to implement message passing to
support passing ports in PostMessage.
​https://bugs.webkit.org/show_bug.cgi?id=36763

• inspector/front-end/InjectedFakeWorker.js: (InjectedFakeWorker.Worker.onmessageGetter): (InjectedFakeWorker.Worker.onmessageSetter): (InjectedFakeWorker.Worker): (InjectedFakeWorker.FakeWorker): (InjectedFakeWorker.FakeWorker.prototype.postMessage): (InjectedFakeWorker.FakeWorker.prototype.terminate): (InjectedFakeWorker.FakeWorker.prototype._onWorkerFrameLoaded): (InjectedFakeWorker.FakeWorker.prototype._setupWorkerContext.onmessageGetter): (InjectedFakeWorker.FakeWorker.prototype._setupWorkerContext.onmessageSetter): (InjectedFakeWorker.FakeWorker.prototype._setupWorkerContext): (InjectedFakeWorker.FakeWorker.prototype._addEventListener): (InjectedFakeWorker.FakeWorker.prototype._removeEventListener): (InjectedFakeWorker.FakeWorker.prototype._callbackWrapper): (InjectedFakeWorker.FakeWorker.prototype._handleException):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/InjectedFakeWorker.js (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-30  Andrey Kosyakov  <caseq@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Support EventTarget interface in fake workers (both for Worker object
+        and WorkerContext). Use MessagePort to implement message passing to
+        support passing ports in PostMessage.
+        https://bugs.webkit.org/show_bug.cgi?id=36763
+
+        * inspector/front-end/InjectedFakeWorker.js:
+        (InjectedFakeWorker.Worker.onmessageGetter):
+        (InjectedFakeWorker.Worker.onmessageSetter):
+        (InjectedFakeWorker.Worker):
+        (InjectedFakeWorker.FakeWorker):
+        (InjectedFakeWorker.FakeWorker.prototype.postMessage):
+        (InjectedFakeWorker.FakeWorker.prototype.terminate):
+        (InjectedFakeWorker.FakeWorker.prototype._onWorkerFrameLoaded):
+        (InjectedFakeWorker.FakeWorker.prototype._setupWorkerContext.onmessageGetter):
+        (InjectedFakeWorker.FakeWorker.prototype._setupWorkerContext.onmessageSetter):
+        (InjectedFakeWorker.FakeWorker.prototype._setupWorkerContext):
+        (InjectedFakeWorker.FakeWorker.prototype._addEventListener):
+        (InjectedFakeWorker.FakeWorker.prototype._removeEventListener):
+        (InjectedFakeWorker.FakeWorker.prototype._callbackWrapper):
+        (InjectedFakeWorker.FakeWorker.prototype._handleException):
+
 2010-03-30  Kristian Monsen  <kristianm@google.com>
 

trunk/WebCore/inspector/front-end/InjectedFakeWorker.js

@@ -41 +41 @@
     this.postMessage = bind(impl.postMessage, impl);
     this.terminate = bind(impl.terminate, impl);
-    this.onmessage = noop;
+
+    function onmessageGetter()
+    {
+        return impl.channel.port1.onmessage;
+    }
+    function onmessageSetter(callback)
+    {
+        impl.channel.port1.onmessage = callback;
+    }
+    this.__defineGetter__("onmessage", onmessageGetter);
+    this.__defineSetter__("onmessage", onmessageSetter);
+    this.addEventListener = bind(impl.channel.port1.addEventListener, impl.channel.port1);
+    this.removeEventListener = bind(impl.channel.port1.removeEventListener, impl.channel.port1);
+    this.dispatchEvent = bind(impl.channel.port1.dispatchEvent, impl.channel.port1);
 }
 
@@ -49 +62 @@
 
     this._worker = worker;
+    this._id = InjectedScriptHost.nextWorkerId();
+    this.channel = new MessageChannel();
+    this._listeners = [];
     this._buildWorker(scriptURL);
-    this._id = InjectedScriptHost.nextWorkerId();
 
     InjectedScriptHost.didCreateWorker(this._id, scriptURL.url, false);
@@ -56 +71 @@
 
 FakeWorker.prototype = {
-    postMessage: function(msg)
+    postMessage: function(msg, opt_ports)
     {
         if (this._frame != null)
-            this._dispatchMessage(this._frame, bind(this._onmessageWrapper, this), msg);
+            this.channel.port1.postMessage.apply(this.channel.port1, arguments);
         else if (this._pendingMessages)
-            this._pendingMessages.push(msg)
+            this._pendingMessages.push(arguments)
         else
-            this._pendingMessages = [ msg ];
+            this._pendingMessages = [ arguments ];
     },
 
@@ -70 +85 @@
         InjectedScriptHost.didDestroyWorker(this._id);
 
-        if (this._frame != null) {
-            this._frame.onmessage = this._worker.onmessage = noop;
+        this.channel.port1.close();
+        this.channel.port2.close();
+        if (this._frame != null)
             this._frame.frameElement.parentNode.removeChild(this._frame.frameElement);
-        }
         this._frame = null;
         this._worker = null; // Break reference loop.
     },
 
-    _onmessageWrapper: function(msg)
+    _buildWorker: function(url)
+    {
+        var code = this._loadScript(url.url);
+        var iframeElement = document.createElement("iframe");
+        iframeElement.style.display = "none";
+
+        this._document = document;
+        iframeElement.onload = bind(this._onWorkerFrameLoaded, this, iframeElement, url, code);
+
+        if (document.body)
+            this._attachWorkerFrameToDocument(iframeElement, url, code);
+        else
+            window.addEventListener("load", bind(this._attachWorkerFrameToDocument, this, iframeElement), false);
+    },
+
+    _attachWorkerFrameToDocument: function(iframeElement)
+    {
+        document.body.appendChild(iframeElement);
+    },
+
+    _onWorkerFrameLoaded: function(iframeElement, url, code)
+    {
+        var frame = iframeElement.contentWindow;
+        this._frame = frame;
+        this._setupWorkerContext(frame, url);
+
+        var frameContents = '(function() { var location = __devtools.location; var window; ' + code + '})();\n' + '//@ sourceURL=' + url.url;
+
+        frame.eval(frameContents);
+        if (this._pendingMessages) {
+            for (var msg = 0; msg < this._pendingMessages.length; ++msg)
+                this.postMessage.apply(this, this._pendingMessages[msg]);
+            delete this._pendingMessages;
+        }
+    },
+
+    _setupWorkerContext: function(workerFrame, url)
+    {
+        workerFrame.__devtools = {
+            handleException: bind(this._handleException, this),
+            location: url.mockLocation()
+        };
+
+        var self = this;
+
+        function onmessageGetter()
+        {
+            return self.channel.port2.onmessage ? self.channel.port2.onmessage.originalCallback : null;
+        }
+
+        function onmessageSetter(callback)
+        {
+            var wrappedCallback = bind(self._callbackWrapper, self, callback);
+            wrappedCallback.originalCallback = callback;
+            self.channel.port2.onmessage = wrappedCallback;
+        }
+
+        workerFrame.__defineGetter__("onmessage", onmessageGetter);
+        workerFrame.__defineSetter__("onmessage", onmessageSetter);
+        workerFrame.addEventListener = bind(this._addEventListener, this);
+        workerFrame.removeEventListener = bind(this._removeEventListener, this);
+        workerFrame.dispatchEvent = bind(this.channel.port2.dispatchEvent, this.channel.port2);
+        workerFrame.postMessage = bind(this.channel.port2.postMessage, this.channel.port2);
+        workerFrame.importScripts = bind(this._importScripts, this, workerFrame);
+        workerFrame.close = bind(this.terminate, this);
+    },
+
+    _addEventListener: function(type, callback, useCapture)
+    {
+        var wrappedCallback = bind(this._callbackWrapper, this, callback);
+        wrappedCallback.originalCallback = callback;
+        wrappedCallback.type = type;
+        wrappedCallback.useCapture = Boolean(useCapture);
+
+        this.channel.port2.addEventListener(type, wrappedCallback, useCapture);
+        this._listeners.push(wrappedCallback);
+    },
+
+    _removeEventListener: function(type, callback, useCapture)
+    {
+        var listeners = this._listeners;
+        for (var i = 0; i < listeners.length; ++i) {
+            if (listeners[i].originalCallback === callback &&
+                listeners[i].type === type && 
+                listeners[i].useCapture === Boolean(useCapture)) {
+                this.channel.port2.removeEventListener(type, listeners[i], useCapture);
+                listeners[i] = listeners[listeners.length - 1];
+                listeners.pop();
+                break;
+            }
+        }
+    },
+
+    _callbackWrapper: function(callback, msg)
     {
         // Shortcut -- if no exception handlers installed, avoid try/catch so as not to obscure line number.
         if (!this._frame.onerror && !this._worker.onerror) {
-            this._frame.onmessage(msg);
+            callback(msg);
             return;
         }
 
         try {
-            this._frame.onmessage(msg);
+            callback(msg);
         } catch (e) {
             this._handleException(e, this._frame.onerror, this._worker.onerror);
         }
-    },
-
-    _dispatchMessage: function(targetWindow, handler, msg)
-    {
-        var event = this._document.createEvent("MessageEvent");
-        event.initMessageEvent("MessageEvent", false, false, msg);
-        targetWindow.setTimeout(handler, 0, event);
     },
 
@@ -114 +215 @@
 
         throw e;
-    },
-
-    _buildWorker: function(url)
-    {
-        var code = this._loadScript(url.url);
-        var iframeElement = document.createElement("iframe");
-        iframeElement.style.display = "none";
-
-        this._document = document;
-        iframeElement.onload = bind(this._onWorkerFrameLoaded, this, iframeElement, url, code);
-
-        if (document.body)
-            this._attachWorkerFrameToDocument(iframeElement, url, code);
-        else
-            window.addEventListener("load", bind(this._attachWorkerFrameToDocument, this, iframeElement), false);
-    },
-
-    _attachWorkerFrameToDocument: function(iframeElement)
-    {
-        document.body.appendChild(iframeElement);
-    },
-
-    _onWorkerFrameLoaded: function(iframeElement, url, code)
-    {
-        var frame = iframeElement.contentWindow;
-        this._frame = frame;
-        this._setupWorkerContext(frame, url);
-
-        var frameContents = '(function(location, window) { ' + code + '})(__devtools.location, undefined);\n' + '//@ sourceURL=' + url.url;
-
-        frame.eval(frameContents);
-        if (this._pendingMessages) {
-            for (var msg in this._pendingMessages)
-                this.postMessage(this._pendingMessages[msg]);
-            delete this._pendingMessages;
-        }
-    },
-
-    _setupWorkerContext: function(workerFrame, url)
-    {
-        workerFrame.__devtools = {
-            handleException: bind(this._handleException, this),
-            location: url.mockLocation()
-        };
-        var worker = this._worker;
-
-        function handler(event) // Late binding to onmessage desired, so no bind() here.
-        {
-            worker.onmessage(event);
-        }
-
-        workerFrame.onmessage = noop;
-        workerFrame.postMessage = bind(this._dispatchMessage, this, window, handler);
-        workerFrame.importScripts = bind(this._importScripts, this, workerFrame);
-        workerFrame.close = bind(this.terminate, this);
     },