Changeset 70844 in webkit

Timestamp:

Oct 28, 2010 11:32:52 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-28 Sergio Villar Senin <​svillar@igalia.com>

Reviewed by Xan Lopez.

[GTK] GObject bindings generator issues
​https://bugs.webkit.org/show_bug.cgi?id=48135

GObject code generator must not generate conditional API's. This
patch also adds an alternative return value for non-void
conditional methods. With this change the conditionalMethods hack
is no longer needed.

• bindings/scripts/CodeGeneratorGObject.pm:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorGObject.pm (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-28  Sergio Villar Senin  <svillar@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] GObject bindings generator issues
+        https://bugs.webkit.org/show_bug.cgi?id=48135
+
+        GObject code generator must not generate conditional API's. This
+        patch also adds an alternative return value for non-void
+        conditional methods. With this change the conditionalMethods hack
+        is no longer needed.
+
+        * bindings/scripts/CodeGeneratorGObject.pm:
+
 2010-10-28  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/bindings/scripts/CodeGeneratorGObject.pm

@@ -797 +797 @@
 }
 
-# Some methods' body (only the body, since the public API can't be
-# conditional) should be guarded by #ifdefs depending on whether
-# certain features in WebKit are enabled.
-my %conditionalMethods = ("webkit_dom_geolocation_clear_watch" => "GEOLOCATION");
-
 sub GenerateFunction {
     my ($object, $interfaceName, $function, $prefix) = @_;
@@ -880 +875 @@
     }
 
-    push(@hBody, "#if ${conditionalString}\n") if $conditionalString;
     push(@hBody, "WEBKIT_API $returnType\n$functionName($functionSig);\n");
-    push(@hBody, "#endif /* ${conditionalString} */\n") if $conditionalString;
     push(@hBody, "\n");
 
+    push(@cBody, "$returnType\n$functionName($functionSig)\n{\n");
     push(@cBody, "#if ${conditionalString}\n") if $conditionalString;
-    push(@cBody, "$returnType\n$functionName($functionSig)\n{\n");
-    push(@cBody, "    WebCore::JSMainThreadNullState state;\n");
-
-    if ($conditionalMethods{$functionName}) {
-        push(@cBody, "#if ENABLE($conditionalMethods{$functionName})\n");
-    }
 
     if ($returnType ne "void") {
@@ -899 +887 @@
         push(@cBody, "    g_return_if_fail(self);\n");
     }
+
+    push(@cBody, "    WebCore::JSMainThreadNullState state;\n");
 
     # The WebKit::core implementations check for NULL already; no need to
@@ -1051 +1041 @@
     }
 
-    if ($conditionalMethods{$functionName}) {
-        push(@cBody, "#endif\n");
-    }
-
-    push(@cBody, "}\n");
-    push(@cBody, "#endif /* ${conditionalString} */\n") if $conditionalString;
-    push(@cBody, "\n");
+    if ($conditionalString) {
+        if ($returnType ne "void") {
+            push(@cBody, "#else\n");
+            if ($codeGenerator->IsNonPointerType($functionSigType)) {
+                push(@cBody, "    return static_cast<${returnType}>(0);\n");
+            } else {
+                push(@cBody, "    return NULL;\n");
+            }
+        }
+        push(@cBody, "#endif /* ${conditionalString} */\n") if $conditionalString;
+    }
+
+    push(@cBody, "}\n\n");
 }