[GTK] Use the angle-bracket form to include wtf headers

https://bugs.webkit.org/show_bug.cgi?id=81884

Patch by Carlos Garcia Campos <cgarcia@bb-webkit-rel-64.local.igalia.com> on 2012-03-22
Reviewed by Eric Seidel.

Source/WebCore:

Use #include <wtf/foo> instead of #include "foo".

* platform/graphics/freetype/FontPlatformData.h:
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
* platform/gtk/DataObjectGtk.h:
* platform/network/ResourceHandleInternal.h:
* platform/network/soup/SocketStreamHandleSoup.cpp:

Source/WebKit/gtk:

Use #include <wtf/foo> instead of #include "foo".

* WebCoreSupport/DocumentLoaderGtk.cpp:
* WebCoreSupport/DragClientGtk.h:
* WebCoreSupport/FrameLoaderClientGtk.cpp:
* WebCoreSupport/FullscreenVideoController.h:
* WebCoreSupport/GeolocationClientGtk.h:
* WebCoreSupport/InspectorClientGtk.h:
* WebCoreSupport/TextCheckerClientGtk.cpp:
* WebCoreSupport/TextCheckerClientGtk.h:
* webkit/webkitdownload.cpp:
* webkit/webkitfavicondatabase.cpp:
* webkit/webkitglobals.cpp:
* webkit/webkithittestresult.cpp:
* webkit/webkitnetworkrequest.cpp:
* webkit/webkitnetworkresponse.cpp:
* webkit/webkitspellcheckerenchant.cpp:
* webkit/webkitwebdatasourceprivate.h:
* webkit/webkitwebsettings.cpp:
* webkit/webkitwebsettingsprivate.h:
* webkit/webkitwebviewprivate.h:

Source/WebKit2:

Use #include <wtf/foo> instead of #include <JavaScriptCore/foo>.

* UIProcess/API/gtk/tests/TestMain.h:
* UIProcess/API/gtk/tests/TestWebKitSettings.cpp:

Tools:

Use #include <wtf/foo> instead of #include "foo".

* DumpRenderTree/gtk/AccessibilityCallbacks.cpp:
* DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp:
* DumpRenderTree/gtk/DumpRenderTree.cpp:
* DumpRenderTree/gtk/EditingCallbacks.cpp:
* DumpRenderTree/gtk/WorkQueueItemGtk.cpp:
* WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@111696 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 31e1b4916942aa7b24bfbcab567678cf1b9d3a96..b8bb9338059a1ba3202b0e4dead4a6c558043a2b 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2012-03-22  Carlos Garcia Campos  <cgarcia@bb-webkit-rel-64.local.igalia.com>
+
+        [GTK] Use the angle-bracket form to include wtf headers
+        https://bugs.webkit.org/show_bug.cgi?id=81884
+
+        Reviewed by Eric Seidel.
+
+        Use #include <wtf/foo> instead of #include "foo".
+
+        * platform/graphics/freetype/FontPlatformData.h:
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        * platform/gtk/DataObjectGtk.h:
+        * platform/network/ResourceHandleInternal.h:
+        * platform/network/soup/SocketStreamHandleSoup.cpp:
+
 2012-03-22  Alexander Pavlov  <apavlov@chromium.org>
 
         Web Inspector: Case of the elements of the xml document should be shown as it is in the console

diff --git a/Source/WebCore/platform/graphics/freetype/FontPlatformData.h b/Source/WebCore/platform/graphics/freetype/FontPlatformData.h
index d63363b1319987583d0ff52132d986b7de5e2252..206653ddf7f87cdc0c0d7ae1ef94bd39d677f2d9 100644 (file)
--- a/Source/WebCore/platform/graphics/freetype/FontPlatformData.h
+++ b/Source/WebCore/platform/graphics/freetype/FontPlatformData.h
@@ -29,9 +29,9 @@
 #include "FontDescription.h"
 #include "FontOrientation.h"
 #include "GlyphBuffer.h"
-#include "HashFunctions.h"
 #include "RefPtrCairo.h"
 #include <wtf/Forward.h>
+#include <wtf/HashFunctions.h>
 
 typedef struct _FcFontSet FcFontSet;
 

diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
index 03066dc9795636987cbfe29beecf2530be469cbf..6ee7a7939a7fc5f25a1aefeba303acbbe9120cf1 100644 (file)
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -44,11 +44,11 @@
 #include "TimeRanges.h"
 #include "VideoSinkGStreamer.h"
 #include "WebKitWebSourceGStreamer.h"
-#include <GOwnPtr.h>
 #include <gst/gst.h>
 #include <gst/video/video.h>
 #include <limits>
 #include <math.h>
+#include <wtf/gobject/GOwnPtr.h>
 #include <wtf/text/CString.h>
 
 #ifdef GST_API_VERSION_1

diff --git a/Source/WebCore/platform/gtk/DataObjectGtk.h b/Source/WebCore/platform/gtk/DataObjectGtk.h
index b5a81e3d559b92c5f27788d28da22d76bcb800dc..5281b1e178bf947da2c080d383eaa506b6a63980 100644 (file)
--- a/Source/WebCore/platform/gtk/DataObjectGtk.h
+++ b/Source/WebCore/platform/gtk/DataObjectGtk.h
@@ -20,10 +20,10 @@
 #define DataObjectGtk_h
 
 #include "FileList.h"
-#include <GRefPtr.h>
 #include "KURL.h"
 #include "Range.h"
 #include <wtf/RefCounted.h>
+#include <wtf/gobject/GRefPtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringHash.h>
 

diff --git a/Source/WebCore/platform/network/ResourceHandleInternal.h b/Source/WebCore/platform/network/ResourceHandleInternal.h
index bc79ed12b6cafa262ed49beef98b9774c5fa6c80..e4a4c38296427a491299294c053ff2f78613c054 100644 (file)
--- a/Source/WebCore/platform/network/ResourceHandleInternal.h
+++ b/Source/WebCore/platform/network/ResourceHandleInternal.h
@@ -46,7 +46,7 @@
 #endif
 
 #if USE(SOUP)
-#include <GRefPtr.h>
+#include <wtf/gobject/GRefPtr.h>
 #define LIBSOUP_USE_UNSTABLE_REQUEST_API
 #include <libsoup/soup-request.h>
 #include <libsoup/soup.h>

diff --git a/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp b/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp
index a5be55a1e05af7977667f172509193f83e0e574f..600fb4cb6ad5ff711b76109924e323c1deed1fb3 100644 (file)
--- a/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp
+++ b/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp
@@ -33,7 +33,6 @@
 
 #include "KURL.h"
 #include "Logging.h"
-#include "NotFound.h"
 #include "NotImplemented.h"
 #include "SocketStreamError.h"
 #include "SocketStreamHandleClient.h"
@@ -41,6 +40,7 @@
 #include <gio/gio.h>
 #include <glib.h>
 
+#include <wtf/NotFound.h>
 #include <wtf/Vector.h>
 #include <wtf/gobject/GOwnPtr.h>
 #include <wtf/text/CString.h>

diff --git a/Source/WebKit/gtk/ChangeLog b/Source/WebKit/gtk/ChangeLog
index 8bd6988655dedfb58c6ed24be5589622dcd28f74..68934df7cb87a7d56441e03d470a8dc41a2634a6 100644 (file)
--- a/Source/WebKit/gtk/ChangeLog
+++ b/Source/WebKit/gtk/ChangeLog
@@ -1,3 +1,32 @@
+2012-03-22  Carlos Garcia Campos  <cgarcia@bb-webkit-rel-64.local.igalia.com>
+
+        [GTK] Use the angle-bracket form to include wtf headers
+        https://bugs.webkit.org/show_bug.cgi?id=81884
+
+        Reviewed by Eric Seidel.
+
+        Use #include <wtf/foo> instead of #include "foo".
+
+        * WebCoreSupport/DocumentLoaderGtk.cpp:
+        * WebCoreSupport/DragClientGtk.h:
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        * WebCoreSupport/FullscreenVideoController.h:
+        * WebCoreSupport/GeolocationClientGtk.h:
+        * WebCoreSupport/InspectorClientGtk.h:
+        * WebCoreSupport/TextCheckerClientGtk.cpp:
+        * WebCoreSupport/TextCheckerClientGtk.h:
+        * webkit/webkitdownload.cpp:
+        * webkit/webkitfavicondatabase.cpp:
+        * webkit/webkitglobals.cpp:
+        * webkit/webkithittestresult.cpp:
+        * webkit/webkitnetworkrequest.cpp:
+        * webkit/webkitnetworkresponse.cpp:
+        * webkit/webkitspellcheckerenchant.cpp:
+        * webkit/webkitwebdatasourceprivate.h:
+        * webkit/webkitwebsettings.cpp:
+        * webkit/webkitwebsettingsprivate.h:
+        * webkit/webkitwebviewprivate.h:
+
 2012-03-20  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 
         Convert hasSpellingMarker to use Internals interface.

