[webkit-changes] [105158] trunk/Source/WebKit2

Tue, 17 Jan 2012 07:37:52 -0800

Title: [105158] trunk/Source/WebKit2
Revision
105158
Author
[email protected]
Date
2012-01-17 07:37:43 -0800 (Tue, 17 Jan 2012)

Log Message

[GTK] [WK2] WebKitPrivate should include the entire WebKit2 C API
https://bugs.webkit.org/show_bug.cgi?id=76345

Patch by Martin Robinson <[email protected]> on 2012-01-17
Reviewed by Gustavo Noronha Silva.

Isolate all of the WebKit2 C API includes into WebKitPrivate.h and no longer
include anything other than WebKit2.h for the C API.

* UIProcess/API/gtk/WebKitBackForwardList.cpp: Use WebKitPrivate.h now.
* UIProcess/API/gtk/WebKitBackForwardListItem.cpp: Ditto.
* UIProcess/API/gtk/WebKitPrivate.h: Add WebKit2.h, WKAPICast.h and WKRetainPtr.h includes.
* UIProcess/API/gtk/WebKitSettings.cpp: Use WebKitPrivate.h.
* UIProcess/API/gtk/WebKitUIClient.cpp: Ditto.
* UIProcess/API/gtk/WebKitWebContext.cpp: Ditto.
* UIProcess/API/gtk/WebKitWebView.cpp: Ditto.
* UIProcess/API/gtk/WebKitWebViewBase.cpp: Ditto.
* UIProcess/API/gtk/WebKitWindowProperties.cpp: Ditto.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (105157 => 105158)


--- trunk/Source/WebKit2/ChangeLog	2012-01-17 15:37:06 UTC (rev 105157)
+++ trunk/Source/WebKit2/ChangeLog	2012-01-17 15:37:43 UTC (rev 105158)
@@ -1,3 +1,23 @@
+2012-01-17  Martin Robinson  <[email protected]>
+
+        [GTK] [WK2] WebKitPrivate should include the entire WebKit2 C API
+        https://bugs.webkit.org/show_bug.cgi?id=76345
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Isolate all of the WebKit2 C API includes into WebKitPrivate.h and no longer
+        include anything other than WebKit2.h for the C API.
+
+        * UIProcess/API/gtk/WebKitBackForwardList.cpp: Use WebKitPrivate.h now.
+        * UIProcess/API/gtk/WebKitBackForwardListItem.cpp: Ditto.
+        * UIProcess/API/gtk/WebKitPrivate.h: Add WebKit2.h, WKAPICast.h and WKRetainPtr.h includes.
+        * UIProcess/API/gtk/WebKitSettings.cpp: Use WebKitPrivate.h.
+        * UIProcess/API/gtk/WebKitUIClient.cpp: Ditto.
+        * UIProcess/API/gtk/WebKitWebContext.cpp: Ditto.
+        * UIProcess/API/gtk/WebKitWebView.cpp: Ditto.
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp: Ditto.
+        * UIProcess/API/gtk/WebKitWindowProperties.cpp: Ditto.
+
 2012-01-17  Alexander Færøy  <[email protected]>
 
         [Qt] Implement HTTP authentication QML API

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp (105157 => 105158)


--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp	2012-01-17 15:37:06 UTC (rev 105157)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp	2012-01-17 15:37:43 UTC (rev 105158)
@@ -22,7 +22,7 @@
 
 #include "WebKitBackForwardListPrivate.h"
 #include "WebKitMarshal.h"
