Changeset 111416 in webkit

Timestamp:

Mar 20, 2012 11:26:51 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

​https://bugs.webkit.org/show_bug.cgi?id=80696
Remove custom bindings for attribute type Array.

Patch by Vineet Chaudhary <Vineet> on 2012-03-20
Reviewed by Kentaro Hara.

No new tests.

• bindings/js/JSConsoleCustom.cpp: Removed custom function.

(WebCore):

• bindings/js/JSDOMBinding.h: Added template jsArray and toNativeArray.

(WebCore):
(WebCore::jsArray):
(WebCore::toNativeArray):

• bindings/scripts/CodeGenerator.pm: Modified codegenerators to generate appropriate code.

(GetArrayType): Added GetArrayType to get return type of attribute interface.

• bindings/scripts/CodeGeneratorGObject.pm: Modified codegenerators to generate appropriate code.

(SkipAttribute):

• bindings/scripts/CodeGeneratorJS.pm: Modified codegenerators to generate appropriate code.

(AddIncludesForType):
(JSValueToNative):
(NativeToJSValue):

• bindings/scripts/CodeGeneratorV8.pm: Modified codegenerators to generate appropriate code.

(GenerateNormalAttrGetter):
(GenerateNormalAttrSetter):
(JSValueToNative):
(NativeToJSValue):

• bindings/scripts/test/GObject/WebKitDOMTestObj.cpp: Updated results from running binding tests.

(webkit_dom_test_obj_get_property):
(webkit_dom_test_obj_class_init):

• bindings/scripts/test/GObject/WebKitDOMTestObj.h: Ditto.
• bindings/scripts/test/JS/JSTestObj.cpp: Ditto.

(WebCore::jsTestObjSequenceAttr):
(WebCore::setJSTestObjSequenceAttr):
(WebCore::jsTestObjPrototypeFunctionMethodReturningSequence):

• bindings/scripts/test/V8/V8TestObj.cpp: Ditto.

(WebCore::TestObjInternal::sequenceAttrAttrGetter):
(WebCore::TestObjInternal::sequenceAttrAttrSetter):
(WebCore::TestObjInternal::methodReturningSequenceCallback):

• bindings/v8/V8Binding.h: Added template v8Array and toNativeArray.

(WebCore):
(WebCore::v8Array):
(WebCore::toNativeArray):

• bindings/v8/custom/V8ConsoleCustom.cpp: Removed custom function.

(WebCore):

• page/Console.idl: Replaced attribute type Array to sequence<SriptProfile> to remove custom bindings.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSConsoleCustom.cpp (modified) (2 diffs)
• bindings/js/JSDOMBinding.h (modified) (2 diffs)
• bindings/scripts/CodeGenerator.pm (modified) (1 diff)
• bindings/scripts/CodeGeneratorGObject.pm (modified) (1 diff)
• bindings/scripts/CodeGeneratorJS.pm (modified) (3 diffs)
• bindings/scripts/CodeGeneratorV8.pm (modified) (5 diffs)
• bindings/scripts/test/GObject/WebKitDOMTestObj.cpp (modified) (4 diffs)
• bindings/scripts/test/GObject/WebKitDOMTestObj.h (modified) (1 diff)
• bindings/scripts/test/JS/JSTestObj.cpp (modified) (6 diffs)
• bindings/scripts/test/V8/V8TestObj.cpp (modified) (6 diffs)
• bindings/v8/V8Binding.h (modified) (1 diff)
• bindings/v8/custom/V8ConsoleCustom.cpp (modified) (1 diff)
• page/Console.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-20  Vineet Chaudhary  <rgf748@motorola.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=80696
+        Remove custom bindings for attribute type Array.
+
+        Reviewed by Kentaro Hara.
+
+        No new tests.
+
+        * bindings/js/JSConsoleCustom.cpp: Removed custom function.
+        (WebCore):
+        * bindings/js/JSDOMBinding.h: Added template jsArray and toNativeArray.
+        (WebCore):
+        (WebCore::jsArray):
+        (WebCore::toNativeArray):
+        * bindings/scripts/CodeGenerator.pm: Modified codegenerators to generate appropriate code.
+        (GetArrayType): Added GetArrayType to get return type of attribute interface.
+        * bindings/scripts/CodeGeneratorGObject.pm: Modified codegenerators to generate appropriate code.
+        (SkipAttribute):
+        * bindings/scripts/CodeGeneratorJS.pm: Modified codegenerators to generate appropriate code.
+        (AddIncludesForType):
+        (JSValueToNative):
+        (NativeToJSValue):
+        * bindings/scripts/CodeGeneratorV8.pm: Modified codegenerators to generate appropriate code.
+        (GenerateNormalAttrGetter):
+        (GenerateNormalAttrSetter):
+        (JSValueToNative):
+        (NativeToJSValue):
+        * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp: Updated results from running binding tests.
+        (webkit_dom_test_obj_get_property):
+        (webkit_dom_test_obj_class_init):
+        * bindings/scripts/test/GObject/WebKitDOMTestObj.h: Ditto.
+        * bindings/scripts/test/JS/JSTestObj.cpp: Ditto.
+        (WebCore::jsTestObjSequenceAttr):
+        (WebCore::setJSTestObjSequenceAttr):
+        (WebCore::jsTestObjPrototypeFunctionMethodReturningSequence):
+        * bindings/scripts/test/V8/V8TestObj.cpp: Ditto.
+        (WebCore::TestObjInternal::sequenceAttrAttrGetter):
+        (WebCore::TestObjInternal::sequenceAttrAttrSetter):
+        (WebCore::TestObjInternal::methodReturningSequenceCallback):
+        * bindings/v8/V8Binding.h: Added template v8Array and toNativeArray.
+        (WebCore):
+        (WebCore::v8Array):
+        (WebCore::toNativeArray):
+        * bindings/v8/custom/V8ConsoleCustom.cpp: Removed custom function.
+        (WebCore):
+        * page/Console.idl: Replaced attribute type Array to sequence<SriptProfile> to remove
+          custom bindings.
+
 2012-03-20  Sheriff Bot  <webkit.review.bot@gmail.com>
 

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