diff --git a/Source/WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.cpp b/Source/WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.cpp
index 6031b6231bc8178ead056d3a51e8607a7c30a582..1edc712608b5aabde850068a88c36321589bdd62 100644 (file)
--- a/Source/WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.cpp
+++ b/Source/WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.cpp
@@ -30,9 +30,9 @@
 #include "config.h"
 #include "DocumentLoaderGtk.h"
 
-#include "GRefPtr.h"
 #include "webkitwebdatasource.h"
 #include "webkitwebdatasourceprivate.h"
+#include <wtf/gobject/GRefPtr.h>
 
 using namespace WebCore;
 

diff --git a/Source/WebKit/gtk/WebCoreSupport/DragClientGtk.h b/Source/WebKit/gtk/WebCoreSupport/DragClientGtk.h
index 55876c46a628cbd84395bffdbe31e70508d23b74..76c7596019536026070a45995354d38bf5bf2f8d 100644 (file)
--- a/Source/WebKit/gtk/WebCoreSupport/DragClientGtk.h
+++ b/Source/WebKit/gtk/WebCoreSupport/DragClientGtk.h
@@ -32,7 +32,7 @@
 
 #include "DragClient.h"
 #include "DragIcon.h"
-#include "GRefPtr.h"
+#include <wtf/gobject/GRefPtr.h>
 
 typedef struct _WebKitWebView WebKitWebView;
 

diff --git a/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
index 5795225b139f85f0744cf676bd7cf358c6b9b133..e35603fc7487b26093028e3508eb4d7060b8c8dd 100644 (file)
--- a/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
+++ b/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
@@ -39,8 +39,6 @@
 #include "FrameNetworkingContextGtk.h"
 #include "FrameTree.h"
 #include "FrameView.h"
-#include "GOwnPtr.h"
-#include "GRefPtr.h"
 #include "GtkPluginWidget.h"
 #include "HTMLAppletElement.h"
 #include "HTMLFormElement.h"
@@ -92,6 +90,8 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 #include <stdio.h>
+#include <wtf/gobject/GOwnPtr.h>
+#include <wtf/gobject/GRefPtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringConcatenate.h>
 

diff --git a/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h b/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h
index cbc5c25520cdb5d0eed09ce3f42fb7a26055b00c..817bc19dfa1b731cf3b248098240115c4c30a834 100644 (file)
--- a/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h
+++ b/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h
@@ -22,10 +22,10 @@
 
 #if ENABLE(VIDEO) && !defined(GST_API_VERSION_1)
 
-#include "GRefPtr.h"
 #include "GStreamerGWorld.h"
 #include "HTMLMediaElement.h"
 #include <wtf/RefPtr.h>
