Title: [111696] trunk
Revision
111696
Author
carlo...@webkit.org
Date
2012-03-22 07:56:33 -0700 (Thu, 22 Mar 2012)

Log Message

[GTK] Use the angle-bracket form to include wtf headers
https://bugs.webkit.org/show_bug.cgi?id=81884

Patch by Carlos Garcia Campos <cgar...@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 <_javascript_Core/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:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (111695 => 111696)


--- trunk/Source/WebCore/ChangeLog	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebCore/ChangeLog	2012-03-22 14:56:33 UTC (rev 111696)
@@ -1,3 +1,18 @@
+2012-03-22  Carlos Garcia Campos  <cgar...@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  <apav...@chromium.org>
 
         Web Inspector: Case of the elements of the xml document should be shown as it is in the console

Modified: trunk/Source/WebCore/platform/graphics/freetype/FontPlatformData.h (111695 => 111696)


--- trunk/Source/WebCore/platform/graphics/freetype/FontPlatformData.h	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebCore/platform/graphics/freetype/FontPlatformData.h	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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;
 

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (111695 => 111696)


--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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

Modified: trunk/Source/WebCore/platform/gtk/DataObjectGtk.h (111695 => 111696)


--- trunk/Source/WebCore/platform/gtk/DataObjectGtk.h	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebCore/platform/gtk/DataObjectGtk.h	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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>
 

Modified: trunk/Source/WebCore/platform/network/ResourceHandleInternal.h (111695 => 111696)


--- trunk/Source/WebCore/platform/network/ResourceHandleInternal.h	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebCore/platform/network/ResourceHandleInternal.h	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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>

Modified: trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp (111695 => 111696)


--- trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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>

Modified: trunk/Source/WebKit/gtk/ChangeLog (111695 => 111696)


--- trunk/Source/WebKit/gtk/ChangeLog	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit/gtk/ChangeLog	2012-03-22 14:56:33 UTC (rev 111696)
@@ -1,3 +1,32 @@
+2012-03-22  Carlos Garcia Campos  <cgar...@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....@samsung.com>
 
         Convert hasSpellingMarker to use Internals interface.

Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.cpp (111695 => 111696)


--- trunk/Source/WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.cpp	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.cpp	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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;
 

Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DragClientGtk.h (111695 => 111696)


--- trunk/Source/WebKit/gtk/WebCoreSupport/DragClientGtk.h	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DragClientGtk.h	2012-03-22 14:56:33 UTC (rev 111696)
@@ -32,7 +32,7 @@
 
 #include "DragClient.h"
 #include "DragIcon.h"
-#include "GRefPtr.h"
+#include <wtf/gobject/GRefPtr.h>
 
 typedef struct _WebKitWebView WebKitWebView;
 

Modified: trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (111695 => 111696)


--- trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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>
 

Modified: trunk/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h (111695 => 111696)


--- trunk/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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);

Modified: trunk/Source/WebKit/gtk/WebCoreSupport/GeolocationClientGtk.h (111695 => 111696)


--- trunk/Source/WebKit/gtk/WebCoreSupport/GeolocationClientGtk.h	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/GeolocationClientGtk.h	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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;
 

Modified: trunk/Source/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h (111695 => 111696)


--- trunk/Source/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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;

Modified: trunk/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp (111695 => 111696)


--- trunk/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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;

Modified: trunk/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.h (111695 => 111696)


--- trunk/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.h	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.h	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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;
 

Modified: trunk/Source/WebKit/gtk/webkit/webkitdownload.cpp (111695 => 111696)


--- trunk/Source/WebKit/gtk/webkit/webkitdownload.cpp	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit/gtk/webkit/webkitdownload.cpp	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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

Modified: trunk/Source/WebKit/gtk/webkit/webkitfavicondatabase.cpp (111695 => 111696)


