Title: [108610] trunk/Source/WebCore
Revision
108610
Author
hara...@chromium.org
Date
2012-02-22 22:26:07 -0800 (Wed, 22 Feb 2012)

Log Message

Enable Geolocation bindings for GObject
https://bugs.webkit.org/show_bug.cgi?id=79293

Reviewed by Adam Barth.

This patch adds "WebCore::" to supplemental method calls.
This will solve the GTK build failure we have observed in the Geolocation API,
and thus this patch enables the Geolocation API.

* Modules/geolocation/NavigatorGeolocation.idl:
* bindings/scripts/CodeGeneratorGObject.pm:
(GenerateProperty):
(GenerateFunction):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (108609 => 108610)


--- trunk/Source/WebCore/ChangeLog	2012-02-23 06:13:01 UTC (rev 108609)
+++ trunk/Source/WebCore/ChangeLog	2012-02-23 06:26:07 UTC (rev 108610)
@@ -1,3 +1,19 @@
+2012-02-22  Kentaro Hara  <hara...@chromium.org>
+
+        Enable Geolocation bindings for GObject
+        https://bugs.webkit.org/show_bug.cgi?id=79293
+
+        Reviewed by Adam Barth.
+
+        This patch adds "WebCore::" to supplemental method calls.
+        This will solve the GTK build failure we have observed in the Geolocation API,
+        and thus this patch enables the Geolocation API.
+
+        * Modules/geolocation/NavigatorGeolocation.idl:
+        * bindings/scripts/CodeGeneratorGObject.pm:
+        (GenerateProperty):
+        (GenerateFunction):
+
 2012-02-22  MORITA Hajime  <morr...@google.com>
 
         [Refactoring] Align supplementName() values.

Modified: trunk/Source/WebCore/Modules/geolocation/NavigatorGeolocation.idl (108609 => 108610)


--- trunk/Source/WebCore/Modules/geolocation/NavigatorGeolocation.idl	2012-02-23 06:13:01 UTC (rev 108609)
+++ trunk/Source/WebCore/Modules/geolocation/NavigatorGeolocation.idl	2012-02-23 06:26:07 UTC (rev 108610)
@@ -23,10 +23,7 @@
         Conditional=GEOLOCATION,
         Supplemental=Navigator
     ] NavigatorGeolocation {
-#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
-        // FIXME: Enable this interface for GOBJECT.
         readonly attribute [V8EnabledAtRuntime] Geolocation geolocation;
-#endif
     };
 
 }

Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (108609 => 108610)


--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm	2012-02-23 06:13:01 UTC (rev 108609)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm	2012-02-23 06:26:07 UTC (rev 108610)
@@ -389,8 +389,8 @@
         push(@setterArguments, "${convertFunction}(g_value_get_$gtype(value))");
         unshift(@getterArguments, "coreSelf");
         unshift(@setterArguments, "coreSelf");
-        $getterFunctionName = "${implementedBy}::$getterFunctionName";
-        $setterFunctionName = "${implementedBy}::$setterFunctionName";
+        $getterFunctionName = "WebCore::${implementedBy}::$getterFunctionName";
+        $setterFunctionName = "WebCore::${implementedBy}::$setterFunctionName";
     } else {
         push(@setterArguments, "${convertFunction}(g_value_get_$gtype(value))");
         $getterFunctionName = "coreSelf->$getterFunctionName";
@@ -926,7 +926,7 @@
                 my $implementedBy = $function->signature->extendedAttributes->{"ImplementedBy"};
                 $implIncludes{"${implementedBy}.h"} = 1;
                 unshift(@arguments, "item");
-                $functionName = "${implementedBy}::${functionName}";
+                $functionName = "WebCore::${implementedBy}::${functionName}";
             } else {
                 $functionName = "item->${functionName}";
             }
@@ -937,7 +937,7 @@
                 my $implementedBy = $function->signature->extendedAttributes->{"ImplementedBy"};
                 $implIncludes{"${implementedBy}.h"} = 1;
                 unshift(@arguments, "item");
-                $getterContentHead = "${assign}convertToUTF8String(${implementedBy}::${functionSigName}(" . join(", ", @arguments) . "));\n";
+                $getterContentHead = "${assign}convertToUTF8String(WebCore::${implementedBy}::${functionSigName}(" . join(", ", @arguments) . "));\n";
             } else {
                 $getterContentHead = "${assign}convertToUTF8String(item->${functionSigName}(" . join(", ", @arguments) . "));\n";
             }
@@ -952,7 +952,7 @@
                 my $implementedBy = $function->signature->extendedAttributes->{"ImplementedBy"};
                 $implIncludes{"${implementedBy}.h"} = 1;
                 unshift(@arguments, "item");
-                $functionName = "${implementedBy}::${functionName}";
+                $functionName = "WebCore::${implementedBy}::${functionName}";
             } else {
                 $functionName = "item->${functionName}";
             }
@@ -964,7 +964,7 @@
                 my $implementedBy = $function->signature->extendedAttributes->{"ImplementedBy"};
                 $implIncludes{"${implementedBy}.h"} = 1;
                 unshift(@arguments, "item");
-                $functionName = "${implementedBy}::${functionName}";
+                $functionName = "WebCore::${implementedBy}::${functionName}";
                 $contentHead = "${assign}${assignPre}${functionName}(" . join(", ", @arguments) . "${assignPost});\n";
             } else {
                 $functionName = "item->${functionName}";
@@ -976,7 +976,7 @@
                 my $implementedBy = $function->signature->extendedAttributes->{"ImplementedBy"};
                 $implIncludes{"${implementedBy}.h"} = 1;
                 unshift(@arguments, "item");
-                $contentHead = "${assign}${assignPre}${implementedBy}::${functionSigName}(" . join(", ", @arguments) . "${assignPost});\n";
+                $contentHead = "${assign}${assignPre}WebCore::${implementedBy}::${functionSigName}(" . join(", ", @arguments) . "${assignPost});\n";
             } else {
                 $contentHead = "${assign}${assignPre}item->${functionSigName}(" . join(", ", @arguments) . "${assignPost});\n";
             }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to