Changeset 192872 in webkit

Timestamp:

Dec 1, 2015, 1:04:35 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

Unreviewed. Fix GTK+ build after r192849.

• bindings/scripts/CodeGeneratorGObject.pm:

(GenerateFunction):

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

(webkit_dom_test_interface_supplemental_method1):
(webkit_dom_test_interface_supplemental_method2):
(webkit_dom_test_interface_set_supplemental_str2):
(webkit_dom_test_interface_get_supplemental_node):
(webkit_dom_test_interface_set_supplemental_node):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorGObject.pm (modified) (3 diffs)
• bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-12-01  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Fix GTK+ build after r192849.
+
+        * bindings/scripts/CodeGeneratorGObject.pm:
+        (GenerateFunction):
+        * bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp:
+        (webkit_dom_test_interface_supplemental_method1):
+        (webkit_dom_test_interface_supplemental_method2):
+        (webkit_dom_test_interface_set_supplemental_str2):
+        (webkit_dom_test_interface_get_supplemental_node):
+        (webkit_dom_test_interface_set_supplemental_node):
+
 2015-12-01  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 

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

@@ -1312 +1312 @@
                 my $implementedBy = $function->signature->extendedAttributes->{"ImplementedBy"};
                 $implIncludes{"${implementedBy}.h"} = 1;
-                unshift(@arguments, "item");
+                unshift(@arguments, "*item");
                 $functionName = "WebCore::${implementedBy}::${functionName}";
             } else {
@@ -1324 +1324 @@
                 my $implementedBy = $function->signature->extendedAttributes->{"ImplementedBy"};
                 $implIncludes{"${implementedBy}.h"} = 1;
-                unshift(@arguments, "item");
+                unshift(@arguments, "*item");
                 $functionName = "WebCore::${implementedBy}::${functionName}";
                 $contentHead = "${assign}${assignPre}${functionName}(" . join(", ", @arguments) . ")${assignPost};\n";
@@ -1336 +1336 @@
                 my $implementedBy = $function->signature->extendedAttributes->{"ImplementedBy"};
                 $implIncludes{"${implementedBy}.h"} = 1;
-                unshift(@arguments, "item");
+                unshift(@arguments, "*item");
                 $contentHead = "${assign}${assignPre}WebCore::${implementedBy}::${functionImplementationName}(" . join(", ", @arguments) . ")${assignPost};\n";
             } else {

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

@@ -297 +297 @@
     g_return_if_fail(WEBKIT_DOM_IS_TEST_INTERFACE(self));
     WebCore::TestInterface* item = WebKit::core(self);
-    WebCore::TestSupplemental::supplementalMethod1(item);
+    WebCore::TestSupplemental::supplementalMethod1(*item);
 #else
     UNUSED_PARAM(self);
@@ -323 +323 @@
     WebCore::TestObj* convertedObjArg = WebKit::core(objArg);
     WebCore::ExceptionCode ec = 0;
-    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(WebCore::TestSupplemental::supplementalMethod2(item, convertedStrArg, convertedObjArg, ec));
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(WebCore::TestSupplemental::supplementalMethod2(*item, convertedStrArg, convertedObjArg, ec));
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
@@ -521 +521 @@
     WebCore::TestInterface* item = WebKit::core(self);
     WTF::String convertedValue = WTF::String::fromUTF8(value);
-    WebCore::TestSupplemental::setSupplementalStr2(item, convertedValue);
+    WebCore::TestSupplemental::setSupplementalStr2(*item, convertedValue);
 #else
     UNUSED_PARAM(self);
@@ -543 +543 @@
     g_return_val_if_fail(WEBKIT_DOM_IS_TEST_INTERFACE(self), 0);
     WebCore::TestInterface* item = WebKit::core(self);
-    RefPtr<WebCore::Node> gobjectResult = WTF::getPtr(WebCore::TestSupplemental::supplementalNode(item));
+    RefPtr<WebCore::Node> gobjectResult = WTF::getPtr(WebCore::TestSupplemental::supplementalNode(*item));
     return WebKit::kit(gobjectResult.get());
 #else
@@ -568 +568 @@
     WebCore::TestInterface* item = WebKit::core(self);
     WebCore::Node* convertedValue = WebKit::core(value);
-    WebCore::TestSupplemental::setSupplementalNode(item, convertedValue);
-#else
-    UNUSED_PARAM(self);
-    UNUSED_PARAM(value);
-    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
-    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
-#else
-    UNUSED_PARAM(self);
-    UNUSED_PARAM(value);
-    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
-    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
-}
-
+    WebCore::TestSupplemental::setSupplementalNode(*item, convertedValue);
+#else
+    UNUSED_PARAM(self);
+    UNUSED_PARAM(value);
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
+#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
+#else
+    UNUSED_PARAM(self);
+    UNUSED_PARAM(value);
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
+    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
+#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
+}
+