--- trunk/Source/WebKit/gtk/webkit/webkitfavicondatabase.cpp	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit/gtk/webkit/webkitfavicondatabase.cpp	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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>
 
 /**

Modified: trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp (111695 => 111696)


--- trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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>

Modified: trunk/Source/WebKit/gtk/webkit/webkithittestresult.cpp (111695 => 111696)


--- trunk/Source/WebKit/gtk/webkit/webkithittestresult.cpp	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit/gtk/webkit/webkithittestresult.cpp	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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>
 
 /**

Modified: trunk/Source/WebKit/gtk/webkit/webkitnetworkrequest.cpp (111695 => 111696)


--- trunk/Source/WebKit/gtk/webkit/webkitnetworkrequest.cpp	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit/gtk/webkit/webkitnetworkrequest.cpp	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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>
 
 /**

Modified: trunk/Source/WebKit/gtk/webkit/webkitnetworkresponse.cpp (111695 => 111696)


--- trunk/Source/WebKit/gtk/webkit/webkitnetworkresponse.cpp	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit/gtk/webkit/webkitnetworkresponse.cpp	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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>
 
 /**

Modified: trunk/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp (111695 => 111696)


--- trunk/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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>
 
 /**

Modified: trunk/Source/WebKit/gtk/webkit/webkitwebdatasourceprivate.h (111695 => 111696)


--- trunk/Source/WebKit/gtk/webkit/webkitwebdatasourceprivate.h	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebdatasourceprivate.h	2012-03-22 14:56:33 UTC (rev 111696)
@@ -23,8 +23,8 @@
 #ifndef webkitwebdatasourceprivate_h
 #define webkitwebdatasourceprivate_h
 
-#include "RefPtr.h"
 #include "webkitwebdatasource.h"
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
 

Modified: trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp (111695 => 111696)


--- trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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>

Modified: trunk/Source/WebKit/gtk/webkit/webkitwebsettingsprivate.h (111695 => 111696)


--- trunk/Source/WebKit/gtk/webkit/webkitwebsettingsprivate.h	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebsettingsprivate.h	2012-03-22 14:56:33 UTC (rev 111696)
@@ -23,8 +23,8 @@
 #ifndef webkitwebsettingsprivate_h
 #define webkitwebsettingsprivate_h
 
-#include "CString.h"
 #include "webkitwebsettings.h"
+#include <wtf/text/CString.h>
 
 extern "C" {
 

Modified: trunk/Source/WebKit/gtk/webkit/webkitwebviewprivate.h (111695 => 111696)


--- trunk/Source/WebKit/gtk/webkit/webkitwebviewprivate.h	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebviewprivate.h	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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*);

Modified: trunk/Source/WebKit2/ChangeLog (111695 => 111696)


--- trunk/Source/WebKit2/ChangeLog	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit2/ChangeLog	2012-03-22 14:56:33 UTC (rev 111696)
@@ -1,3 +1,15 @@
+2012-03-22  Carlos Garcia Campos  <cgar...@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 <_javascript_Core/foo>.
+
+        * UIProcess/API/gtk/tests/TestMain.h:
+        * UIProcess/API/gtk/tests/TestWebKitSettings.cpp:
+
 2012-03-22  No'am Rosenthal  <noam.rosent...@nokia.com>
 
         [Qt][WK2] The background appears to have one extra pixel from the contents

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestMain.h (111695 => 111696)


--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestMain.h	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestMain.h	2012-03-22 14:56:33 UTC (rev 111696)
@@ -20,9 +20,9 @@
 #ifndef TestMain_h
 #define TestMain_h
 
-#include <_javascript_Core/GOwnPtr.h>
-#include <_javascript_Core/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) \

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp (111695 => 111696)


--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp	2012-03-22 14:56:33 UTC (rev 111696)
@@ -31,9 +31,9 @@
 #include "config.h"
 
 #include "TestMain.h"
-#include <_javascript_Core/GRefPtr.h>
 #include <gtk/gtk.h>
 #include <webkit2/webkit2.h>
+#include <wtf/gobject/GRefPtr.h>
 
 static void testWebKitSettings(Test*, gconstpointer)
 {

Modified: trunk/Tools/ChangeLog (111695 => 111696)


--- trunk/Tools/ChangeLog	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Tools/ChangeLog	2012-03-22 14:56:33 UTC (rev 111696)
@@ -1,3 +1,19 @@
+2012-03-22  Carlos Garcia Campos  <cgar...@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.fae...@nokia.com>
 
         Unreviewed, add Michael Brüning and Allan Jensen to committers.py.

Modified: trunk/Tools/DumpRenderTree/gtk/AccessibilityCallbacks.cpp (111695 => 111696)


--- trunk/Tools/DumpRenderTree/gtk/AccessibilityCallbacks.cpp	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Tools/DumpRenderTree/gtk/AccessibilityCallbacks.cpp	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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;

Modified: trunk/Tools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp (111695 => 111696)


--- trunk/Tools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Tools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp	2012-03-22 14:56:33 UTC (rev 111696)
@@ -27,13 +27,13 @@
 #include "config.h"
 #include "AccessibilityUIElement.h"
 
-#include "GOwnPtr.h"
-#include "GRefPtr.h"
 #include "WebCoreSupport/DumpRenderTreeSupportGtk.h"
 #include <_javascript_Core/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)

Modified: trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (111695 => 111696)


--- trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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)

Modified: trunk/Tools/DumpRenderTree/gtk/EditingCallbacks.cpp (111695 => 111696)


--- trunk/Tools/DumpRenderTree/gtk/EditingCallbacks.cpp	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Tools/DumpRenderTree/gtk/EditingCallbacks.cpp	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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)
 {

Modified: trunk/Tools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp (111695 => 111696)


--- trunk/Tools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Tools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp	2012-03-22 14:56:33 UTC (rev 111696)
@@ -22,10 +22,10 @@
 
 #include "DumpRenderTree.h"
 
-#include <GOwnPtr.h>
 #include <_javascript_Core/JSStringRef.h>
+#include <string.h>
 #include <webkit/webkit.h>
-#include <string.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)

Modified: trunk/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp (111695 => 111696)


--- trunk/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp	2012-03-22 14:53:28 UTC (rev 111695)
+++ trunk/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp	2012-03-22 14:56:33 UTC (rev 111696)
@@ -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 {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to