Changeset 143212 in webkit

Timestamp:

Feb 18, 2013 6:45:15 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Force single header includes in GObject DOM bindings
​https://bugs.webkit.org/show_bug.cgi?id=104676

Reviewed by Xan Lopez.

Only including <webkitdom/webkitdom.h> should be allowed from
apps.

• bindings/scripts/CodeGeneratorGObject.pm:

(GenerateHeader):

• bindings/scripts/gobject-generate-headers.pl:
• bindings/scripts/test/GObject/WebKitDOMFloat64Array.h:
• bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.h:
• bindings/scripts/test/GObject/WebKitDOMTestCallback.h:
• bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.h:
• bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.h:
• bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h:
• bindings/scripts/test/GObject/WebKitDOMTestException.h:
• bindings/scripts/test/GObject/WebKitDOMTestInterface.h:
• bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.h:
• bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.h:
• bindings/scripts/test/GObject/WebKitDOMTestNode.h:
• bindings/scripts/test/GObject/WebKitDOMTestObj.h:
• bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructors.h:
• bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorGObject.pm (modified) (1 diff)
• bindings/scripts/gobject-generate-headers.pl (modified) (1 diff)
• bindings/scripts/test/GObject/WebKitDOMFloat64Array.h (modified) (1 diff)
• bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.h (modified) (1 diff)
• bindings/scripts/test/GObject/WebKitDOMTestCallback.h (modified) (1 diff)
• bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.h (modified) (1 diff)
• bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.h (modified) (1 diff)
• bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h (modified) (1 diff)
• bindings/scripts/test/GObject/WebKitDOMTestException.h (modified) (1 diff)
• bindings/scripts/test/GObject/WebKitDOMTestInterface.h (modified) (1 diff)
• bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.h (modified) (1 diff)
• bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.h (modified) (1 diff)
• bindings/scripts/test/GObject/WebKitDOMTestNode.h (modified) (1 diff)
• bindings/scripts/test/GObject/WebKitDOMTestObj.h (modified) (1 diff)
• bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructors.h (modified) (1 diff)
• bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h (modified) (1 diff)
• bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-18  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Force single header includes in GObject DOM bindings
+        https://bugs.webkit.org/show_bug.cgi?id=104676
+
+        Reviewed by Xan Lopez.
+
+        Only including <webkitdom/webkitdom.h> should be allowed from
+        apps.
+
+        * bindings/scripts/CodeGeneratorGObject.pm:
+        (GenerateHeader):
+        * bindings/scripts/gobject-generate-headers.pl:
+        * bindings/scripts/test/GObject/WebKitDOMFloat64Array.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestCallback.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestException.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestInterface.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestNode.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestObj.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructors.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h:
+
 2013-02-16  Antti Koivisto  <antti@apple.com>
 

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

@@ -762 +762 @@
     push(@hPrefix, "\n");
 
-    #Header guard
+    # Force single header include.
+    my $headerCheck = << "EOF";
+#if !defined(__WEBKITDOM_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+#error "Only <webkitdom/webkitdom.h> can be included directly."
+#endif
+
+EOF
+    push(@hPrefix, $headerCheck);
+
+    # Header guard
     my $guard = $className . "_h";
 

trunk/Source/WebCore/bindings/scripts/gobject-generate-headers.pl

@@ -85 +85 @@
     }
 } elsif ($outType eq "gdom") {
+    print "#define __WEBKITDOM_H_INSIDE__\n\n";
     foreach my $class (@classes) {
         print "#include <webkitdom/WebKitDOM${class}.h>\n";
     }
+    print "\n#undef __WEBKITDOM_H_INSIDE__\n";
 }
 

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

@@ -18 +18 @@
     Boston, MA 02110-1301, USA.
 */
+
+#if !defined(__WEBKITDOM_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+#error "Only <webkitdom/webkitdom.h> can be included directly."
+#endif
 
 #ifndef WebKitDOMFloat64Array_h

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

@@ -18 +18 @@
     Boston, MA 02110-1301, USA.
 */