@@ -31 +31 @@
 
 #include "Console.h"
-#include "JSScriptProfile.h"
 #include "ScriptCallStack.h"
 #include "ScriptCallStackFactory.h"
-#include "ScriptProfile.h"
-#include <runtime/JSArray.h>
 #include <wtf/OwnPtr.h>
 
@@ -41 +38 @@
 
 namespace WebCore {
-
-typedef Vector<RefPtr<ScriptProfile> > ProfilesArray;
-
-JSValue JSConsole::profiles(ExecState* exec) const
-{
-    const ProfilesArray& profiles = impl()->profiles();
-    MarkedArgumentBuffer list;
-
-    ProfilesArray::const_iterator end = profiles.end();
-    for (ProfilesArray::const_iterator iter = profiles.begin(); iter != end; ++iter)
-        list.append(toJS(exec, globalObject(), iter->get()));
-
-    return constructArray(exec, globalObject(), list);
-}
 
 JSValue JSConsole::profile(ExecState* exec)

trunk/Source/WebCore/bindings/js/JSDOMBinding.h

@@ -36 +36 @@
 #include <heap/Weak.h>
 #include <runtime/FunctionPrototype.h>
+#include <runtime/JSArray.h>
 #include <runtime/Lookup.h>
 #include <runtime/ObjectPrototype.h>
@@ -279 +280 @@
     }
 
+    template <typename Iterable>
+    JSC::JSValue jsArray(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, const Iterable& iterator)
+    {
+        JSC::MarkedArgumentBuffer list;
+        typename Iterable::const_iterator end = iterator.end();
+
+        for (typename Iterable::const_iterator iter = iterator.begin(); iter != end; ++iter)
+            list.append(toJS(exec, globalObject, WTF::getPtr(*iter)));
+
+        return JSC::constructArray(exec, list);
+    }
+
+    template <class T>
+    Vector<T> toNativeArray(JSC::ExecState* exec, JSC::JSValue value)
+    {
+        if (!isJSArray(value))
+            return Vector<T>();
+
+        Vector<T> result;
+        JSC::JSArray* array = asArray(value);
+
+        for (unsigned i = 0; i < array->length(); ++i) {
+            String indexedValue = ustringToString(array->getIndex(i).toString(exec)->value(exec));
+            result.append(indexedValue);
+        }
+        return result;
+    }
+
     // Validates that the passed object is a sequence type per section 4.1.13 of the WebIDL spec.
     JSC::JSObject* toJSSequence(JSC::ExecState*, JSC::JSValue, unsigned&);

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

@@ -446 +446 @@
 }
 
+sub GetArrayType
+{
+    my $object = shift;
+    my $type = shift;
+
+    return $1 if $type =~ /^sequence<([\w\d_]+)>.*/;
+    return "";
+}
+
 # Uppercase the first letter while respecting WebKit style guidelines.
 # E.g., xmlEncoding becomes XMLEncoding, but xmlllang becomes Xmllang.

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

@@ -162 +162 @@
     my $propType = $attribute->signature->type;
     if ($propType =~ /Constructor$/) {
+        return 1;
+    }
+
+    if ($codeGenerator->GetArrayType($propType)) {
         return 1;
     }

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

