Diff
Modified: trunk/Source/WebKit2/ChangeLog (96323 => 96324)
--- trunk/Source/WebKit2/ChangeLog 2011-09-29 12:59:17 UTC (rev 96323)
+++ trunk/Source/WebKit2/ChangeLog 2011-09-29 13:53:53 UTC (rev 96324)
@@ -1,5 +1,22 @@
2011-09-29 Carlos Garcia Campos <[email protected]>
+ [GTK] Force single header include in WebKit2 GTK+ API
+ https://bugs.webkit.org/show_bug.cgi?id=69084
+
+ Reviewed by Martin Robinson.
+
+ Only <webkit2/webkit2.h> will be allowed for API users.
+
+ * GNUmakefile.am:
+ * UIProcess/API/gtk/WebKitError.h:
+ * UIProcess/API/gtk/WebKitWebContext.h:
+ * UIProcess/API/gtk/WebKitWebLoaderClient.h:
+ * UIProcess/API/gtk/WebKitWebView.h:
+ * UIProcess/API/gtk/WebKitWebViewBase.h:
+ * UIProcess/API/gtk/webkit2.h:
+
+2011-09-29 Carlos Garcia Campos <[email protected]>
+
[GTK] Explicitly call destructors for objects initialized with placement new syntax
https://bugs.webkit.org/show_bug.cgi?id=69079
Modified: trunk/Source/WebKit2/GNUmakefile.am (96323 => 96324)
--- trunk/Source/WebKit2/GNUmakefile.am 2011-09-29 12:59:17 UTC (rev 96323)
+++ trunk/Source/WebKit2/GNUmakefile.am 2011-09-29 13:53:53 UTC (rev 96324)
@@ -879,6 +879,7 @@
-I$(top_builddir)/DerivedSources/WebKit2/include/WebCore \
-I$(top_builddir)/DerivedSources/WebKit2/include/WebKit2 \
-DLIBEXECDIR=\""$(libexecdir)"\" \
+ -DWEBKIT2_COMPILATION \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
$(_javascript_core_cppflags) \
@@ -1005,6 +1006,9 @@
stamp-webkit2enumtypes: $(webkit2gtk_headers) $(WebKit2)/GNUmakefile.am
$(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2 \
&& glib-mkenums \
+ --fhead "#if !defined(__WEBKIT2_H_INSIDE__) && !defined(WEBKIT2_COMPILATION)\n" \
+ --fhead "#error \"Only <webkit2/webkit2.h> can be included directly.\"\n" \
+ --fhead "#endif\n\n" \
--fhead "#ifndef WEBKIT_ENUM_TYPES_H\n" \
--fhead "#define WEBKIT_ENUM_TYPES_H\n\n" \
--fhead "#include <glib-object.h>\n\n" \
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.h (96323 => 96324)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.h 2011-09-29 12:59:17 UTC (rev 96323)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.h 2011-09-29 13:53:53 UTC (rev 96324)
@@ -18,6 +18,10 @@
* Boston, MA 02110-1301, USA.
*/
+#if !defined(__WEBKIT2_H_INSIDE__) && !defined(WEBKIT2_COMPILATION)
+#error "Only <webkit2/webkit2.h> can be included directly."
+#endif
+
#ifndef WebKitError_h
#define WebKitError_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.h (96323 => 96324)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.h 2011-09-29 12:59:17 UTC (rev 96323)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.h 2011-09-29 13:53:53 UTC (rev 96324)
@@ -17,6 +17,10 @@
* Boston, MA 02110-1301, USA.
*/
+#if !defined(__WEBKIT2_H_INSIDE__) && !defined(WEBKIT2_COMPILATION)
+#error "Only <webkit2/webkit2.h> can be included directly."
+#endif
+
#ifndef WebKitWebContext_h
#define WebKitWebContext_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h (96323 => 96324)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h 2011-09-29 12:59:17 UTC (rev 96323)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h 2011-09-29 13:53:53 UTC (rev 96324)
@@ -17,6 +17,10 @@
* Boston, MA 02110-1301, USA.
*/
+#if !defined(__WEBKIT2_H_INSIDE__) && !defined(WEBKIT2_COMPILATION)
+#error "Only <webkit2/webkit2.h> can be included directly."
+#endif
+
#ifndef WebKitWebLoaderClient_h
#define WebKitWebLoaderClient_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (96323 => 96324)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-09-29 12:59:17 UTC (rev 96323)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-09-29 13:53:53 UTC (rev 96324)
@@ -20,6 +20,10 @@
* Boston, MA 02110-1301, USA.
*/
+#if !defined(__WEBKIT2_H_INSIDE__) && !defined(WEBKIT2_COMPILATION)
+#error "Only <webkit2/webkit2.h> can be included directly."
+#endif
+
#ifndef WebKitWebView_h
#define WebKitWebView_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.h (96323 => 96324)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.h 2011-09-29 12:59:17 UTC (rev 96323)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.h 2011-09-29 13:53:53 UTC (rev 96324)
@@ -25,6 +25,10 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if !defined(__WEBKIT2_H_INSIDE__) && !defined(WEBKIT2_COMPILATION)
+#error "Only <webkit2/webkit2.h> can be included directly."
+#endif
+
#ifndef WebKitWebViewBase_h
#define WebKitWebViewBase_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/webkit2.h (96323 => 96324)
--- trunk/Source/WebKit2/UIProcess/API/gtk/webkit2.h 2011-09-29 12:59:17 UTC (rev 96323)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/webkit2.h 2011-09-29 13:53:53 UTC (rev 96324)
@@ -20,10 +20,15 @@
#ifndef __WEBKIT2_H__
#define __WEBKIT2_H__
+#define __WEBKIT2_H_INSIDE__
+
#include <webkit2/WebKitEnumTypes.h>
#include <webkit2/WebKitError.h>
#include <webkit2/WebKitWebContext.h>
+#include <webkit2/WebKitWebLoaderClient.h>
#include <webkit2/WebKitWebViewBase.h>
#include <webkit2/WebKitWebView.h>
+#undef __WEBKIT2_H_INSIDE__
+
#endif /* __WEBKIT2_H__ */
