Changeset 37971 in webkit

Timestamp:

Oct 29, 2008 3:44:22 AM (16 years ago)

Author:

ap@webkit.org

Message:

Reviewed by Darin Adler.

​https://bugs.webkit.org/show_bug.cgi?id=21921
MessagePort messages are dispatched to documents that are not fully active

Covered by corrected fast/events/message-port-inactive-document.html

• bindings/js/JSEventListener.cpp: (WebCore::JSAbstractEventListener::handleEvent): Don't dispatch messages to contexts that are not fully active.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/message-port-inactive-document.html (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/JSEventListener.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-10-29  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=21921
+        MessagePort messages are dispatched to documents that are not fully active
+
+        * fast/events/message-port-inactive-document.html: Protect the document from being
+        destructed in a working way (a global variable named "document" didn't do the trick due
+        to its name).
+
 2008-10-29  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/LayoutTests/fast/events/message-port-inactive-document.html

@@ -23 +23 @@
 }
 
-var document;
+var otherDocument;
 var mainPort;
 
 function test()
 {
-    document = window.frames[0].document;
+    otherDocument = window.frames[0].document;
     var channel = new MessageChannel;
     window.frames[0].postMessage("msg", channel.port2, "*");

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-10-29  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=21921
+        MessagePort messages are dispatched to documents that are not fully active
+
+        Covered by corrected fast/events/message-port-inactive-document.html
+
+        * bindings/js/JSEventListener.cpp:
+        (WebCore::JSAbstractEventListener::handleEvent): Don't dispatch messages to contexts
+        that are not fully active.
+
 2008-10-29  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/bindings/js/JSEventListener.cpp

@@ -62 +62 @@
     if (!frame)
         return;
+    // The window must still be active in its frame. See <https://bugs.webkit.org/show_bug.cgi?id=21921>.
+    // FIXME: A better fix for this may be to change DMOWindow::frame() to not return a frame the detached window used to be in.
+    if (frame->domWindow() != window->impl())
+        return;
     ScriptController* script = frame->script();
     if (!script->isEnabled() || script->isPaused())