+#include <wtf/gobject/GRefPtr.h>
 
 class FullscreenVideoController {
     WTF_MAKE_NONCOPYABLE(FullscreenVideoController);

diff --git a/Source/WebKit/gtk/WebCoreSupport/GeolocationClientGtk.h b/Source/WebKit/gtk/WebCoreSupport/GeolocationClientGtk.h
index 839e5b26b0fe2d84664f8947b7369adc52e6f9dc..602e0f2a68d2ee709c95dcde6b9dd4104afa2251 100644 (file)
--- a/Source/WebKit/gtk/WebCoreSupport/GeolocationClientGtk.h
+++ b/Source/WebKit/gtk/WebCoreSupport/GeolocationClientGtk.h
@@ -23,11 +23,11 @@
 
 #if ENABLE(GEOLOCATION)
 
-#include "GRefPtr.h"
 #include "GeolocationClient.h"
 #include "GeolocationPosition.h"
 #include <geoclue/geoclue-master.h>
 #include <geoclue/geoclue-position.h>
+#include <wtf/gobject/GRefPtr.h>
 
 typedef struct _WebKitWebView WebKitWebView;
 

diff --git a/Source/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h b/Source/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h
index db558f09678935c817565227f0bf76d4ef39ab8f..63fc42012aefc877d266e40622661af1171f876c 100644 (file)
--- a/Source/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h
+++ b/Source/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h
@@ -29,13 +29,13 @@
 #ifndef InspectorClientGtk_h
 #define InspectorClientGtk_h
 
-#include "GOwnPtr.h"
-#include "GRefPtr.h"
 #include "InspectorClient.h"
 #include "InspectorFrontendClientLocal.h"
 #include "webkitwebview.h"
 #include "webkitwebinspector.h"
 #include <wtf/Forward.h>
+#include <wtf/gobject/GOwnPtr.h>
+#include <wtf/gobject/GRefPtr.h>
 
 namespace WebCore {
     class Page;

diff --git a/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp b/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp
index 6dbb48fd2d2815f63432a6af7d7fde806bdb0cff..71c4dcbb1c9a4f570b48cda9ff9e102482276170 100644 (file)
--- a/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp
+++ b/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp
@@ -24,11 +24,11 @@
 #include "config.h"
 #include "TextCheckerClientGtk.h"
 
-#include "GOwnPtr.h"
 #include "NotImplemented.h"
 #include "webkitspellchecker.h"
 #include "webkitwebsettingsprivate.h"
 #include <glib.h>
+#include <wtf/gobject/GOwnPtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebCore;

diff --git a/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.h b/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.h
index b3fa0499499c98cc163ccc666045a21e764d3d8c..db4f71e1759a47e68b1f13962f42ef07aa4341e9 100644 (file)
--- a/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.h
+++ b/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.h
@@ -31,8 +31,8 @@
 #ifndef TextCheckerClientGtk_h
 #define TextCheckerClientGtk_h
 
-#include "GRefPtr.h"
 #include "TextCheckerClient.h"
+#include <wtf/gobject/GRefPtr.h>
 
 typedef struct _WebKitSpellChecker WebKitSpellChecker;
 

diff --git a/Source/WebKit/gtk/webkit/webkitdownload.cpp b/Source/WebKit/gtk/webkit/webkitdownload.cpp
index 75cbcbb5839c1faa7d24e039dc8442c28c15d3d0..8a2658400ad1d16d4537c253e9c6c0dca01bfbf8 100644 (file)
--- a/Source/WebKit/gtk/webkit/webkitdownload.cpp
+++ b/Source/WebKit/gtk/webkit/webkitdownload.cpp
@@ -22,8 +22,6 @@
 #include "webkitdownload.h"
 
 #include "ErrorsGtk.h"
-#include "GRefPtr.h"
-#include "Noncopyable.h"
 #include "NotImplemented.h"
 #include "ResourceHandleClient.h"
 #include "ResourceHandleInternal.h"
@@ -39,6 +37,8 @@
 #include "webkitnetworkresponseprivate.h"
 #include <glib/gi18n-lib.h>
 #include <glib/gstdio.h>
+#include <wtf/Noncopyable.h>
+#include <wtf/gobject/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 #ifdef ERROR

diff --git a/Source/WebKit/gtk/webkit/webkitfavicondatabase.cpp b/Source/WebKit/gtk/webkit/webkitfavicondatabase.cpp
index 29f269d207bc9f7440a5fe36dd35cdc82e453ddc..9ba51133cb0b5264c8f26b332d22fa7b981ab5e9 100644 (file)
--- a/Source/WebKit/gtk/webkit/webkitfavicondatabase.cpp
+++ b/Source/WebKit/gtk/webkit/webkitfavicondatabase.cpp
@@ -24,7 +24,6 @@
 #include "DatabaseDetails.h"
 #include "DatabaseTracker.h"
 #include "FileSystem.h"
-#include "GRefPtr.h"
 #include "IconDatabase.h"
 #include "IconDatabaseClient.h"
 #include "Image.h"
@@ -38,6 +37,7 @@
 #include <glib/gi18n-lib.h>
 #include <wtf/MainThread.h>
 #include <wtf/gobject/GOwnPtr.h>
+#include <wtf/gobject/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 /**

diff --git a/Source/WebKit/gtk/webkit/webkitglobals.cpp b/Source/WebKit/gtk/webkit/webkitglobals.cpp
index c13dbb7df7fe0792151742222d34f8ecb1b2cdb5..a343952ed7c85cc89063140c39f7cf9ef6fbb5d2 100644 (file)
--- a/Source/WebKit/gtk/webkit/webkitglobals.cpp
+++ b/Source/WebKit/gtk/webkit/webkitglobals.cpp
@@ -25,8 +25,6 @@
 #include "Chrome.h"
 #include "FrameNetworkingContextGtk.h"
 #include "GtkUtilities.h"
-#include "GOwnPtr.h"
-#include "GRefPtr.h"
 #include "IconDatabase.h"
 #include "Logging.h"
 #include "MemoryCache.h"
@@ -53,6 +51,8 @@
 #include <runtime/InitializeThreading.h>
 #include <stdlib.h>
 #include <wtf/MainThread.h>
+#include <wtf/gobject/GOwnPtr.h>
+#include <wtf/gobject/GRefPtr.h>
 
 #if USE(CLUTTER)
 #include <clutter-gtk/clutter-gtk.h>

diff --git a/Source/WebKit/gtk/webkit/webkithittestresult.cpp b/Source/WebKit/gtk/webkit/webkithittestresult.cpp
index cb7ac4b8d051c517f7f0a14df7a440ba0c591b7e..2590d8ec0ec129b4bfd85b8d5c64716ca2e0677e 100644 (file)
--- a/Source/WebKit/gtk/webkit/webkithittestresult.cpp
+++ b/Source/WebKit/gtk/webkit/webkithittestresult.cpp
@@ -21,8 +21,6 @@
 #include "config.h"
 #include "webkithittestresult.h"
 
-#include "GOwnPtr.h"
-#include "GRefPtr.h"
 #include "HitTestResult.h"
 #include "KURL.h"
 #include "WebKitDOMBinding.h"
@@ -31,6 +29,8 @@
 #include "webkitglobals.h"
 #include "webkitglobalsprivate.h"
 #include <glib/gi18n-lib.h>
+#include <wtf/gobject/GOwnPtr.h>
+#include <wtf/gobject/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 /**

diff --git a/Source/WebKit/gtk/webkit/webkitnetworkrequest.cpp b/Source/WebKit/gtk/webkit/webkitnetworkrequest.cpp
index 00b09e3f7749ab679967c5eba2b56990a90b625e..5ddb1be188663cbaa9d6df493c0dd78567a45d00 100644 (file)
--- a/Source/WebKit/gtk/webkit/webkitnetworkrequest.cpp
+++ b/Source/WebKit/gtk/webkit/webkitnetworkrequest.cpp
@@ -21,10 +21,10 @@
 #include "config.h"
 #include "webkitnetworkrequest.h"
 
-#include "GRefPtr.h"
 #include "ResourceRequest.h"
 #include "webkitglobalsprivate.h"
 #include <glib/gi18n-lib.h>
+#include <wtf/gobject/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 /**

diff --git a/Source/WebKit/gtk/webkit/webkitnetworkresponse.cpp b/Source/WebKit/gtk/webkit/webkitnetworkresponse.cpp
index e9bc151d9419c271352cd85185cdfdb8a1b500e0..80a29b6a7c59d1750edd7abb014a4d1c1b0a9a1d 100644 (file)
--- a/Source/WebKit/gtk/webkit/webkitnetworkresponse.cpp
+++ b/Source/WebKit/gtk/webkit/webkitnetworkresponse.cpp
@@ -22,10 +22,10 @@
 #include "config.h"
 #include "webkitnetworkresponse.h"
 
-#include "GRefPtr.h"
 #include "ResourceResponse.h"
 #include "webkitglobalsprivate.h"
 #include <glib/gi18n-lib.h>
+#include <wtf/gobject/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 /**

diff --git a/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp b/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp
index e68f215781a53300f57b10fc43eeb534996b0d0b..f51a12f2396eca02ae55b41c7fc360d45e110a9d 100644 (file)
--- a/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp
+++ b/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp
@@ -21,10 +21,10 @@
 
 #if ENABLE(SPELLCHECK)
 
-#include "GOwnPtr.h"
 #include "webkitspellchecker.h"
 #include <enchant.h>
 #include <gtk/gtk.h>
+#include <wtf/gobject/GOwnPtr.h>
 #include <wtf/text/CString.h>
 
 /**

diff --git a/Source/WebKit/gtk/webkit/webkitwebdatasourceprivate.h b/Source/WebKit/gtk/webkit/webkitwebdatasourceprivate.h
index 5c18493b829c0055a5dfb8b4836833f7c845ef8f..8e253fa76a4ba3ccae2a8e92a66840d93efe1012 100644 (file)
--- a/Source/WebKit/gtk/webkit/webkitwebdatasourceprivate.h
+++ b/Source/WebKit/gtk/webkit/webkitwebdatasourceprivate.h
@@ -23,8 +23,8 @@
 #ifndef webkitwebdatasourceprivate_h
 #define webkitwebdatasourceprivate_h
 
-#include "RefPtr.h"
 #include "webkitwebdatasource.h"
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
 

diff --git a/Source/WebKit/gtk/webkit/webkitwebsettings.cpp b/Source/WebKit/gtk/webkit/webkitwebsettings.cpp
index 2531258b3833e38540000cf8fad4263af0dca6e8..f5fa0bf92410f550c3611750082148029dd4a076 100644 (file)
--- a/Source/WebKit/gtk/webkit/webkitwebsettings.cpp
+++ b/Source/WebKit/gtk/webkit/webkitwebsettings.cpp
@@ -28,13 +28,13 @@
 
 #include "EditingBehavior.h"
 #include "FileSystem.h"
-#include "GOwnPtr.h"
 #include "KURL.h"
 #include "PluginDatabase.h"
 #include "webkitenumtypes.h"
 #include "webkitglobalsprivate.h"
 #include "webkitversion.h"
 #include "webkitwebsettingsprivate.h"
+#include <wtf/gobject/GOwnPtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringConcatenate.h>
 #include <glib/gi18n-lib.h>

diff --git a/Source/WebKit/gtk/webkit/webkitwebsettingsprivate.h b/Source/WebKit/gtk/webkit/webkitwebsettingsprivate.h
index 240d79fad75a027aaa5dff6b5df9c9730cc58e70..45f8223710116023c2b584d4118e15f11fc5e2f4 100644 (file)
--- a/Source/WebKit/gtk/webkit/webkitwebsettingsprivate.h
+++ b/Source/WebKit/gtk/webkit/webkitwebsettingsprivate.h
@@ -23,8 +23,8 @@
 #ifndef webkitwebsettingsprivate_h
 #define webkitwebsettingsprivate_h
 
-#include "CString.h"
 #include "webkitwebsettings.h"
+#include <wtf/text/CString.h>
 
 extern "C" {
 

diff --git a/Source/WebKit/gtk/webkit/webkitwebviewprivate.h b/Source/WebKit/gtk/webkit/webkitwebviewprivate.h
index eb4ef6585397c3379fb04f47b2109f80095688d4..1fe21cdac3f07c23f64aaab12ad1cccf40cb880c 100644 (file)
--- a/Source/WebKit/gtk/webkit/webkitwebviewprivate.h
+++ b/Source/WebKit/gtk/webkit/webkitwebviewprivate.h
@@ -27,11 +27,11 @@
 #include "FullscreenVideoController.h"
 #include "GtkClickCounter.h"
 #include "GtkDragAndDropHelper.h"
-#include "GOwnPtr.h"
 #include "Page.h"
 #include "ResourceHandle.h"
 #include "WidgetBackingStore.h"
 #include <webkit/webkitwebview.h>
+#include <wtf/gobject/GOwnPtr.h>
 
 namespace WebKit {
 WebCore::Page* core(WebKitWebView*);

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 613ca8a23090bd6815e4b49e8d8ce7d631596fd3..04be64f2ec5d1deef229d10616d618dd778bbff8 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2012-03-22  Carlos Garcia Campos  <cgarcia@bb-webkit-rel-64.local.igalia.com>
+
+        [GTK] Use the angle-bracket form to include wtf headers
+        https://bugs.webkit.org/show_bug.cgi?id=81884
+
+        Reviewed by Eric Seidel.
+
+        Use #include <wtf/foo> instead of #include <JavaScriptCore/foo>.
+
+        * UIProcess/API/gtk/tests/TestMain.h:
+        * UIProcess/API/gtk/tests/TestWebKitSettings.cpp:
+
 2012-03-22  No'am Rosenthal  <noam.rosenthal@nokia.com>
 
         [Qt][WK2] The background appears to have one extra pixel from the contents

diff --git a/Source/WebKit2/UIProcess/API/gtk/tests/TestMain.h b/Source/WebKit2/UIProcess/API/gtk/tests/TestMain.h
index 39a2000ac40ce3e9485b09c538061ac301f9ba7f..36540c145c63c2986efa3baab77ba293fe3fbc0d 100644 (file)
--- a/Source/WebKit2/UIProcess/API/gtk/tests/TestMain.h
+++ b/Source/WebKit2/UIProcess/API/gtk/tests/TestMain.h
@@ -20,9 +20,9 @@
 #ifndef TestMain_h
 #define TestMain_h
 
-#include <JavaScriptCore/GOwnPtr.h>
-#include <JavaScriptCore/HashSet.h>
 #include <glib-object.h>
+#include <wtf/HashSet.h>
+#include <wtf/gobject/GOwnPtr.h>
 
 #define MAKE_GLIB_TEST_FIXTURE(ClassName) \
     static void setUp(ClassName* fixture, gconstpointer data) \

diff --git a/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp b/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp
index c66a05ec03ba6b9d636095a3d7701b6aa9175b6a..19491c201c30ea1e07e8ba8b43c29c0ef7b21d82 100644 (file)
--- a/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp
@@ -31,9 +31,9 @@
 #include "config.h"
 
 #include "TestMain.h"
-#include <JavaScriptCore/GRefPtr.h>
 #include <gtk/gtk.h>
 #include <webkit2/webkit2.h>
+#include <wtf/gobject/GRefPtr.h>
 
 static void testWebKitSettings(Test*, gconstpointer)
 {

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 39099589088bcbc9e5bc8ffa1d9d670430aad593..eadf62ec32dddbd20ccdb3faff3c7ca8e8fdf647 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,19 @@
+2012-03-22  Carlos Garcia Campos  <cgarcia@bb-webkit-rel-64.local.igalia.com>
+
+        [GTK] Use the angle-bracket form to include wtf headers
+        https://bugs.webkit.org/show_bug.cgi?id=81884
+
+        Reviewed by Eric Seidel.
+
+        Use #include <wtf/foo> instead of #include "foo".
+
+        * DumpRenderTree/gtk/AccessibilityCallbacks.cpp:
+        * DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp:
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        * DumpRenderTree/gtk/EditingCallbacks.cpp:
+        * DumpRenderTree/gtk/WorkQueueItemGtk.cpp:
+        * WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:
+
 2012-03-22  Alexander Færøy  <alexander.faeroy@nokia.com>
 
         Unreviewed, add Michael Brüning and Allan Jensen to committers.py.

diff --git a/Tools/DumpRenderTree/gtk/AccessibilityCallbacks.cpp b/Tools/DumpRenderTree/gtk/AccessibilityCallbacks.cpp
index a24d36772ea36bd8b75688478bb1a59f3f336829..8f2c802c9d88a84e1e3f447643cde4958e310396 100644 (file)
--- a/Tools/DumpRenderTree/gtk/AccessibilityCallbacks.cpp
+++ b/Tools/DumpRenderTree/gtk/AccessibilityCallbacks.cpp
@@ -31,10 +31,10 @@
 
 #include "AccessibilityController.h"
 #include "DumpRenderTree.h"
-#include "GOwnPtr.h"
 #include "WebCoreSupport/DumpRenderTreeSupportGtk.h"
 #include <gtk/gtk.h>
 #include <webkit/webkit.h>
+#include <wtf/gobject/GOwnPtr.h>
 
 static guint stateChangeListenerId = 0;
 static guint focusEventListenerId = 0;

diff --git a/Tools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp b/Tools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp
index f110a82019e6e94152a4c18ef1efbad4f9c03086..cedacdb6522e9a52e6cf5aa0061469725ff4fd97 100644 (file)
--- a/Tools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp
+++ b/Tools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp
@@ -27,13 +27,13 @@
 #include "config.h"
 #include "AccessibilityUIElement.h"
 
-#include "GOwnPtr.h"
-#include "GRefPtr.h"
 #include "WebCoreSupport/DumpRenderTreeSupportGtk.h"
 #include <JavaScriptCore/JSStringRef.h>
 #include <atk/atk.h>
 #include <gtk/gtk.h>
 #include <wtf/Assertions.h>
+#include <wtf/gobject/GOwnPtr.h>
+#include <wtf/gobject/GRefPtr.h>
 
 AccessibilityUIElement::AccessibilityUIElement(PlatformUIElement element)
     : m_element(element)

diff --git a/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp b/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
index 356ba548c373eccd62db75e9197ab91837746fab..f0f1ab50a1272fb5ef133e4783b35a35c1cbb39f 100644 (file)
--- a/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -36,7 +36,6 @@
 #include "EditingCallbacks.h"
 #include "EventSender.h"
 #include "GCController.h"
-#include "GOwnPtr.h"
 #include "LayoutTestController.h"
 #include "PixelDumpSupport.h"
 #include "SelfScrollingWebKitWebView.h"
@@ -53,6 +52,7 @@
 #include <gtk/gtk.h>
 #include <webkit/webkit.h>
 #include <wtf/Assertions.h>
+#include <wtf/gobject/GOwnPtr.h>
 #include <wtf/gobject/GlibUtilities.h>
 
 #if PLATFORM(X11)

diff --git a/Tools/DumpRenderTree/gtk/EditingCallbacks.cpp b/Tools/DumpRenderTree/gtk/EditingCallbacks.cpp
index 2586611aaa20a272ce8bf9b62676d569db26579c..2ef80dc3972b8adceb93779e6d6d5892fd494609 100644 (file)
--- a/Tools/DumpRenderTree/gtk/EditingCallbacks.cpp
+++ b/Tools/DumpRenderTree/gtk/EditingCallbacks.cpp
@@ -29,12 +29,12 @@
 #include "config.h"
 #include "EditingCallbacks.h"
 
-#include "CString.h"
 #include "DumpRenderTree.h"
-#include "GOwnPtr.h"
 #include "LayoutTestController.h"
 #include <gtk/gtk.h>
 #include <webkit/webkit.h>
+#include <wtf/gobject/GOwnPtr.h>
+#include <wtf/text/CString.h>
 
 static CString dumpNodePath(WebKitDOMNode* node)
 {

diff --git a/Tools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp b/Tools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
index d10b19318bc0fd71d0bcb7f763b75df1e866328e..23eca7b8ba2aabc682abc2c8b2299b8ac7eb41f1 100644 (file)
--- a/Tools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
+++ b/Tools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
@@ -22,10 +22,10 @@
 
 #include "DumpRenderTree.h"
 
-#include <GOwnPtr.h>
 #include <JavaScriptCore/JSStringRef.h>
-#include <webkit/webkit.h>
 #include <string.h>
+#include <webkit/webkit.h>
+#include <wtf/gobject/GOwnPtr.h>
 
 // Returns a newly allocated UTF-8 character buffer which must be freed with g_free()
 gchar* JSStringCopyUTF8CString(JSStringRef jsString)

diff --git a/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp b/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp
index 7b4c81545975fbacd6b9e731b3b5f5134c90e3a0..71956178aac0e4429f125e6f25d789580446f0a2 100644 (file)
--- a/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp
+++ b/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp
@@ -35,12 +35,12 @@
 
 #include "PlatformWebView.h"
 #include "TestController.h"
-#include <GOwnPtr.h>
 #include <GtkVersioning.h>
 #include <wtf/OwnArrayPtr.h>
 #include <wtf/PassOwnArrayPtr.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
+#include <wtf/gobject/GOwnPtr.h>
 #include <wtf/text/WTFString.h>
 
 namespace WTR {