Changeset 150580 in webkit

Timestamp:

May 23, 2013 5:22:23 AM (11 years ago)

Author:

Christophe Dumez

Message:

Remove special case for MessagePortArray from bindings generator
​https://bugs.webkit.org/show_bug.cgi?id=116653

Reviewed by Kentaro Hara.

Use MessagePort[] instead of MessagePortArray type in the IDL as MessagePortArray
is not defined on IDL side. This allows us to remove the special case for
MessagePortArray from the bindings generator.

No new tests, no behavior change.

• bindings/js/JSMessageEventCustom.cpp:

(WebCore::JSMessageEvent::data):

• bindings/scripts/CodeGeneratorJS.pm:

(NativeToJSValue): Remove special case for MessagePortArray.

• bindings/scripts/test/CPP/WebDOMTestSerializedScriptValueInterface.cpp:
• bindings/scripts/test/CPP/WebDOMTestSerializedScriptValueInterface.h:

(WebDOMTestSerializedScriptValueInterface):

• bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp:

(webkit_dom_test_serialized_script_value_interface_get_property):
(webkit_dom_test_serialized_script_value_interface_class_init):

• bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h:
• bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:

(WebCore::jsTestSerializedScriptValueInterfacePorts):

• bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.h:
• bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.mm:
• bindings/scripts/test/TestSerializedScriptValueInterface.idl: Replace MessagePortArray

by MessagePort[].

• dom/MessageEvent.h:

(WebCore::MessageEvent::ports): The method should return a Vector, not a Vector*
as the array on JavaScript side is not nullable.

• dom/MessageEvent.idl: Replace MessagePortArray by MessagePort[].

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSMessageEventCustom.cpp (modified) (1 diff)
• bindings/scripts/CodeGeneratorJS.pm (modified) (2 diffs)
• bindings/scripts/test/CPP/WebDOMTestSerializedScriptValueInterface.cpp (modified) (2 diffs)
• bindings/scripts/test/CPP/WebDOMTestSerializedScriptValueInterface.h (modified) (2 diffs)
• bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp (modified) (5 diffs)
• bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h (modified) (1 diff)
• bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp (modified) (1 diff)
• bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.h (modified) (2 diffs)
• bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.mm (modified) (3 diffs)
• bindings/scripts/test/TestSerializedScriptValueInterface.idl (modified) (1 diff)
• dom/MessageEvent.h (modified) (1 diff)
• dom/MessageEvent.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-23  Christophe Dumez  <ch.dumez@sisa.samsung.com>
+
+        Remove special case for MessagePortArray from bindings generator
+        https://bugs.webkit.org/show_bug.cgi?id=116653
+
+        Reviewed by Kentaro Hara.
+
+        Use MessagePort[] instead of MessagePortArray type in the IDL as MessagePortArray
+        is not defined on IDL side. This allows us to remove the special case for
+        MessagePortArray from the bindings generator.
+
+        No new tests, no behavior change.
+
+        * bindings/js/JSMessageEventCustom.cpp:
+        (WebCore::JSMessageEvent::data):
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (NativeToJSValue): Remove special case for MessagePortArray.
+        * bindings/scripts/test/CPP/WebDOMTestSerializedScriptValueInterface.cpp:
+        * bindings/scripts/test/CPP/WebDOMTestSerializedScriptValueInterface.h:
+        (WebDOMTestSerializedScriptValueInterface):
+        * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp:
+        (webkit_dom_test_serialized_script_value_interface_get_property):
+        (webkit_dom_test_serialized_script_value_interface_class_init):
+        * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h:
+        * bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
+        (WebCore::jsTestSerializedScriptValueInterfacePorts):
+        * bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.h:
+        * bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.mm:
+        * bindings/scripts/test/TestSerializedScriptValueInterface.idl: Replace MessagePortArray
+        by MessagePort[].
+        * dom/MessageEvent.h:
+        (WebCore::MessageEvent::ports): The method should return a Vector, not a Vector*
+        as the array on JavaScript side is not nullable.
+        * dom/MessageEvent.idl: Replace MessagePortArray by MessagePort[].
+
 2013-05-23  Michał Pakuła vel Rutka  <m.pakula@samsung.com>
 

trunk/Source/WebCore/bindings/js/JSMessageEventCustom.cpp

