Diff
Modified: trunk/Source/WebCore/ChangeLog (143211 => 143212)
--- trunk/Source/WebCore/ChangeLog 2013-02-18 14:35:59 UTC (rev 143211)
+++ trunk/Source/WebCore/ChangeLog 2013-02-18 14:45:15 UTC (rev 143212)
@@ -1,3 +1,31 @@
+2013-02-18 Carlos Garcia Campos <cgar...@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 <an...@apple.com>
Reschedule shared CFRunLoopTimer instead of reconstructing it
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (143211 => 143212)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2013-02-18 14:35:59 UTC (rev 143211)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2013-02-18 14:45:15 UTC (rev 143212)
@@ -761,7 +761,16 @@
@hPrefix = split("\r", $licenceTemplate);
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";
@hPrefixGuard = << "EOF";
Modified: trunk/Source/WebCore/bindings/scripts/gobject-generate-headers.pl (143211 => 143212)
--- trunk/Source/WebCore/bindings/scripts/gobject-generate-headers.pl 2013-02-18 14:35:59 UTC (rev 143211)
+++ trunk/Source/WebCore/bindings/scripts/gobject-generate-headers.pl 2013-02-18 14:45:15 UTC (rev 143212)
@@ -84,9 +84,11 @@
print "\n";
}
} 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";
}
print "\n";
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.h (143211 => 143212)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.h 2013-02-18 14:35:59 UTC (rev 143211)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.h 2013-02-18 14:45:15 UTC (rev 143212)
@@ -18,6 +18,10 @@
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
#define WebKitDOMFloat64Array_h
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.h (143211 => 143212)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.h 2013-02-18 14:35:59 UTC (rev 143211)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.h 2013-02-18 14:45:15 UTC (rev 143212)
@@ -18,6 +18,10 @@
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
#define WebKitDOMTestActiveDOMObject_h
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.h (143211 => 143212)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.h 2013-02-18 14:35:59 UTC (rev 143211)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.h 2013-02-18 14:45:15 UTC (rev 143212)
@@ -18,6 +18,10 @@
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
#define WebKitDOMTestCallback_h
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.h (143211 => 143212)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.h 2013-02-18 14:35:59 UTC (rev 143211)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.h 2013-02-18 14:45:15 UTC (rev 143212)
@@ -18,6 +18,10 @@
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
#define WebKitDOMTestCustomNamedGetter_h
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.h (143211 => 143212)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.h 2013-02-18 14:35:59 UTC (rev 143211)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.h 2013-02-18 14:45:15 UTC (rev 143212)
@@ -18,6 +18,10 @@
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
#define WebKitDOMTestEventConstructor_h
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h (143211 => 143212)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h 2013-02-18 14:35:59 UTC (rev 143211)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h 2013-02-18 14:45:15 UTC (rev 143212)
@@ -18,6 +18,10 @@
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
#define WebKitDOMTestEventTarget_h
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.h (143211 => 143212)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.h 2013-02-18 14:35:59 UTC (rev 143211)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.h 2013-02-18 14:45:15 UTC (rev 143212)
@@ -18,6 +18,10 @@
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
#define WebKitDOMTestException_h
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.h (143211 => 143212)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.h 2013-02-18 14:35:59 UTC (rev 143211)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.h 2013-02-18 14:45:15 UTC (rev 143212)
@@ -18,6 +18,10 @@
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
#define WebKitDOMTestInterface_h
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.h (143211 => 143212)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.h 2013-02-18 14:35:59 UTC (rev 143211)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.h 2013-02-18 14:45:15 UTC (rev 143212)
@@ -18,6 +18,10 @@
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
#define WebKitDOMTestMediaQueryListListener_h
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.h (143211 => 143212)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.h 2013-02-18 14:35:59 UTC (rev 143211)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.h 2013-02-18 14:45:15 UTC (rev 143212)
@@ -18,6 +18,10 @@
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
#define WebKitDOMTestNamedConstructor_h
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNode.h (143211 => 143212)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNode.h 2013-02-18 14:35:59 UTC (rev 143211)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNode.h 2013-02-18 14:45:15 UTC (rev 143212)
@@ -18,6 +18,10 @@
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
#define WebKitDOMTestNode_h
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h (143211 => 143212)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h 2013-02-18 14:35:59 UTC (rev 143211)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h 2013-02-18 14:45:15 UTC (rev 143212)
@@ -18,6 +18,10 @@
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
#define WebKitDOMTestObj_h
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructors.h (143211 => 143212)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructors.h 2013-02-18 14:35:59 UTC (rev 143211)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructors.h 2013-02-18 14:45:15 UTC (rev 143212)
@@ -18,6 +18,10 @@
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
#define WebKitDOMTestOverloadedConstructors_h
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h (143211 => 143212)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h 2013-02-18 14:35:59 UTC (rev 143211)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h 2013-02-18 14:45:15 UTC (rev 143212)
@@ -18,6 +18,10 @@
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
#define WebKitDOMTestSerializedScriptValueInterface_h
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h (143211 => 143212)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h 2013-02-18 14:35:59 UTC (rev 143211)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h 2013-02-18 14:45:15 UTC (rev 143212)
@@ -18,6 +18,10 @@
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
#define WebKitDOMTestTypedefs_h
