Attachment 133210 Details for Bug 81884 – Patch

[patch] Patch

wk-wtf-includes.diff (text/plain), 22.36 KB, created by Carlos Garcia Campos on 2012-03-22 02:41:30 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2012-03-22 02:41:30 PDT

Size: 22.36 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 520c99d..9b6a1be 100644
>--- 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 NOBODY (OOPS!).
>+
>+        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  Kent Tamura  <tkent@chromium.org>
> 
>         Expand RenderTextControlSingleLine::controlClipRect() to contain contentRect().
>diff --git a/Source/WebKit/gtk/ChangeLog b/Source/WebKit/gtk/ChangeLog
>index 8bd6988..36b1d2f 100644
>--- 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 NOBODY (OOPS!).
>+
>+        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/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index a8c8b3f..0b76e3f 100644
>--- 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 NOBODY (OOPS!).
>+
>+        Use #include <wtf/foo> instead of #include <JavaScriptCore/foo>.
>+
>+        * UIProcess/API/gtk/tests/TestMain.h:
>+        * UIProcess/API/gtk/tests/TestWebKitSettings.cpp:
>+
> 2012-03-21  Tim Horton  <timothy_horton@apple.com>
> 
>         Make use of CG rounded-rect primitives
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 537a802..816cd4c 100644
>--- 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 NOBODY (OOPS!).
>+
>+        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  Philippe Normand  <pnormand@igalia.com>
> 
>         Unreviewed, test-webkitpy fix after r111642.
>diff --git a/Source/WebCore/platform/graphics/freetype/FontPlatformData.h b/Source/WebCore/platform/graphics/freetype/FontPlatformData.h
>index d63363b..206653d 100644
>--- 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 03066dc..6ee7a79 100644
>--- 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 b5a81e3..5281b1e 100644
>--- 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 bc79ed1..e4a4c38 100644
>--- 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 a5be55a..600fb4c 100644
>--- 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/WebCoreSupport/DocumentLoaderGtk.cpp b/Source/WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.cpp
>index 6031b62..1edc712 100644
>--- 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 55876c4..76c7596 100644
>--- 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 5795225..e35603f 100644
>--- 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 cbc5c25..817bc19 100644
>--- 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 839e5b2..602e0f2 100644
>--- 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 db558f0..63fc420 100644
>--- 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 6dbb48f..71c4dcb 100644
>--- 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 b3fa049..db4f71e 100644
>--- 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 75cbcbb..8a26584 100644
>--- 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 29f269d..9ba5113 100644
>--- 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 c13dbb7..a343952 100644
>--- 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 cb7ac4b..2590d8e 100644
>--- 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 00b09e3..5ddb1be 100644
>--- 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 e9bc151..80a29b6 100644
>--- 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 e68f215..f51a12f 100644
>--- 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 5c18493..8e253fa 100644
>--- 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 2531258..f5fa0bf 100644
>--- 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 240d79f..45f8223 100644
>--- 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 eb4ef65..1fe21cd 100644
>--- 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/UIProcess/API/gtk/tests/TestMain.h b/Source/WebKit2/UIProcess/API/gtk/tests/TestMain.h
>index 39a2000..36540c1 100644
>--- 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 c66a05e..19491c2 100644
>--- 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/DumpRenderTree/gtk/AccessibilityCallbacks.cpp b/Tools/DumpRenderTree/gtk/AccessibilityCallbacks.cpp
>index a24d367..8f2c802 100644
>--- 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 f110a82..cedacdb 100644
>--- 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 356ba54..f0f1ab5 100644
>--- 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 2586611..2ef80dc 100644
>--- 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 d10b193..23eca7b 100644
>--- 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 7b4c815..7195617 100644
>--- 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 {

Flags:

eric: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 81884: 133210