Changeset 60223 in webkit

Timestamp:

May 26, 2010 2:18:33 AM (14 years ago)

Author:

xan@webkit.org

Message:

2010-05-26 Xan Lopez <​xlopez@igalia.com>

Reviewed by Gustavo Noronha.

[GTK] GObject DOM bindings
​https://bugs.webkit.org/show_bug.cgi?id=33590

We need to protect the body of some methods with #ifdefs, since
the availability of the code they call into is decided at compile
time.

• bindings/scripts/CodeGeneratorGObject.pm:

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-05-26  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Gustavo Noronha.
+
+        [GTK] GObject DOM bindings
+        https://bugs.webkit.org/show_bug.cgi?id=33590
+
+        We need to protect the body of some methods with #ifdefs, since
+        the availability of the code they call into is decided at compile
+        time.
+
+        * bindings/scripts/CodeGeneratorGObject.pm:
+
 2010-05-26  Kent Tamura  <tkent@chromium.org>
 

trunk/WebCore/bindings/scripts/CodeGeneratorGObject.pm

@@ -675 +675 @@
 }
 
+# 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) = @_;
@@ -742 +747 @@
     push(@hBody, "WEBKIT_API $returnType\n$functionName ($functionSig);\n\n");
     push(@cBody, "$returnType\n$functionName ($functionSig)\n{\n");
+
+    if ($conditionalMethods{$functionName}) {
+        push(@cBody, "#if ENABLE($conditionalMethods{$functionName})\n");
+    }
 
     if ($returnType ne "void") {
@@ -901 +910 @@
         }
     }
+
+    if ($conditionalMethods{$functionName}) {
+        push(@cBody, "#endif\n");
+    }
+
     push(@cBody, "\n}\n\n");
 }