@@ -64 +64 @@
     case MessageEvent::DataTypeSerializedScriptValue:
         if (RefPtr<SerializedScriptValue> serializedValue = event->dataAsSerializedScriptValue()) {
-            MessagePortArray* ports = static_cast<MessageEvent*>(impl())->ports();
-            result = serializedValue->deserialize(exec, globalObject(), ports, NonThrowing);
+            MessagePortArray ports = static_cast<MessageEvent*>(impl())->ports();
+            result = serializedValue->deserialize(exec, globalObject(), &ports, NonThrowing);
         }
         else

trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -3586 +3586 @@
         }
         AddToImplIncludes("<runtime/JSArray.h>", $conditional);
+
         return "jsArray(exec, $thisValue->globalObject(), $value)";
     }
@@ -3603 +3604 @@
         AddToImplIncludes("SerializedScriptValue.h", $conditional);
         return "$value ? $value->deserialize(exec, castedThis->globalObject(), 0) : jsNull()";
-    } elsif ($type eq "MessagePortArray") {
-        AddToImplIncludes("MessagePort.h", $conditional);
-        AddToImplIncludes("JSMessagePort.h", $conditional);
-        AddToImplIncludes("<runtime/JSArray.h>", $conditional);
-        return "$value ? jsArray(exec, $globalObject, *$value) : constructEmptyArray(exec, 0, castedThis->globalObject())";
     } else {
         # Default, include header with same name.

trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestSerializedScriptValueInterface.cpp

@@ -25 +25 @@
 #include "WebDOMTestSerializedScriptValueInterface.h"
 
-#include "MessagePortArray.h"
 #include "SerializedScriptValue.h"
 #include "TestSerializedScriptValueInterface.h"
-#include "WebDOMMessagePortArray.h"
 #include "WebExceptionHandler.h"
 #include <wtf/GetPtr.h>
@@ -118 +116 @@
 }
 
-WebDOMMessagePortArray WebDOMTestSerializedScriptValueInterface::ports() const
-{
-    if (!impl())
-        return WebDOMMessagePortArray();
-
-    return toWebKit(WTF::getPtr(impl()->ports()));
-}
-
 WebDOMString WebDOMTestSerializedScriptValueInterface::cachedReadonlyValue() const
 {

trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestSerializedScriptValueInterface.h

@@ -33 +33 @@
 };
 
-class WebDOMMessagePortArray;
 class WebDOMString;
 
@@ -49 +48 @@
     WebDOMString cachedValue() const;
     void setCachedValue(const WebDOMString&);
-    WebDOMMessagePortArray ports() const;
     WebDOMString cachedReadonlyValue() const;
 

trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp

@@ -26 +26 @@
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
-#include "WebKitDOMMessagePortArrayPrivate.h"
 #include "WebKitDOMPrivate.h"
 #include "WebKitDOMSerializedScriptValuePrivate.h"
@@ -79 +78 @@
     PROP_READONLY_VALUE,
     PROP_CACHED_VALUE,
-    PROP_PORTS,
     PROP_CACHED_READONLY_VALUE,
 };
@@ -124 +122 @@
 #if ENABLE(Condition1) || ENABLE(Condition2)
         RefPtr<WebCore::SerializedScriptValue> ptr = coreSelf->cachedValue();
-        g_value_set_object(value, WebKit::kit(ptr.get()));
-#else
-        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
-        WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
-        break;
-    }
-    case PROP_PORTS: {
-#if ENABLE(Condition1) || ENABLE(Condition2)
-        RefPtr<WebCore::MessagePortArray> ptr = coreSelf->ports();
         g_value_set_object(value, WebKit::kit(ptr.get()));
 #else
@@ -198 +186 @@
                                                            WEBKIT_PARAM_READWRITE));
     g_object_class_install_property(gobjectClass,
-                                    PROP_PORTS,
-                                    g_param_spec_object("ports", /* name */
-                                                           "test_serialized_script_value_interface_ports", /* short description */
-                                                           "read-only  WebKitDOMMessagePortArray* TestSerializedScriptValueInterface.ports", /* longer - could do with some extra doc stuff here */
-                                                           WEBKIT_TYPE_DOM_MESSAGE_PORT_ARRAY, /* gobject type */
-                                                           WEBKIT_PARAM_READABLE));
-    g_object_class_install_property(gobjectClass,
                                     PROP_CACHED_READONLY_VALUE,
                                     g_param_spec_object("cached-readonly-value", /* name */
@@ -299 +280 @@
 }
 
-WebKitDOMMessagePortArray*
-webkit_dom_test_serialized_script_value_interface_get_ports(WebKitDOMTestSerializedScriptValueInterface* self)
-{
-#if ENABLE(Condition1) || ENABLE(Condition2)
-    WebCore::JSMainThreadNullState state;
-    g_return_val_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self), 0);
-    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
-    RefPtr<WebCore::MessagePortArray> gobjectResult = WTF::getPtr(item->ports());
-    return WebKit::kit(gobjectResult.get());
-#else
-    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
-    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-    return 0;
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
-}
-
 WebKitDOMSerializedScriptValue*
 webkit_dom_test_serialized_script_value_interface_get_cached_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self)

trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h

@@ -103 +103 @@
 
 /**
- * webkit_dom_test_serialized_script_value_interface_get_ports:
- * @self: A #WebKitDOMTestSerializedScriptValueInterface
- *
- * Returns: (transfer none):
- *
-**/
-WEBKIT_API WebKitDOMMessagePortArray*
-webkit_dom_test_serialized_script_value_interface_get_ports(WebKitDOMTestSerializedScriptValueInterface* self);
-
-/**
  * webkit_dom_test_serialized_script_value_interface_get_cached_readonly_value:
  * @self: A #WebKitDOMTestSerializedScriptValueInterface

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp

@@ -180 +180 @@
     UNUSED_PARAM(exec);
     TestSerializedScriptValueInterface* impl = static_cast<TestSerializedScriptValueInterface*>(castedThis->impl());
-    JSValue result = impl->ports() ? jsArray(exec, castedThis->globalObject(), *impl->ports()) : constructEmptyArray(exec, 0, castedThis->globalObject());
+    JSValue result = jsArray(exec, castedThis->globalObject(), impl->ports());
     return result;
 }

trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.h

@@ -29 +29 @@
 #if WEBKIT_VERSION_MAX_ALLOWED >= WEBKIT_VERSION_LATEST
 
-@class DOMMessagePortArray;
 @class NSString;
 
@@ -36 +35 @@
 @property(readonly, retain) NSString *readonlyValue;
 @property(retain) NSString *cachedValue;
-@property(readonly, retain) DOMMessagePortArray *ports;
 @property(readonly, retain) NSString *cachedReadonlyValue;
 @end

trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.mm

@@ -37 +37 @@
 #import "DOMCSSValueInternal.h"
 #import "DOMEventInternal.h"
-#import "DOMMessagePortArrayInternal.h"
 #import "DOMNodeInternal.h"
 #import "DOMStyleSheetInternal.h"
@@ -43 +42 @@
 #import "ExceptionHandlers.h"
 #import "JSMainThreadExecState.h"
-#import "MessagePortArray.h"
 #import "SerializedScriptValue.h"
 #import "TestSerializedScriptValueInterface.h"
@@ -106 +104 @@
 }
 
-- (DOMMessagePortArray *)ports
-{
-    WebCore::JSMainThreadNullState state;
-    return kit(WTF::getPtr(IMPL->ports()));
-}
-
 - (NSString *)cachedReadonlyValue
 {

trunk/Source/WebCore/bindings/scripts/test/TestSerializedScriptValueInterface.idl

@@ -32 +32 @@
     readonly attribute SerializedScriptValue readonlyValue;
     [CachedAttribute] attribute SerializedScriptValue cachedValue;
-    readonly attribute MessagePortArray ports;
+    readonly attribute MessagePort[] ports;
     [CachedAttribute] readonly attribute SerializedScriptValue cachedReadonlyValue;
 };

trunk/Source/WebCore/dom/MessageEvent.h

@@ -89 +89 @@
     const String& lastEventId() const { return m_lastEventId; }
     DOMWindow* source() const { return m_source.get(); }
-    MessagePortArray* ports() const { return m_ports.get(); }
+    MessagePortArray ports() const { return m_ports ? *m_ports : MessagePortArray(); }
 
     // FIXME: Remove this when we have custom ObjC binding support.

trunk/Source/WebCore/dom/MessageEvent.idl

@@ -35 +35 @@
 #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
     [InitializedByEventConstructor, CachedAttribute, CustomGetter] readonly attribute any data;
-    [InitializedByEventConstructor] readonly attribute MessagePortArray ports;
+    [InitializedByEventConstructor] readonly attribute MessagePort[] ports;
 
     [Custom] void initMessageEvent([Default=Undefined] optional DOMString typeArg,