Attachment 132734 Details for Bug 81602 – Patch

[patch] Patch

bug-81602-20120319173841.patch (text/plain), 21.63 KB, created by Eric Seidel (no email) on 2012-03-19 17:38:43 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Seidel (no email)

Created: 2012-03-19 17:38:43 PDT

Size: 21.63 KB

patch

obsolete

>Subversion Revision: 111275
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1c9e61dae7f85d8f702358d1dfdfe8c7f021413d..fd6a2e2f8bab074658c5e3b1632545c39667ce80 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,5 +1,54 @@
> 2012-03-19  Eric Seidel  <eric@webkit.org>
> 
>+        Fix more WTF header include paths in WebCore
>+        https://bugs.webkit.org/show_bug.cgi?id=81602
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Chromium, Mac and Win already build w/o including wtf subdirectories
>+        in their include paths for WebCore/WebKit.  Gtk, Qt, and other ports
>+        should eventually do the same.  This patch fixes up a few loose
>+        wtf includes in these ports using some search/replace across WebCore.
>+        If the EWS bots pass this patch doesn't really need any other review.
>+
>+        * accessibility/gtk/AXObjectCacheAtk.cpp:
>+        * accessibility/gtk/WebKitAccessibleInterfaceText.cpp:
>+        * platform/KURL.cpp:
>+        * platform/audio/gstreamer/AudioDestinationGStreamer.cpp:
>+        * platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
>+        * platform/audio/gtk/AudioBusGtk.cpp:
>+        * platform/clutter/GRefPtrClutter.h:
>+        * platform/graphics/gstreamer/GRefPtrGStreamer.h:
>+        * platform/graphics/gstreamer/ImageGStreamerCairo.cpp:
>+        * platform/graphics/gstreamer/ImageGStreamerQt.cpp:
>+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
>+        * platform/graphics/gtk/ImageBufferGtk.cpp:
>+        * platform/graphics/pango/FontPango.cpp:
>+        * platform/graphics/qt/ImageBufferDataQt.h:
>+        * platform/graphics/wx/ImageBufferDataWx.h:
>+        * platform/gtk/ContextMenuGtk.cpp:
>+        * platform/gtk/ContextMenuItemGtk.cpp:
>+        * platform/gtk/FileSystemGtk.cpp:
>+        * platform/gtk/GOwnPtrGtk.h:
>+        * platform/gtk/GtkAuthenticationDialog.h:
>+        * platform/gtk/GtkPopupMenu.cpp:
>+        * platform/gtk/LanguageGtk.cpp:
>+        * platform/gtk/LocalizedStringsGtk.cpp:
>+        * platform/gtk/PopupMenuGtk.cpp:
>+        * platform/gtk/RenderThemeGtk.cpp:
>+        * platform/gtk/RenderThemeGtk.h:
>+        * platform/network/soup/GOwnPtrSoup.h:
>+        * platform/network/soup/ResourceRequestSoup.cpp:
>+        * platform/network/soup/ResourceResponseSoup.cpp:
>+        * platform/network/soup/SocketStreamHandle.h:
>+        * platform/network/soup/SoupURIUtils.cpp:
>+        * platform/text/TextEncoding.cpp:
>+        * platform/text/gtk/TextBreakIteratorGtk.cpp:
>+        * platform/text/gtk/TextCodecGtk.cpp:
>+        * platform/text/gtk/TextCodecGtk.h:
>+
>+2012-03-19  Eric Seidel  <eric@webkit.org>
>+
>         Fix Chromium Win
>         https://bugs.webkit.org/show_bug.cgi?id=81281
> 
>diff --git a/Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp b/Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp
>index c24224b953d231c381992a1a47eecbc1a4ea4905..9b46b38b699e9db6ec640a36b529828e50779272 100644
>--- a/Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp
>+++ b/Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp
>@@ -23,7 +23,7 @@
> #include "AccessibilityObject.h"
> #include "Document.h"
> #include "Element.h"
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> #include "HTMLSelectElement.h"
> #include "Range.h"
> #include "TextIterator.h"
>diff --git a/Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceText.cpp b/Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceText.cpp
>index 37bbe3a0c6686e39805a16dad2bd56d4229d489b..343bf05d405236600c08317c497c58bfa873af1a 100644
>--- a/Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceText.cpp
>+++ b/Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceText.cpp
>@@ -34,7 +34,7 @@
> #include "AccessibilityObject.h"
> #include "Document.h"
> #include "FrameView.h"
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> #include "HostWindow.h"
> #include "InlineTextBox.h"
> #include "NotImplemented.h"
>diff --git a/Source/WebCore/platform/KURL.cpp b/Source/WebCore/platform/KURL.cpp
>index ad5feea3bd2a30ea1df56e3a6f093f74995c5e89..9306447ba6f03b782e9a1c1bcce7fd1d380e0eae 100644
>--- a/Source/WebCore/platform/KURL.cpp
>+++ b/Source/WebCore/platform/KURL.cpp
>@@ -44,7 +44,7 @@
> #include <QUrl>
> #elif USE(GLIB_UNICODE)
> #include <glib.h>
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> #endif
> 
> // FIXME: This file makes too much use of the + operator on String.
>diff --git a/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp b/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp
>index 30ebbf9b8b6322b2074007cdb6fae5b6dc110a4e..b606a335fdf1e3b1dc455ff19f4092ec07172df2 100644
>--- a/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp
>+++ b/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp
>@@ -24,7 +24,7 @@
> 
> #include "AudioChannel.h"
> #include "AudioSourceProvider.h"
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> #include "GRefPtrGStreamer.h"
> #include "WebKitWebAudioSourceGStreamer.h"
> #include <gst/gst.h>
>diff --git a/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp b/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp
>index 2228f41d05d4ae5cef7042fc9af20fac74a0aec8..00e4491e60daed5c5a084c6805e7d6dbae348e0c 100644
>--- a/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp
>+++ b/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp
>@@ -24,7 +24,7 @@
> 
> #include "AudioBus.h"
> #include "AudioSourceProvider.h"
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> #include "GRefPtrGStreamer.h"
> #include <gst/audio/multichannel.h>
> #include <gst/pbutils/pbutils.h>
>diff --git a/Source/WebCore/platform/audio/gtk/AudioBusGtk.cpp b/Source/WebCore/platform/audio/gtk/AudioBusGtk.cpp
>index f9d635b440f1314c123f6e482448461f18a16854..310f39c1cd334e5a6a6260b8f0447382705f2997 100644
>--- a/Source/WebCore/platform/audio/gtk/AudioBusGtk.cpp
>+++ b/Source/WebCore/platform/audio/gtk/AudioBusGtk.cpp
>@@ -23,9 +23,10 @@
> #include "AudioBus.h"
> 
> #include "AudioFileReader.h"
>-#include "CString.h"
> #include "FileSystem.h"
>-#include "GOwnPtr.h"
>+
>+#include <wtf/gobject/GOwnPtr.h>
>+#include <wtf/text/CString.h>
> 
> #include <gio/gio.h>
> #include <glib.h>
>diff --git a/Source/WebCore/platform/clutter/GRefPtrClutter.h b/Source/WebCore/platform/clutter/GRefPtrClutter.h
>index 091d27a85008e5bb6025b9ce99454b37fc5afd43..bdec65481a019b1c367b400cc5e3e9942bc6ff18 100644
>--- a/Source/WebCore/platform/clutter/GRefPtrClutter.h
>+++ b/Source/WebCore/platform/clutter/GRefPtrClutter.h
>@@ -20,7 +20,7 @@
> #ifndef GRefPtrClutter_h
> #define GRefPtrClutter_h
> 
>-#include "GRefPtr.h"
>+#include <wtf/gobject/GRefPtr.h>
> 
> typedef struct _ClutterActor ClutterActor;
> 
>diff --git a/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h b/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h
>index cfaa7b83cf2cc2a8eb90fab0ebe952ab0da637c5..940470ad9dca39188b69246154a165eb945634fd 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h
>+++ b/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h
>@@ -21,7 +21,7 @@
> #define GRefPtrGStreamer_h
> #if USE(GSTREAMER)
> 
>-#include "GRefPtr.h"
>+#include <wtf/gobject/GRefPtr.h>
> 
> typedef struct _GstElement GstElement;
> typedef struct _GstPad GstPad;
>diff --git a/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp b/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp
>index 8b3a076195f10c804e68dac227d3d8f33cb4c387..a0bf5f431f7b62fcb77b877235153a8a1d419db2 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp
>@@ -22,7 +22,7 @@
> 
> #if ENABLE(VIDEO) && USE(GSTREAMER)
> 
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> 
> using namespace std;
> using namespace WebCore;
>diff --git a/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerQt.cpp b/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerQt.cpp
>index 188c0bb0ec2026db366aa78fe888bd546edd5358..36b08061e3dbbf5838babe698cbb31e333102d31 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerQt.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerQt.cpp
>@@ -21,7 +21,7 @@
> #include "ImageGStreamer.h"
> 
> #if ENABLE(VIDEO) && USE(GSTREAMER)
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> 
> using namespace std;
> using namespace WebCore;
>diff --git a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
>index 2a0af0c8673967bffb565d6d92589a79ee417537..d1d91476194da794b215e07e9aff30157e8efc8d 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
>@@ -23,19 +23,21 @@
> 
> #include "Document.h"
> #include "Frame.h"
>-#include "GOwnPtr.h"
>-#include "GRefPtr.h"
> #include "GRefPtrGStreamer.h"
> #include "MediaPlayer.h"
> #include "NetworkingContext.h"
>-#include "Noncopyable.h"
> #include "NotImplemented.h"
> #include "ResourceHandleClient.h"
> #include "ResourceHandleInternal.h"
> #include "ResourceRequest.h"
> #include "ResourceResponse.h"
>+ 
> #include <gst/app/gstappsrc.h>
> #include <gst/pbutils/missing-plugins.h>
>+
>+#include <wtf/Noncopyable.h>
>+#include <wtf/gobject/GOwnPtr.h>
>+#include <wtf/gobject/GRefPtr.h>
> #include <wtf/text/CString.h>
> 
> using namespace WebCore;
>diff --git a/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp b/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp
>index e664d0fb953477515cec8e80bb115938da5e04a3..208325715a1d3dbfa62caacfc6cd718c7a4e9790 100644
>--- a/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp
>+++ b/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp
>@@ -22,7 +22,7 @@
> 
> #include "Base64.h"
> #include "GdkCairoUtilities.h"
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> #include "GRefPtrGtk.h"
> #include "MIMETypeRegistry.h"
> #include <cairo.h>
>diff --git a/Source/WebCore/platform/graphics/pango/FontPango.cpp b/Source/WebCore/platform/graphics/pango/FontPango.cpp
>index 0c60c767c8f946339b4893e68498af2a91c2c916..cef443db4235d984e353e3c4af42523a6fac7f6a 100644
>--- a/Source/WebCore/platform/graphics/pango/FontPango.cpp
>+++ b/Source/WebCore/platform/graphics/pango/FontPango.cpp
>@@ -35,7 +35,7 @@
> #include "Font.h"
> 
> #include "CairoUtilities.h"
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> #include "GraphicsContext.h"
> #include "NotImplemented.h"
> #include "PlatformContextCairo.h"
>diff --git a/Source/WebCore/platform/graphics/qt/ImageBufferDataQt.h b/Source/WebCore/platform/graphics/qt/ImageBufferDataQt.h
>index 8b4982978f9f3db51ed65ced3a2bdfe5cfe4f57e..9cf782beac1b88261c3af415b5bf59d882e85113 100644
>--- a/Source/WebCore/platform/graphics/qt/ImageBufferDataQt.h
>+++ b/Source/WebCore/platform/graphics/qt/ImageBufferDataQt.h
>@@ -25,9 +25,10 @@
> 
> #include "Image.h"
> 
>-#include "OwnPtr.h"
> #include <QPainter>
> #include <QPixmap>
>+
>+#include <wtf/OwnPtr.h>
> #include <wtf/RefPtr.h>
> 
> namespace WebCore {
>diff --git a/Source/WebCore/platform/graphics/wx/ImageBufferDataWx.h b/Source/WebCore/platform/graphics/wx/ImageBufferDataWx.h
>index 9961fee6a6b8bb3685497cc0dfb117f5ab0d9c1a..df0840e083560197ee3f98ca72e692744f13ad51 100644
>--- a/Source/WebCore/platform/graphics/wx/ImageBufferDataWx.h
>+++ b/Source/WebCore/platform/graphics/wx/ImageBufferDataWx.h
>@@ -23,7 +23,7 @@
>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#include "OwnPtr.h"
>+#include <wtf/OwnPtr.h>
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/platform/gtk/ContextMenuGtk.cpp b/Source/WebCore/platform/gtk/ContextMenuGtk.cpp
>index 51072f7f5b1c2dbb18490cc446920ed1f1128bc3..2067d15653f01ac3c79b0dc8a45a40cb67d6c6bf 100644
>--- a/Source/WebCore/platform/gtk/ContextMenuGtk.cpp
>+++ b/Source/WebCore/platform/gtk/ContextMenuGtk.cpp
>@@ -20,7 +20,7 @@
> #include "config.h"
> #include "ContextMenu.h"
> 
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> #include <gtk/gtk.h>
> 
> namespace WebCore {
>diff --git a/Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp b/Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp
>index 227a7a1b23b06d0395c784e9e8a099ab376b1ad6..4c1a866ebd7e287f46e3fa7f643fb6c058d84bcb 100644
>--- a/Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp
>+++ b/Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp
>@@ -23,8 +23,8 @@
> #include "ContextMenuItem.h"
> 
> #include "ContextMenu.h"
>-#include "GOwnPtr.h"
>-#include "GRefPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
>+#include <wtf/gobject/GRefPtr.h>
> #include <gtk/gtk.h>
> #include <wtf/text/CString.h>
> 
>diff --git a/Source/WebCore/platform/gtk/FileSystemGtk.cpp b/Source/WebCore/platform/gtk/FileSystemGtk.cpp
>index 950d618237e348ecb3c022f028607efa24f5ee28..a3b448df472f6432e8a0c38b3db083621353418c 100644
>--- a/Source/WebCore/platform/gtk/FileSystemGtk.cpp
>+++ b/Source/WebCore/platform/gtk/FileSystemGtk.cpp
>@@ -23,7 +23,7 @@
> #include "config.h"
> #include "FileSystem.h"
> 
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> #include "PlatformString.h"
> #include "UUID.h"
> #include <gio/gio.h>
>diff --git a/Source/WebCore/platform/gtk/GOwnPtrGtk.h b/Source/WebCore/platform/gtk/GOwnPtrGtk.h
>index c5d9cdcba5b380596608c78ec0ff901102a183d0..bd5e8371ed368f415d8974324ee62d71feb7a2d7 100644
>--- a/Source/WebCore/platform/gtk/GOwnPtrGtk.h
>+++ b/Source/WebCore/platform/gtk/GOwnPtrGtk.h
>@@ -20,7 +20,7 @@
> #ifndef GOwnPtrGtk_h
> #define GOwnPtrGtk_h
> 
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> 
> namespace WTF {
> 
>diff --git a/Source/WebCore/platform/gtk/GtkAuthenticationDialog.h b/Source/WebCore/platform/gtk/GtkAuthenticationDialog.h
>index f00ee299fa557d3d2c9f02831e5e8b266fa03f0e..23f6f55741d79a67c9962ed04dde655c1930c55b 100644
>--- a/Source/WebCore/platform/gtk/GtkAuthenticationDialog.h
>+++ b/Source/WebCore/platform/gtk/GtkAuthenticationDialog.h
>@@ -22,7 +22,7 @@
> 
> #define LIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY
> 
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> #include "GRefPtrGtk.h"
> #include <libsoup/soup.h>
> #include <wtf/FastAllocBase.h>
>diff --git a/Source/WebCore/platform/gtk/GtkPopupMenu.cpp b/Source/WebCore/platform/gtk/GtkPopupMenu.cpp
>index fd7c84c5324eb403e1238bdeeac0d521d639a811..6f57a17dc323bcf7b357b277f080adef091352f7 100644
>--- a/Source/WebCore/platform/gtk/GtkPopupMenu.cpp
>+++ b/Source/WebCore/platform/gtk/GtkPopupMenu.cpp
>@@ -27,7 +27,7 @@
> #include "config.h"
> #include "GtkPopupMenu.h"
> 
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> #include "GtkVersioning.h"
> #include <gtk/gtk.h>
> #include <wtf/text/CString.h>
>diff --git a/Source/WebCore/platform/gtk/LanguageGtk.cpp b/Source/WebCore/platform/gtk/LanguageGtk.cpp
>index f0fae5300c0ee0a7ea1820a7323d2c31ae70c02b..23282e4412e9060b40b0577be0c7c8203bf38197 100644
>--- a/Source/WebCore/platform/gtk/LanguageGtk.cpp
>+++ b/Source/WebCore/platform/gtk/LanguageGtk.cpp
>@@ -20,7 +20,7 @@
> #include "config.h"
> #include "Language.h"
> 
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> #include "PlatformString.h"
> #include <wtf/Vector.h>
> #include <wtf/text/CString.h>
>diff --git a/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp b/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
>index 4ede393065bbb0782e540162dd86f4b9883b4b1c..824938e096aaa7a876387bec05a16135ea648064 100644
>--- a/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
>+++ b/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
>@@ -31,7 +31,7 @@
> #include "config.h"
> 
> #include "LocalizedStrings.h"
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> #include "IntSize.h"
> #include "NotImplemented.h"
> #include "PlatformString.h"
>diff --git a/Source/WebCore/platform/gtk/PopupMenuGtk.cpp b/Source/WebCore/platform/gtk/PopupMenuGtk.cpp
>index 350e082af3fde46b76092f9e87a576d6e3dbc3f3..2f517b01ec529c5dfa502b7aa50b7ef80480e6fc 100644
>--- a/Source/WebCore/platform/gtk/PopupMenuGtk.cpp
>+++ b/Source/WebCore/platform/gtk/PopupMenuGtk.cpp
>@@ -28,7 +28,7 @@
> #include "PopupMenuGtk.h"
> 
> #include "FrameView.h"
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> #include "GtkUtilities.h"
> #include "HostWindow.h"
> #include <gtk/gtk.h>
>diff --git a/Source/WebCore/platform/gtk/RenderThemeGtk.cpp b/Source/WebCore/platform/gtk/RenderThemeGtk.cpp
>index caead5a2612939d7248a8f0fa0c37f9557843e42..920b007fa5c008b3bf48deb321926fa8f298b9af 100644
>--- a/Source/WebCore/platform/gtk/RenderThemeGtk.cpp
>+++ b/Source/WebCore/platform/gtk/RenderThemeGtk.cpp
>@@ -28,7 +28,7 @@
> #include "CSSValueKeywords.h"
> #include "FileList.h"
> #include "FileSystem.h"
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> #include "Gradient.h"
> #include "GraphicsContext.h"
> #include "GtkVersioning.h"
>diff --git a/Source/WebCore/platform/gtk/RenderThemeGtk.h b/Source/WebCore/platform/gtk/RenderThemeGtk.h
>index 68b71a8bf13a26f69090e2587c45ae83ce6d5601..9a3d288431965608685a4158f916ed6702716e47 100644
>--- a/Source/WebCore/platform/gtk/RenderThemeGtk.h
>+++ b/Source/WebCore/platform/gtk/RenderThemeGtk.h
>@@ -28,7 +28,7 @@
> #ifndef RenderThemeGtk_h
> #define RenderThemeGtk_h
> 
>-#include "GRefPtr.h"
>+#include <wtf/gobject/GRefPtr.h>
> #include "RenderTheme.h"
> 
> typedef struct _GdkColormap GdkColormap;
>diff --git a/Source/WebCore/platform/network/soup/GOwnPtrSoup.h b/Source/WebCore/platform/network/soup/GOwnPtrSoup.h
>index c129f840cc5c69aaad39e5a11472ef28553bcd8b..e6bec528ef77022f32478386c14419aee48ad030 100644
>--- a/Source/WebCore/platform/network/soup/GOwnPtrSoup.h
>+++ b/Source/WebCore/platform/network/soup/GOwnPtrSoup.h
>@@ -20,7 +20,7 @@
> #ifndef GOwnPtrSoup_h
> #define GOwnPtrSoup_h
> 
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> 
> typedef struct _SoupURI SoupURI;
> 
>diff --git a/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp b/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp
>index 63a7acf434a0c9767c9258c4bf7f5ea3beffb5c6..d7127b4b5b8e459a4caec55a5527bbcf3c837785 100644
>--- a/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp
>+++ b/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp
>@@ -20,7 +20,7 @@
> #include "config.h"
> #include "ResourceRequest.h"
> 
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> #include "GOwnPtrSoup.h"
> #include "HTTPParsers.h"
> #include "MIMETypeRegistry.h"
>diff --git a/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp b/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp
>index 3f2355b3f2fd97903384bc8197e710ba7642f32a..155048b2bf2f24402bbd89f43444f424b26cafcc 100644
>--- a/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp
>+++ b/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp
>@@ -21,7 +21,7 @@
> #include "config.h"
> #include "ResourceResponse.h"
> 
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> #include "HTTPParsers.h"
> #include "MIMETypeRegistry.h"
> #include "PlatformString.h"
>diff --git a/Source/WebCore/platform/network/soup/SocketStreamHandle.h b/Source/WebCore/platform/network/soup/SocketStreamHandle.h
>index c8fe3b3b6895f2f0e9f26b589a2465bbb6de8804..c2449c798e53402de45439e60446ee9090190364 100644
>--- a/Source/WebCore/platform/network/soup/SocketStreamHandle.h
>+++ b/Source/WebCore/platform/network/soup/SocketStreamHandle.h
>@@ -32,7 +32,7 @@
> #ifndef SocketStreamHandle_h
> #define SocketStreamHandle_h
> 
>-#include "GRefPtr.h"
>+#include <wtf/gobject/GRefPtr.h>
> #include "SocketStreamHandleBase.h"
> #include <wtf/PassRefPtr.h>
> #include <wtf/RefCounted.h>
>diff --git a/Source/WebCore/platform/network/soup/SoupURIUtils.cpp b/Source/WebCore/platform/network/soup/SoupURIUtils.cpp
>index 1f656157cfba44044530765fe1b697ee434a59df..f07ad7f6c4e270102e0d1486adb85fab41d2f9e5 100644
>--- a/Source/WebCore/platform/network/soup/SoupURIUtils.cpp
>+++ b/Source/WebCore/platform/network/soup/SoupURIUtils.cpp
>@@ -19,7 +19,7 @@
> #include "config.h"
> #include "SoupURIUtils.h"
> 
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> #include <libsoup/soup.h>
> 
> namespace WebCore {
>diff --git a/Source/WebCore/platform/text/TextEncoding.cpp b/Source/WebCore/platform/text/TextEncoding.cpp
>index 03c77c0c3b6f4b6e4065ed774f31811383897582..26ab82a5c96f76a7b75c840e56c99db0f747b493 100644
>--- a/Source/WebCore/platform/text/TextEncoding.cpp
>+++ b/Source/WebCore/platform/text/TextEncoding.cpp
>@@ -37,7 +37,7 @@
> #include <QString>
> #elif USE(GLIB_UNICODE)
> #include <glib.h>
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> #endif
> #include <wtf/text/CString.h>
> #include <wtf/OwnPtr.h>
>diff --git a/Source/WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp b/Source/WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp
>index 19ec02360396324aebff648275e786a3ca518358..b49c115d885c207c2c8e3d4fe330cef1538bc82a 100644
>--- a/Source/WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp
>+++ b/Source/WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp
>@@ -26,7 +26,7 @@
> 
> #include "TextBreakIterator.h"
> 
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> #include <pango/pango.h>
> using namespace std;
> 
>diff --git a/Source/WebCore/platform/text/gtk/TextCodecGtk.cpp b/Source/WebCore/platform/text/gtk/TextCodecGtk.cpp
>index 5f6cef14ae7c73b5774b6850e0e056ef9f99813d..42759edc500f650bf3d0f578c54d238b624969ab 100644
>--- a/Source/WebCore/platform/text/gtk/TextCodecGtk.cpp
>+++ b/Source/WebCore/platform/text/gtk/TextCodecGtk.cpp
>@@ -30,7 +30,7 @@
> #include "TextCodecGtk.h"
> 
> #include <gio/gio.h>
>-#include "GOwnPtr.h"
>+#include <wtf/gobject/GOwnPtr.h>
> #include "Logging.h"
> #include "PlatformString.h"
> #include <wtf/Assertions.h>
>diff --git a/Source/WebCore/platform/text/gtk/TextCodecGtk.h b/Source/WebCore/platform/text/gtk/TextCodecGtk.h
>index bb3a445275bcce08c7e205cf0413bf1df30cc70a..a670484d9d2ff71e691ef286b5a74fffc58a7eb0 100644
>--- a/Source/WebCore/platform/text/gtk/TextCodecGtk.h
>+++ b/Source/WebCore/platform/text/gtk/TextCodecGtk.h
>@@ -29,7 +29,7 @@
> #ifndef TextCodecGTK_h
> #define TextCodecGTK_h
> 
>-#include "GRefPtr.h"
>+#include <wtf/gobject/GRefPtr.h>
> #include <glib.h>
> #include "TextCodec.h"
> #include "TextEncoding.h"

Actions: View | Formatted Diff | Diff

Attachments on bug 81602: 132734