Fix more WTF header include paths in WebCore
authoreric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 20 Mar 2012 05:04:58 +0000 (05:04 +0000)
committereric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 20 Mar 2012 05:04:58 +0000 (05:04 +0000)
https://bugs.webkit.org/show_bug.cgi?id=81602

Reviewed by Martin Robinson.

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:

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

36 files changed:
Source/WebCore/ChangeLog
Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp
Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceText.cpp
Source/WebCore/platform/KURL.cpp
Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp
Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp
Source/WebCore/platform/audio/gtk/AudioBusGtk.cpp
Source/WebCore/platform/clutter/GRefPtrClutter.h
Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h
Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp
Source/WebCore/platform/graphics/gstreamer/ImageGStreamerQt.cpp
Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp
Source/WebCore/platform/graphics/pango/FontPango.cpp
Source/WebCore/platform/graphics/qt/ImageBufferDataQt.h
Source/WebCore/platform/graphics/wx/ImageBufferDataWx.h
Source/WebCore/platform/gtk/ContextMenuGtk.cpp
Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp
Source/WebCore/platform/gtk/FileSystemGtk.cpp
Source/WebCore/platform/gtk/GOwnPtrGtk.h
Source/WebCore/platform/gtk/GtkAuthenticationDialog.h
Source/WebCore/platform/gtk/GtkPopupMenu.cpp
Source/WebCore/platform/gtk/LanguageGtk.cpp
Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
Source/WebCore/platform/gtk/PopupMenuGtk.cpp
Source/WebCore/platform/gtk/RenderThemeGtk.cpp
Source/WebCore/platform/gtk/RenderThemeGtk.h
Source/WebCore/platform/network/soup/GOwnPtrSoup.h
Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp
Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp
Source/WebCore/platform/network/soup/SocketStreamHandle.h
Source/WebCore/platform/network/soup/SoupURIUtils.cpp
Source/WebCore/platform/text/TextEncoding.cpp
Source/WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp
Source/WebCore/platform/text/gtk/TextCodecGtk.cpp
Source/WebCore/platform/text/gtk/TextCodecGtk.h

index c1142e7..0ae61ca 100644 (file)
@@ -1,3 +1,52 @@
+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 Martin Robinson.
+
+        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  Julien Chaffraix  <jchaffraix@webkit.org>
 
         Move the extra logical height distribution into RenderTable as a new step in our layout algorithm
index c24224b..9b46b38 100644 (file)
@@ -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"
index 37bbe3a..343bf05 100644 (file)
@@ -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"
index ad5feea..9306447 100644 (file)
@@ -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.
index 30ebbf9..b606a33 100644 (file)
@@ -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>
index 2228f41..00e4491 100644 (file)
@@ -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>
index f9d635b..310f39c 100644 (file)
 #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>
index 091d27a..bdec654 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef GRefPtrClutter_h
 #define GRefPtrClutter_h
 
-#include "GRefPtr.h"
+#include <wtf/gobject/GRefPtr.h>
 
 typedef struct _ClutterActor ClutterActor;
 
index cfaa7b8..940470a 100644 (file)
@@ -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;
index 8b3a076..a0bf5f4 100644 (file)
@@ -22,7 +22,7 @@
 
 #if ENABLE(VIDEO) && USE(GSTREAMER)
 
-#include "GOwnPtr.h"
+#include <wtf/gobject/GOwnPtr.h>
 
 using namespace std;
 using namespace WebCore;
index 188c0bb..36b0806 100644 (file)
@@ -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;
index 2a0af0c..d1d9147 100644 (file)
 
 #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;
index e664d0f..2083257 100644 (file)
@@ -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>
index 0c60c76..cef443d 100644 (file)
@@ -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"
index 8b49829..9cf782b 100644 (file)
 
 #include "Image.h"
 
-#include "OwnPtr.h"
 #include <QPainter>
 #include <QPixmap>
+
+#include <wtf/OwnPtr.h>
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
index 9961fee..df0840e 100644 (file)
@@ -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 {
 
index 51072f7..2067d15 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "ContextMenu.h"
 
-#include "GOwnPtr.h"
+#include <wtf/gobject/GOwnPtr.h>
 #include <gtk/gtk.h>
 
 namespace WebCore {
index 227a7a1..4c1a866 100644 (file)
@@ -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>
 
index 950d618..a3b448d 100644 (file)
@@ -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>
index c5d9cdc..bd5e837 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef GOwnPtrGtk_h
 #define GOwnPtrGtk_h
 
-#include "GOwnPtr.h"
+#include <wtf/gobject/GOwnPtr.h>
 
 namespace WTF {
 
index f00ee29..23f6f55 100644 (file)
@@ -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>
index fd7c84c..6f57a17 100644 (file)
@@ -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>
index f0fae53..23282e4 100644 (file)
@@ -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>
index 4ede393..824938e 100644 (file)
@@ -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"
index 350e082..2f517b0 100644 (file)
@@ -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>
index caead5a..920b007 100644 (file)
@@ -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"
index 68b71a8..9a3d288 100644 (file)
@@ -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;
index c129f84..e6bec52 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef GOwnPtrSoup_h
 #define GOwnPtrSoup_h
 
-#include "GOwnPtr.h"
+#include <wtf/gobject/GOwnPtr.h>
 
 typedef struct _SoupURI SoupURI;
 
index 63a7acf..d7127b4 100644 (file)
@@ -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"
index 3f2355b..155048b 100644 (file)
@@ -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"
index c8fe3b3..c2449c7 100644 (file)
@@ -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>
index 1f65615..f07ad7f 100644 (file)
@@ -19,7 +19,7 @@
 #include "config.h"
 #include "SoupURIUtils.h"
 
-#include "GOwnPtr.h"
+#include <wtf/gobject/GOwnPtr.h>
 #include <libsoup/soup.h>
 
 namespace WebCore {
index 03c77c0..26ab82a 100644 (file)
@@ -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>
index 19ec023..b49c115 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "TextBreakIterator.h"
 
-#include "GOwnPtr.h"
+#include <wtf/gobject/GOwnPtr.h>
 #include <pango/pango.h>
 using namespace std;
 
index 5f6cef1..42759ed 100644 (file)
@@ -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>
index bb3a445..a670484 100644 (file)
@@ -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"