+
+#if !defined(__WEBKITDOM_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+#error "Only <webkitdom/webkitdom.h> can be included directly."
+#endif
 
 #ifndef WebKitDOMTestActiveDOMObject_h

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

@@ -18 +18 @@
     Boston, MA 02110-1301, USA.
 */
+
+#if !defined(__WEBKITDOM_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+#error "Only <webkitdom/webkitdom.h> can be included directly."
+#endif
 
 #ifndef WebKitDOMTestCallback_h

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

@@ -18 +18 @@
     Boston, MA 02110-1301, USA.
 */
+
+#if !defined(__WEBKITDOM_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+#error "Only <webkitdom/webkitdom.h> can be included directly."
+#endif
 
 #ifndef WebKitDOMTestCustomNamedGetter_h

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

@@ -18 +18 @@
     Boston, MA 02110-1301, USA.
 */
+
+#if !defined(__WEBKITDOM_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+#error "Only <webkitdom/webkitdom.h> can be included directly."
+#endif
 
 #ifndef WebKitDOMTestEventConstructor_h

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

@@ -18 +18 @@
     Boston, MA 02110-1301, USA.
 */
+
+#if !defined(__WEBKITDOM_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+#error "Only <webkitdom/webkitdom.h> can be included directly."
+#endif
 
 #ifndef WebKitDOMTestEventTarget_h

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

@@ -18 +18 @@
     Boston, MA 02110-1301, USA.
 */
+
+#if !defined(__WEBKITDOM_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+#error "Only <webkitdom/webkitdom.h> can be included directly."
+#endif
 
 #ifndef WebKitDOMTestException_h

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

@@ -18 +18 @@
     Boston, MA 02110-1301, USA.
 */
+
+#if !defined(__WEBKITDOM_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+#error "Only <webkitdom/webkitdom.h> can be included directly."
+#endif
 
 #ifndef WebKitDOMTestInterface_h

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

@@ -18 +18 @@
     Boston, MA 02110-1301, USA.
 */
+
+#if !defined(__WEBKITDOM_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+#error "Only <webkitdom/webkitdom.h> can be included directly."
+#endif
 
 #ifndef WebKitDOMTestMediaQueryListListener_h

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

@@ -18 +18 @@
     Boston, MA 02110-1301, USA.
 */
+
+#if !defined(__WEBKITDOM_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+#error "Only <webkitdom/webkitdom.h> can be included directly."
+#endif
 
 #ifndef WebKitDOMTestNamedConstructor_h

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

@@ -18 +18 @@
     Boston, MA 02110-1301, USA.
 */
+
+#if !defined(__WEBKITDOM_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+#error "Only <webkitdom/webkitdom.h> can be included directly."
+#endif
 
 #ifndef WebKitDOMTestNode_h

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

@@ -18 +18 @@
     Boston, MA 02110-1301, USA.
 */
+
+#if !defined(__WEBKITDOM_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+#error "Only <webkitdom/webkitdom.h> can be included directly."
+#endif
 
 #ifndef WebKitDOMTestObj_h

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

@@ -18 +18 @@
     Boston, MA 02110-1301, USA.
 */
+
+#if !defined(__WEBKITDOM_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+#error "Only <webkitdom/webkitdom.h> can be included directly."
+#endif
 
 #ifndef WebKitDOMTestOverloadedConstructors_h

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

@@ -18 +18 @@
     Boston, MA 02110-1301, USA.
 */
+
+#if !defined(__WEBKITDOM_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+#error "Only <webkitdom/webkitdom.h> can be included directly."
+#endif
 
 #ifndef WebKitDOMTestSerializedScriptValueInterface_h

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

@@ -18 +18 @@
     Boston, MA 02110-1301, USA.
 */
+
+#if !defined(__WEBKITDOM_H_INSIDE__) && !defined(BUILDING_WEBKIT)
+#error "Only <webkitdom/webkitdom.h> can be included directly."
+#endif
 
 #ifndef WebKitDOMTestTypedefs_h