Changeset 96061 in webkit

Timestamp:

Sep 26, 2011 6:36:08 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

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

Patch by Kentaro Hara <​haraken@chromium.org> on 2011-09-26
Reviewed by Adam Barth.

Source/WebCore:

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

• bindings/v8/OptionsObject.cpp:

(WebCore::OptionsObject::getKey): Just removed an extra space.
(WebCore::OptionsObject::getKeyValue): Returns an unsigned short value corresponding to the given key.

• bindings/v8/OptionsObject.h:
• bindings/v8/custom/V8EventConstructors.cpp: Added the CloseEvent constructor.
• websockets/CloseEvent.idl: Added a 'V8CustomConstructor' attribute.

LayoutTests:

Enabled close-event-constructor.html, since now V8 has the CloseEvent constructor.

• platform/chromium/test_expectations.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/v8/OptionsObject.cpp (modified) (1 diff)
• Source/WebCore/bindings/v8/OptionsObject.h (modified) (1 diff)
• Source/WebCore/bindings/v8/custom/V8EventConstructors.cpp (modified) (3 diffs)
• Source/WebCore/websockets/CloseEvent.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-26  Kentaro Hara  <haraken@chromium.org>
+
+        Implement a CloseEvent constructor for V8
+        https://bugs.webkit.org/show_bug.cgi?id=68793
+
+        Reviewed by Adam Barth.
+
+        Enabled close-event-constructor.html, since now V8 has the CloseEvent constructor.
+
+        * platform/chromium/test_expectations.txt:
+
 2011-09-26  Mihai Parparita  <mihaip@chromium.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -70 +70 @@
 BUGCR84572 SKIP : storage/storageinfo-request-quota.html = FAIL
 BUGCR84572 SKIP : storage/storageinfo-no-callbacks.html = FAIL
-
-// This will soon be fixed after implementing a CloseEvent constructor for V8.
-BUGWK68340 : fast/events/constructors/close-event-constructor.html = FAIL
 
 // Animation API is disabled.  Dean Jackson has promised (as of Aug. 25, 2011)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-26  Kentaro Hara  <haraken@chromium.org>
+
+        Implement a CloseEvent constructor for V8
+        https://bugs.webkit.org/show_bug.cgi?id=68793
+
+        Reviewed by Adam Barth.
+
+        Test: fast/events/constructors/close-event-constructor.html
+
+        * bindings/v8/OptionsObject.cpp:
+        (WebCore::OptionsObject::getKey): Just removed an extra space.
+        (WebCore::OptionsObject::getKeyValue): Returns an unsigned short value corresponding to the given key.
+        * bindings/v8/OptionsObject.h:
+        * bindings/v8/custom/V8EventConstructors.cpp: Added the CloseEvent constructor.
+        * websockets/CloseEvent.idl: Added a 'V8CustomConstructor' attribute.
+
 2011-09-26  Nate Chapin  <japhet@chromium.org>
 

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

@@ -176 +176 @@
         return false;
     value = options->Get(v8Key);
-    if (value.IsEmpty()) 
-        return false;
+    if (value.IsEmpty())
+        return false;
+    return true;
+}
+
+bool OptionsObject::getKeyValue(const String& key, unsigned short& value) const
+{
+    v8::Local<v8::Value> v8Value;
+    if (!getKey(key, v8Value))
+        return false;
+
+    v8::Local<v8::Int32> v8Int32 = v8Value->ToInt32();
+    if (v8Int32.IsEmpty())
+        return false;
+    value = static_cast<unsigned short>(v8Int32->Value());
     return true;
 }

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

@@ -78 +78 @@
         return true;
     }
+    bool getKeyValue(const String& key, unsigned short& value) const;
     bool getKeyValue(const String& key, unsigned long long& value) const;
 

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

@@ -32 +32 @@
 #include "EventConstructors.h"
 
+#include "CloseEvent.h"
 #include "CustomEvent.h"
 #include "Document.h"
@@ -43 +44 @@
 #include "V8Binding.h"
 #include "V8BindingMacros.h"
+#include "V8CloseEvent.h"
 #include "V8CustomEvent.h"
 #include "V8Document.h"
@@ -109 +111 @@
 INSTANTIATE_INITIALIZING_CONSTRUCTOR_FOR_WEBKIT_ANIMATION_EVENT(DICTIONARY_START, DICTIONARY_END, FILL_PARENT_PROPERTIES, FILL_PROPERTY)
 INSTANTIATE_INITIALIZING_CONSTRUCTOR_FOR_HASH_CHANGE_EVENT(DICTIONARY_START, DICTIONARY_END, FILL_PARENT_PROPERTIES, FILL_PROPERTY)
+INSTANTIATE_INITIALIZING_CONSTRUCTOR_FOR_CLOSE_EVENT(DICTIONARY_START, DICTIONARY_END, FILL_PARENT_PROPERTIES, FILL_PROPERTY)
 
 

trunk/Source/WebCore/websockets/CloseEvent.idl

@@ -34 +34 @@
         NoStaticTables,
         CanBeConstructed,
-        CustomConstructFunction
+        CustomConstructFunction,
+        V8CustomConstructor
     ] CloseEvent : Event {
         readonly attribute boolean wasClean;