Changeset 97955 in webkit

Timestamp:

Oct 20, 2011 2:57:28 AM (13 years ago)

Author:

haraken@chromium.org

Message:

Implement a MessageEvent constructor for V8
​https://bugs.webkit.org/show_bug.cgi?id=70296

Reviewed by Adam Barth.

Source/WebCore:

Test: fast/events/constructors/message-event-constructor.html

• bindings/v8/OptionsObject.cpp:

(WebCore::OptionsObject::getKeyValue): Returns RefPtr<DOMWindow> corresponding to a given key.
(WebCore::OptionsObject::getKeyValue): Returns MessagePortArray corresponding to a given key.

• bindings/v8/OptionsObject.h:
• bindings/v8/custom/V8EventConstructors.cpp: Added a MessageEvent constructor.
• dom/MessageEvent.idl: Makes MessageEvent constructible for V8.

LayoutTests:

Enabled message-event-constructor.html for chromium,
since now V8 has the MessageEvent constructor.

• platform/chromium/test_expectations.txt:
• platform/chromium/fast/events/constructors/message-event-constructor-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/fast/events/constructors/message-event-constructor-expected.txt (added)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/v8/OptionsObject.cpp (modified) (2 diffs)
• Source/WebCore/bindings/v8/OptionsObject.h (modified) (3 diffs)
• Source/WebCore/bindings/v8/custom/V8EventConstructors.cpp (modified) (3 diffs)
• Source/WebCore/dom/MessageEvent.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-10-20  Kentaro Hara  <haraken@chromium.org>
+
+        Implement a MessageEvent constructor for V8
+        https://bugs.webkit.org/show_bug.cgi?id=70296
+
+        Reviewed by Adam Barth.
+
+        Enabled message-event-constructor.html for chromium,
+        since now V8 has the MessageEvent constructor.
+
+        * platform/chromium/test_expectations.txt:
+        * platform/chromium/fast/events/constructors/message-event-constructor-expected.txt: Added.
+
 2011-10-20  Philippe Normand  <pnormand@igalia.com>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -74 +74 @@
 BUGWK60877 SKIP : loader/navigation-while-deferring-loads.html = FAIL
 BUGWK60877 SKIP : loader/load-defer-resume-crash.html = FAIL
-
-// This will soon be fixed after implementing a MessageEvent constructor for V8.
-BUGWK68883 : fast/events/constructors/message-event-constructor.html = FAIL
 
 // CSS3 Selectors3 test suite

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-20  Kentaro Hara  <haraken@chromium.org>
+
+        Implement a MessageEvent constructor for V8
+        https://bugs.webkit.org/show_bug.cgi?id=70296
+
+        Reviewed by Adam Barth.
+
+        Test: fast/events/constructors/message-event-constructor.html
+
+        * bindings/v8/OptionsObject.cpp:
+        (WebCore::OptionsObject::getKeyValue): Returns RefPtr<DOMWindow> corresponding to a given key.
+        (WebCore::OptionsObject::getKeyValue): Returns MessagePortArray corresponding to a given key.
+        * bindings/v8/OptionsObject.h:
+        * bindings/v8/custom/V8EventConstructors.cpp: Added a MessageEvent constructor.
+        * dom/MessageEvent.idl: Makes MessageEvent constructible for V8.
+
 2011-10-20  Peter Rybin  <peter.rybin@gmail.com>
 

trunk/Source/WebCore/bindings/v8/OptionsObject.cpp

@@ -29 +29 @@
 #include "DOMStringList.h"
 #include "V8Binding.h"
+#include "V8DOMWindow.h"
+#include "V8MessagePortCustom.h"
 #include <limits>
 
@@ -224 +226 @@
 }
 
+bool OptionsObject::getKeyValue(const String& key, RefPtr<DOMWindow>& value) const
+{
+    v8::Local<v8::Value> v8Value;
+    if (!getKey(key, v8Value))
+        return false;
+
+    DOMWindow* source = 0;
+    if (v8Value->IsObject()) {
+        v8::Handle<v8::Object> wrapper = v8::Handle<v8::Object>::Cast(v8Value);
+        v8::Handle<v8::Object> window = V8DOMWrapper::lookupDOMWrapper(V8DOMWindow::GetTemplate(), wrapper);
+        if (!window.IsEmpty())
+            source = V8DOMWindow::toNative(window);
+    }
+    value = source;
+    return true;
+}
+
+bool OptionsObject::getKeyValue(const String& key, MessagePortArray& value) const
+{
+    v8::Local<v8::Value> v8Value;
+    if (!getKey(key, v8Value))
+        return false;
+
+    return getMessagePortArray(v8Value, value);
+}
+
 } // namespace WebCore

trunk/Source/WebCore/bindings/v8/OptionsObject.h

@@ -27 +27 @@
 #define OptionsObject_h
 
+#include "MessagePort.h"
 #include "PlatformString.h"
 #include "ScriptValue.h"
@@ -34 +35 @@
 
 class DOMStringList;
+class DOMWindow;
 class IDBKeyRange;
 
@@ -81 +83 @@
     bool getKeyValue(const String&, unsigned&) const;
     bool getKeyValue(const String&, unsigned long long&) const;
+    bool getKeyValue(const String& key, RefPtr<DOMWindow>& value) const;
+    bool getKeyValue(const String& key, MessagePortArray& value) const;
 
 private:

trunk/Source/WebCore/bindings/v8/custom/V8EventConstructors.cpp

@@ -39 +39 @@
 #include "ErrorEvent.h"
 #include "HashChangeEvent.h"
+#include "MessageEvent.h"
 #include "Node.h"
 #include "OverflowEvent.h"
@@ -57 +58 @@
 #include "V8Event.h"
 #include "V8HashChangeEvent.h"
+#include "V8MessageEvent.h"
 #include "V8Node.h"
 #include "V8OverflowEvent.h"
@@ -130 +132 @@
 INSTANTIATE_INITIALIZING_CONSTRUCTOR_FOR_BEFORE_LOAD_EVENT(DICTIONARY_START, DICTIONARY_END, FILL_PARENT_PROPERTIES, FILL_PROPERTY)
 INSTANTIATE_INITIALIZING_CONSTRUCTOR_FOR_OVERFLOW_EVENT(DICTIONARY_START, DICTIONARY_END, FILL_PARENT_PROPERTIES, FILL_PROPERTY)
+INSTANTIATE_INITIALIZING_CONSTRUCTOR_FOR_MESSAGE_EVENT(DICTIONARY_START, DICTIONARY_END, FILL_PARENT_PROPERTIES, FILL_PROPERTY)
 
 

trunk/Source/WebCore/dom/MessageEvent.idl

@@ -31 +31 @@
         NoStaticTables,
         CanBeConstructed,
-        JSCustomConstructor
+        CustomConstructor
     ] MessageEvent : Event {
         readonly attribute DOMString origin;