Changeset 111535 in webkit

Timestamp:

Mar 21, 2012 6:52:44 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

​https://bugs.webkit.org/show_bug.cgi?id=81761
Fix Gobject binding for sequence<T> for function return type.

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

No new tests.

• bindings/scripts/CodeGeneratorGObject.pm:

(SkipFunction): Skip function with sequence<T> return type.

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

(webkit_dom_test_obj_method_with_sequence_arg):

• bindings/scripts/test/GObject/WebKitDOMTestObj.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorGObject.pm (modified) (2 diffs)
• bindings/scripts/test/GObject/WebKitDOMTestObj.cpp (modified) (3 diffs)
• bindings/scripts/test/GObject/WebKitDOMTestObj.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-21  Vineet Chaudhary  <rgf748@motorola.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=81761
+        Fix Gobject binding for sequence<T> for function return type.
+
+        Reviewed by Kentaro Hara.
+
+        No new tests.
+
+        * bindings/scripts/CodeGeneratorGObject.pm:
+        (SkipFunction): Skip function with sequence<T> return type.
+        * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
+        (webkit_dom_test_obj_method_with_sequence_arg):
+        * bindings/scripts/test/GObject/WebKitDOMTestObj.h:
+
 2012-03-21  Andrey Kosyakov  <caseq@chromium.org>
 

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

@@ -193 +193 @@
 
     my $functionName = "webkit_dom_" . $decamelize . "_" . $prefix . decamelize($function->signature->name);
+    my $functionReturnType = $prefix eq "set_" ? "void" : $function->signature->type;
     my $isCustomFunction = $function->signature->extendedAttributes->{"Custom"};
     my $callWith = $function->signature->extendedAttributes->{"CallWith"};
@@ -212 +213 @@
 
     if ($function->signature->name eq "getCSSCanvasContext") {
+        return 1;
+    }
+
+    if ($codeGenerator->GetArrayType($functionReturnType)) {
         return 1;
     }

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

@@ -34 +34 @@
 #include "bool.h"
 #include "gobject/ConvertToUTF8String.h"
-#include "sequence<ScriptProfile>.h"
 #include "webkit/WebKitDOMDictionary.h"
 #include "webkit/WebKitDOMDictionaryPrivate.h"
@@ -60 +59 @@
 #include "webkit/WebKitDOMePrivate.h"
 #include "webkit/WebKitDOMsequence.h"
-#include "webkit/WebKitDOMsequence<ScriptProfile>.h"
-#include "webkit/WebKitDOMsequence<ScriptProfile>Private.h"
 #include "webkit/WebKitDOMsequencePrivate.h"
 #include "webkitdefines.h"
@@ -178 +175 @@
     }
     item->methodWithSequenceArg(converted_);
-}
-
-WebKitDOMsequence<ScriptProfile>*
-webkit_dom_test_obj_method_returning_sequence(WebKitDOMTestObj* self, glong int_arg)
-{
-    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->methodReturningSequence(int_arg));
-    WebKitDOMsequence<ScriptProfile>* res = WebKit::kit(g_res.get());
-    return res;
 }
 

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

@@ -128 +128 @@
 
 /**
- * webkit_dom_test_obj_method_returning_sequence:
- * @self: A #WebKitDOMTestObj
- * @int_arg: A #glong
- *
- * Returns: (transfer none):
- *
-**/
-WEBKIT_API WebKitDOMsequence<ScriptProfile>*
-webkit_dom_test_obj_method_returning_sequence(WebKitDOMTestObj* self, glong int_arg);
-
-/**
  * webkit_dom_test_obj_method_that_requires_all_args_and_throws:
  * @self: A #WebKitDOMTestObj