-#include <WebKit2/WKBackForwardList.h>
+#include "WebKitPrivate.h"
 #include <wtf/gobject/GRefPtr.h>
 
 /**

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.cpp (105157 => 105158)


--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.cpp	2012-01-17 15:37:06 UTC (rev 105157)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.cpp	2012-01-17 15:37:43 UTC (rev 105158)
@@ -21,8 +21,7 @@
 #include "WebKitBackForwardListItem.h"
 
 #include "WebKitBackForwardListPrivate.h"
-#include <WebKit2/WKBackForwardListItem.h>
-#include <WebKit2/WKRetainPtr.h>
+#include "WebKitPrivate.h"
 #include <wtf/HashMap.h>
 #include <wtf/gobject/GRefPtr.h>
 #include <wtf/text/CString.h>

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h (105157 => 105158)


--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h	2012-01-17 15:37:06 UTC (rev 105157)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h	2012-01-17 15:37:43 UTC (rev 105158)
@@ -26,6 +26,9 @@
 #ifndef WebKitPrivate_h
 #define WebKitPrivate_h
 
+#include <WebKit2/WKAPICast.h>
+#include <WebKit2/WKRetainPtr.h>
+#include <WebKit2/WebKit2.h>
 #include <glib.h>
 #include <wtf/Assertions.h>

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp (105157 => 105158)


--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp	2012-01-17 15:37:06 UTC (rev 105157)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp	2012-01-17 15:37:43 UTC (rev 105158)
@@ -33,9 +33,6 @@
 
 #include "WebKitPrivate.h"
 #include "WebKitSettingsPrivate.h"
-#include <WebKit2/WKAPICast.h>
-#include <WebKit2/WKString.h>
-#include <WebKit2/WKRetainPtr.h>
 #include <glib/gi18n-lib.h>
 #include <wtf/text/CString.h>

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp (105157 => 105158)


--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp	2012-01-17 15:37:06 UTC (rev 105157)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp	2012-01-17 15:37:43 UTC (rev 105158)
@@ -20,10 +20,10 @@
 #include "config.h"
 #include "WebKitUIClient.h"
 
+#include "WebKitPrivate.h"
 #include "WebKitWebViewPrivate.h"
 #include "WebKitWindowPropertiesPrivate.h"
 #include "WebPageProxy.h"
-#include <WebKit2/WKBase.h>
 
 using namespace WebKit;

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (105157 => 105158)


--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp	2012-01-17 15:37:06 UTC (rev 105157)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp	2012-01-17 15:37:43 UTC (rev 105158)
@@ -20,10 +20,8 @@
 #include "config.h"
 #include "WebKitWebContext.h"
 
+#include "WebKitPrivate.h"
 #include "WebKitWebContextPrivate.h"
-#include <WebKit2/WKContext.h>
-#include <WebKit2/WKRetainPtr.h>
-#include <WebKit2/WKType.h>
 
 struct _WebKitWebContextPrivate {
     WKRetainPtr<WKContextRef> context;

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (105157 => 105158)


--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp	2012-01-17 15:37:06 UTC (rev 105157)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp	2012-01-17 15:37:43 UTC (rev 105158)
@@ -35,9 +35,6 @@
 #include "WebKitPrivate.h"
 #include "WebPageProxy.h"
 #include <WebCore/DragIcon.h>
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKRetainPtr.h>
-#include <WebKit2/WKURL.h>
 #include <glib/gi18n-lib.h>
 #include <wtf/gobject/GOwnPtr.h>
 #include <wtf/gobject/GRefPtr.h>

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (105157 => 105158)


--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp	2012-01-17 15:37:06 UTC (rev 105157)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp	2012-01-17 15:37:43 UTC (rev 105158)
@@ -35,6 +35,7 @@
 #include "PageClientImpl.h"
 #include "WebContext.h"
 #include "WebEventFactory.h"
+#include "WebKitPrivate.h"
 #include "WebKitWebViewBasePrivate.h"
 #include "WebPageProxy.h"
 #include <WebCore/ClipboardGtk.h>
@@ -50,7 +51,6 @@
 #include <WebCore/PasteboardHelper.h>
 #include <WebCore/RefPtrCairo.h>
 #include <WebCore/Region.h>
-#include <WebKit2/WKContext.h>
 #include <wtf/gobject/GOwnPtr.h>
 #include <wtf/gobject/GRefPtr.h>
 #include <wtf/text/CString.h>

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWindowProperties.cpp (105157 => 105158)


--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWindowProperties.cpp	2012-01-17 15:37:06 UTC (rev 105157)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWindowProperties.cpp	2012-01-17 15:37:43 UTC (rev 105158)
@@ -24,10 +24,6 @@
 #include "WebKitWindowPropertiesPrivate.h"
 #include "WebURLRequest.h"
 #include <WebCore/IntRect.h>
-#include <WebKit2/WKDictionary.h>
-#include <WebKit2/WKNumber.h>
-#include <WebKit2/WKRetainPtr.h>
-#include <WebKit2/WKString.h>
 #include <glib/gi18n-lib.h>
 
 /**

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to