@@ -267 +267 @@
     } elsif (IsTypedArrayType($type)) {
         $includesRef->{"<wtf/${type}.h>"} = 1;
+    } elsif ($codeGenerator->GetArrayType($type)) {
     } else {
         # default, include the same named file
@@ -2946 +2947 @@
     AddToImplIncludes("Event.h", $conditional) if $type eq "Event";
 
+    if ($codeGenerator->GetArrayType($type)) {
+        return "toNativeArray(exec, $value)";
+    }
+
     # Default, assume autogenerated type conversion routines
     AddToImplIncludes("JS$type.h", $conditional);
@@ -3003 +3008 @@
     if ($type eq "NodeList") {
         AddToImplIncludes("NameNodeList.h", $conditional);
+    }
+
+    my $arrayType = $codeGenerator->GetArrayType($type);
+    if ($arrayType) {
+        AddToImplIncludes("<runtime/JSArray.h>", $conditional);
+        AddToImplIncludes("JS$arrayType.h", $conditional);
+        AddToImplIncludes("$arrayType.h", $conditional);
+        return "jsArray(exec, $thisValue->globalObject(), $value)";
     }
 

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

@@ -924 +924 @@
         && $returnType ne "EventTarget" && $returnType ne "SerializedScriptValue" && $returnType ne "DOMWindow" 
         && $returnType !~ /SVG/ && $returnType !~ /HTML/ && !IsDOMNodeType($returnType))) {
+
+        my $arrayType = $codeGenerator->GetArrayType($returnType);
+        if ($arrayType) {
+            AddToImplIncludes("V8$arrayType.h");
+            AddToImplIncludes("$arrayType.h");
+            push(@implContentDecls, "    const Vector<RefPtr<$arrayType> > vector = ${getterString};\n");
+            push(@implContentDecls, "    return v8Array(vector);\n");
+            push(@implContentDecls, "}\n\n");
+            return;
+        }
+
         AddIncludesForType($returnType);
         # Check for a wrapper in the wrapper cache. If there is one, we know that a hidden reference has already
@@ -1098 +1109 @@
     } else {
         my $value = JSValueToNative($attribute->signature, "value");
+        my $arrayType = $codeGenerator->GetArrayType($nativeType);
+
         if ($nativeType =~ /^V8Parameter/) {
-          push(@implContentDecls, "    " . ConvertToV8Parameter($attribute->signature, $nativeType, "v", $value, "VOID") . "\n");
+            push(@implContentDecls, "    " . ConvertToV8Parameter($attribute->signature, $nativeType, "v", $value, "VOID") . "\n");
+        } elsif ($arrayType) {
+            push(@implContentDecls, "    Vector<$arrayType> v = $value;\n");
         } else {
-          push(@implContentDecls, "    $nativeType v = $value;\n");
+            push(@implContentDecls, "    $nativeType v = $value;\n");
         }
     }
@@ -1107 +1122 @@
     my $result = "v";
     my $returnType = GetTypeFromSignature($attribute->signature);
-    if (IsRefPtrType($returnType)) {
+    if (IsRefPtrType($returnType) && !$codeGenerator->GetArrayType($returnType)) {
         $result = "WTF::getPtr(" . $result . ")";
     }
@@ -3555 +3570 @@
     }
 
+    if ($codeGenerator->GetArrayType($type)) {
+        return "toNativeArray($value)";
+    }
+
     AddIncludesForType($type);
 
@@ -3768 +3787 @@
     }
 
+    my $arrayType = $codeGenerator->GetArrayType($type);
+    if ($arrayType) {
+        AddToImplIncludes("V8$arrayType.h");
+        AddToImplIncludes("$arrayType.h");
+        return "v8Array($value)";
+    }
+
     AddIncludesForType($type);
 

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

@@ -811 +811 @@
 }
 
-WebKitDOMsequence<ScriptProfile>*
-webkit_dom_test_obj_get_sequence_attr(WebKitDOMTestObj* self)
-{
-    g_return_val_if_fail(self, 0);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::sequence<ScriptProfile>> g_res = WTF::getPtr(item->sequenceAttr());
-    WebKitDOMsequence<ScriptProfile>* res = WebKit::kit(g_res.get());
-    return res;
-}
-
-void
-webkit_dom_test_obj_set_sequence_attr(WebKitDOMTestObj* self, WebKitDOMsequence<ScriptProfile>* value)
-{
-    g_return_if_fail(self);
-    WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    g_return_if_fail(value);
-    WebCore::sequence<ScriptProfile> * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
-    }
-    item->setSequenceAttr(converted_value);
-}
-
 WebKitDOMTestObj*
 webkit_dom_test_obj_get_xml_obj_attr(WebKitDOMTestObj* self)
