Changeset 54070 in webkit

Timestamp:

Jan 29, 2010 10:13:10 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-29 Drew Wilson <​atwilson@chromium.org>

Reviewed by Adam Barth.

V8 implementation of MessageEvent.initMessageEvent() does not set source correctly.
​https://bugs.webkit.org/show_bug.cgi?id=34292

Test: fast/events/init-events.html will pass in Chrome now.

• bindings/v8/custom/V8MessageEventCustom.cpp: (WebCore::V8MessageEvent::initMessageEventCallback): Now properly extracts the reference to the DOMWindow object from the passed-in window parameter.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/custom/V8MessageEventCustom.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-29  Drew Wilson  <atwilson@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        V8 implementation of MessageEvent.initMessageEvent() does not set source correctly.
+        https://bugs.webkit.org/show_bug.cgi?id=34292
+
+        Test: fast/events/init-events.html will pass in Chrome now.
+
+        * bindings/v8/custom/V8MessageEventCustom.cpp:
+        (WebCore::V8MessageEvent::initMessageEventCallback):
+        Now properly extracts the reference to the DOMWindow object from the passed-in window parameter.
+
 2010-01-29  Ben Murdoch  <benm@google.com>
 

trunk/WebCore/bindings/v8/custom/V8MessageEventCustom.cpp

@@ -69 +69 @@
     String originArg = v8ValueToWebCoreString(args[4]);
     String lastEventIdArg = v8ValueToWebCoreString(args[5]);
-    DOMWindow* sourceArg = V8DOMWindow::HasInstance(args[6]) ? V8DOMWindow::toNative(v8::Handle<v8::Object>::Cast(args[6])) : 0;
+
+    DOMWindow* sourceArg = 0;
+    if (args[6]->IsObject()) {
+        v8::Handle<v8::Object> wrapper = v8::Handle<v8::Object>::Cast(args[6]);
+        v8::Handle<v8::Object> window = V8DOMWrapper::lookupDOMWrapper(V8ClassIndex::DOMWINDOW, wrapper);
+        if (!window.IsEmpty())
+            sourceArg = V8DOMWindow::toNative(window);
+    }
     OwnPtr<MessagePortArray> portArray;