@@ -1596 +1570 @@
     PROP_STRING_ATTR,
     PROP_TEST_OBJ_ATTR,
-    PROP_SEQUENCE_ATTR,
     PROP_XML_OBJ_ATTR,
     PROP_CREATE,
@@ -1856 +1829 @@
         break;
     }
-    case PROP_SEQUENCE_ATTR:
-    {
-        RefPtr<WebCore::sequence<ScriptProfile>> ptr = coreSelf->sequenceAttr();
-        g_value_set_object(value, WebKit::kit(ptr.get()));
-        break;
-    }
     case PROP_XML_OBJ_ATTR:
     {
@@ -2154 +2121 @@
                                                            WEBKIT_PARAM_READWRITE));
     g_object_class_install_property(gobjectClass,
-                                    PROP_SEQUENCE_ATTR,
-                                    g_param_spec_object("sequence-attr", /* name */
-                                                           "test_obj_sequence-attr", /* short description */
-                                                           "read-write  WebKitDOMsequence<ScriptProfile>* TestObj.sequence-attr", /* longer - could do with some extra doc stuff here */
-                                                           WEBKIT_TYPE_DOM_SEQUENCE<SCRIPT_PROFILE>, /* gobject type */
-                                                           WEBKIT_PARAM_READWRITE));
-    g_object_class_install_property(gobjectClass,
                                     PROP_XML_OBJ_ATTR,
                                     g_param_spec_object("xml-obj-attr", /* name */

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

@@ -698 +698 @@
 
 /**
- * webkit_dom_test_obj_get_sequence_attr:
- * @self: A #WebKitDOMTestObj
- *
- * Returns: (transfer none):
- *
-**/
-WEBKIT_API WebKitDOMsequence<ScriptProfile>*
-webkit_dom_test_obj_get_sequence_attr(WebKitDOMTestObj* self);
-
-/**
- * webkit_dom_test_obj_set_sequence_attr:
- * @self: A #WebKitDOMTestObj
- * @value: A #WebKitDOMsequence<ScriptProfile>
- *
- * Returns: (transfer none):
- *
-**/
-WEBKIT_API void
-webkit_dom_test_obj_set_sequence_attr(WebKitDOMTestObj* self, WebKitDOMsequence<ScriptProfile>* value);
-
-/**
  * webkit_dom_test_obj_get_xml_obj_attr:
  * @self: A #WebKitDOMTestObj

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

@@ -34 +34 @@
 #include "JSSVGDocument.h"
 #include "JSSVGPoint.h"
+#include "JSScriptProfile.h"
 #include "JSTestCallback.h"
 #include "JSTestObj.h"
@@ -44 +45 @@
 #include "JSint.h"
 #include "JSsequence.h"
-#include "JSsequence<ScriptProfile>.h"
 #include "KURL.h"
 #include "SVGDocument.h"
@@ -51 +51 @@
 #include "ScriptCallStack.h"
 #include "ScriptCallStackFactory.h"
+#include "ScriptProfile.h"
 #include "SerializedScriptValue.h"
 #include "TestObj.h"
 #include "bool.h"
-#include "sequence<ScriptProfile>.h"
 #include <runtime/Error.h>
+#include <runtime/JSArray.h>
 #include <runtime/JSString.h>
 #include <wtf/GetPtr.h>
@@ -478 +479 @@
     UNUSED_PARAM(exec);
     TestObj* impl = static_cast<TestObj*>(castedThis->impl());
-    JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(impl->sequenceAttr()));
+    JSValue result = jsArray(exec, castedThis->globalObject(), impl->sequenceAttr());
     return result;
 }
@@ -966 +967 @@
     JSTestObj* castedThis = static_cast<JSTestObj*>(thisObject);
     TestObj* impl = static_cast<TestObj*>(castedThis->impl());
-    impl->setSequenceAttr(tosequence<ScriptProfile>(value));
+    impl->setSequenceAttr(toNativeArray(exec, value));
 }
 
@@ -1424 +1425 @@
         return JSValue::encode(jsUndefined());
 
-    JSC::JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(impl->methodReturningSequence(intArg)));
+    JSC::JSValue result = jsArray(exec, castedThis->globalObject(), impl->methodReturningSequence(intArg));
     return JSValue::encode(result);
 }

trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp

@@ -33 +33 @@
 #include "ScriptCallStack.h"
 #include "ScriptCallStackFactory.h"
+#include "ScriptProfile.h"
 #include "SerializedScriptValue.h"
 #include "V8Binding.h"
@@ -43 +44 @@
 #include "V8SVGDocument.h"
 #include "V8SVGPoint.h"
+#include "V8ScriptProfile.h"
 #include "V8TestCallback.h"
 #include "V8a.h"
@@ -53 +55 @@
 #include "V8int.h"
 #include "V8sequence.h"
-#include "V8sequence<ScriptProfile>.h"
 #include <wtf/GetPtr.h>
 #include <wtf/RefCounted.h>
@@ -224 +225 @@
     INC_STATS("DOM.TestObj.sequenceAttr._get");
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    return toV8(imp->sequenceAttr());
+    return v8Array(imp->sequenceAttr());
 }
 
@@ -231 +232 @@
     INC_STATS("DOM.TestObj.sequenceAttr._set");
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    sequence<ScriptProfile>* v = V8sequence<ScriptProfile>::HasInstance(value) ? V8sequence<ScriptProfile>::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
-    imp->setSequenceAttr(WTF::getPtr(v));
+    Vector<ScriptProfile> v = toNativeArray(value);
+    imp->setSequenceAttr(v);
     return;
 }
@@ -1072 +1073 @@
     TestObj* imp = V8TestObj::toNative(args.Holder());
     EXCEPTION_BLOCK(int, intArg, toInt32(MAYBE_MISSING_PARAMETER(args, 0, DefaultIsUndefined)));
-    return toV8(imp->methodReturningSequence(intArg));
+    return v8Array(imp->methodReturningSequence(intArg));
 }
 

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

@@ -287 +287 @@
     }
 
+    template<typename Iterable>
+    v8::Handle<v8::Value> v8Array(const Iterable& iterator)
+    {
+        v8::Local<v8::Array> result = v8::Array::New(iterator.size());
+        int index = 0;
+        typename Iterable::const_iterator end = iterator.end();
+        for (typename Iterable::const_iterator iter = iterator.begin(); iter != end; ++iter)
+            result->Set(v8::Integer::New(index++), toV8(WTF::getPtr(*iter)));
+        return result;
+    }
+
+    template <class T>
+    Vector<T> toNativeArray(v8::Handle<v8::Value> value)
+    {
+        if (!value->IsArray())
+            return Vector<T>();
+
+        Vector<T> result;
+        v8::Local<v8::Value> v8Value(v8::Local<v8::Value>::New(value));
+        v8::Local<v8::Array> array = v8::Local<v8::Array>::Cast(v8Value);
+        size_t length = array->Length();
+
+        for (size_t i = 0; i < length; ++i) {
+            String indexedValue = v8StringToWebCoreString(array->Get(i));
+            result.append(indexedValue);
+        }
+        return result;
+    }
+
     // Enables caching v8 wrappers created for WTF::StringImpl.  Currently this cache requires
     // all the calls (both to convert WTF::String to v8::String and to GC the handle)

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

@@ -37 +37 @@
 #include "ScriptCallStack.h"
 #include "ScriptCallStackFactory.h"
-#include "ScriptProfile.h"
 #include "V8Binding.h"
 #include "V8BindingMacros.h"
 #include "V8MemoryInfo.h"
 #include "V8Proxy.h"
-#include "V8ScriptProfile.h"
 
 namespace WebCore {
-
-typedef Vector<RefPtr<ScriptProfile> > ProfilesArray;
-
-#if ENABLE(JAVASCRIPT_DEBUGGER)
-v8::Handle<v8::Value> V8Console::profilesAccessorGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
-{
-    INC_STATS("DOM.Console.profilesAccessorGetter");
-    Console* imp = V8Console::toNative(info.Holder());
-    const ProfilesArray& profiles = imp->profiles();
-    v8::Handle<v8::Array> result = v8::Array::New(profiles.size());
-    int index = 0;
-    ProfilesArray::const_iterator end = profiles.end();
-    for (ProfilesArray::const_iterator iter = profiles.begin(); iter != end; ++iter)
-        result->Set(v8::Integer::New(index++), toV8(iter->get()));
-    return result;
-}
-#endif
 
 v8::Handle<v8::Value> V8Console::traceCallback(const v8::Arguments& args)

trunk/Source/WebCore/page/Console.idl

@@ -47 +47 @@
 
 #if defined(ENABLE_JAVASCRIPT_DEBUGGER) && ENABLE_JAVASCRIPT_DEBUGGER
-        readonly attribute [CustomGetter] Array profiles;
+        readonly attribute sequence<ScriptProfile> profiles;
         [Custom] void profile(in DOMString title);
         [Custom] void profileEnd(in DOMString title);