[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
weinig at apple.com
weinig at apple.com
Wed Dec 22 12:11:24 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 7bf968303c086c8f008ee7e0146486b1282ff53c
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 16 23:00:34 2010 +0000
Remove #includes of <WebCore/PlatformString.h> in favor of <wtf/text/WTFString.h>
Reviewed by Gavin Barraclough.
* Platform/Module.cpp:
* Platform/Module.h:
* Shared/CommandLine.h:
* Shared/WebCoreArgumentCoders.h:
* Shared/WebEvent.h:
* Shared/WebNavigationDataStore.h:
* Shared/WebPreferencesStore.h:
* Shared/WebString.h:
* Shared/WebURL.h:
* Shared/mac/CommandLineMac.cpp:
* Shared/qt/UpdateChunk.cpp:
* UIProcess/API/C/WKContext.cpp:
* UIProcess/API/C/cf/WKStringCF.cpp:
* UIProcess/API/C/cf/WKURLCF.cpp:
* UIProcess/API/cpp/qt/WKStringQt.cpp:
* UIProcess/API/cpp/qt/WKURLQt.cpp:
* UIProcess/API/mac/PageClientImpl.mm:
* UIProcess/API/qt/qgraphicswkview.cpp:
* UIProcess/Launcher/mac/ProcessLauncherMac.mm:
* UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
* UIProcess/Launcher/win/ProcessLauncherWin.cpp:
* UIProcess/WebBackForwardListItem.cpp:
* UIProcess/WebBackForwardListItem.h:
* UIProcess/WebContext.h:
* UIProcess/WebContextInjectedBundleClient.cpp:
* UIProcess/WebFrameProxy.cpp:
* UIProcess/WebFrameProxy.h:
* UIProcess/WebPageProxy.h:
* UIProcess/WebPolicyClient.cpp:
* UIProcess/WebProcessProxy.cpp:
* UIProcess/WebUIClient.cpp:
* UIProcess/win/WebView.cpp:
* WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
* WebProcess/InjectedBundle/InjectedBundle.h:
* WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp:
* WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
* WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:
* WebProcess/InjectedBundle/mac/InjectedBundleMac.cpp:
* WebProcess/Plugins/JSNPObject.cpp:
* WebProcess/Plugins/NPJSObject.cpp:
* WebProcess/Plugins/Netscape/NetscapePluginModule.cpp:
* WebProcess/Plugins/Netscape/NetscapePluginModule.h:
* WebProcess/WebCoreSupport/WebChromeClient.h:
* WebProcess/WebKitMain.cpp:
* WebProcess/win/WebProcessMainWin.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65465 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index d4d089d..226decc 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -2,6 +2,58 @@
Reviewed by Gavin Barraclough.
+ Remove #includes of <WebCore/PlatformString.h> in favor of <wtf/text/WTFString.h>
+
+ * Platform/Module.cpp:
+ * Platform/Module.h:
+ * Shared/CommandLine.h:
+ * Shared/WebCoreArgumentCoders.h:
+ * Shared/WebEvent.h:
+ * Shared/WebNavigationDataStore.h:
+ * Shared/WebPreferencesStore.h:
+ * Shared/WebString.h:
+ * Shared/WebURL.h:
+ * Shared/mac/CommandLineMac.cpp:
+ * Shared/qt/UpdateChunk.cpp:
+ * UIProcess/API/C/WKContext.cpp:
+ * UIProcess/API/C/cf/WKStringCF.cpp:
+ * UIProcess/API/C/cf/WKURLCF.cpp:
+ * UIProcess/API/cpp/qt/WKStringQt.cpp:
+ * UIProcess/API/cpp/qt/WKURLQt.cpp:
+ * UIProcess/API/mac/PageClientImpl.mm:
+ * UIProcess/API/qt/qgraphicswkview.cpp:
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ * UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
+ * UIProcess/Launcher/win/ProcessLauncherWin.cpp:
+ * UIProcess/WebBackForwardListItem.cpp:
+ * UIProcess/WebBackForwardListItem.h:
+ * UIProcess/WebContext.h:
+ * UIProcess/WebContextInjectedBundleClient.cpp:
+ * UIProcess/WebFrameProxy.cpp:
+ * UIProcess/WebFrameProxy.h:
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPolicyClient.cpp:
+ * UIProcess/WebProcessProxy.cpp:
+ * UIProcess/WebUIClient.cpp:
+ * UIProcess/win/WebView.cpp:
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+ * WebProcess/InjectedBundle/InjectedBundle.h:
+ * WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp:
+ * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
+ * WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:
+ * WebProcess/InjectedBundle/mac/InjectedBundleMac.cpp:
+ * WebProcess/Plugins/JSNPObject.cpp:
+ * WebProcess/Plugins/NPJSObject.cpp:
+ * WebProcess/Plugins/Netscape/NetscapePluginModule.cpp:
+ * WebProcess/Plugins/Netscape/NetscapePluginModule.h:
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ * WebProcess/WebKitMain.cpp:
+ * WebProcess/win/WebProcessMainWin.cpp:
+
+2010-08-16 Sam Weinig <sam at webkit.org>
+
+ Reviewed by Gavin Barraclough.
+
Null CFURLRef returned from provisionalURL after searching on zillow.com
<rdar://problem/8261812>
https://bugs.webkit.org/show_bug.cgi?id=44072
diff --git a/WebKit2/Platform/Module.cpp b/WebKit2/Platform/Module.cpp
index a39833d..7a2def5 100644
--- a/WebKit2/Platform/Module.cpp
+++ b/WebKit2/Platform/Module.cpp
@@ -25,8 +25,6 @@
#include "Module.h"
-using namespace WebCore;
-
namespace WebKit {
Module::Module(const String& path)
diff --git a/WebKit2/Platform/Module.h b/WebKit2/Platform/Module.h
index 89cae72..e9f0cd1 100644
--- a/WebKit2/Platform/Module.h
+++ b/WebKit2/Platform/Module.h
@@ -26,8 +26,8 @@
#ifndef Module_h
#define Module_h
-#include <WebCore/PlatformString.h>
#include <wtf/Noncopyable.h>
+#include <wtf/text/WTFString.h>
#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>
diff --git a/WebKit2/Shared/CommandLine.h b/WebKit2/Shared/CommandLine.h
index cdb03c5..4d621d9 100644
--- a/WebKit2/Shared/CommandLine.h
+++ b/WebKit2/Shared/CommandLine.h
@@ -26,9 +26,9 @@
#ifndef CommandLine_h
#define CommandLine_h
-#include <WebCore/PlatformString.h>
#include <wtf/HashMap.h>
#include <wtf/text/StringHash.h>
+#include <wtf/text/WTFString.h>
namespace WebKit {
diff --git a/WebKit2/Shared/WebCoreArgumentCoders.h b/WebKit2/Shared/WebCoreArgumentCoders.h
index b229bca..0c20f32 100644
--- a/WebKit2/Shared/WebCoreArgumentCoders.h
+++ b/WebKit2/Shared/WebCoreArgumentCoders.h
@@ -33,8 +33,8 @@
#include <WebCore/Cursor.h>
#include <WebCore/FloatRect.h>
#include <WebCore/IntRect.h>
-#include <WebCore/PlatformString.h>
#include <WebCore/PluginData.h>
+#include <wtf/text/WTFString.h>
namespace CoreIPC {
diff --git a/WebKit2/Shared/WebEvent.h b/WebKit2/Shared/WebEvent.h
index 0679e1c..cff7c27 100644
--- a/WebKit2/Shared/WebEvent.h
+++ b/WebKit2/Shared/WebEvent.h
@@ -32,7 +32,7 @@
#include "ArgumentDecoder.h"
#include "ArgumentEncoder.h"
#include "WebCoreArgumentCoders.h"
-#include <WebCore/PlatformString.h>
+#include <wtf/text/WTFString.h>
namespace WebKit {
diff --git a/WebKit2/Shared/WebNavigationDataStore.h b/WebKit2/Shared/WebNavigationDataStore.h
index 4cfff7f..3a49cec 100644
--- a/WebKit2/Shared/WebNavigationDataStore.h
+++ b/WebKit2/Shared/WebNavigationDataStore.h
@@ -29,7 +29,7 @@
#include "ArgumentDecoder.h"
#include "ArgumentEncoder.h"
#include "WebCoreArgumentCoders.h"
-#include <WebCore/PlatformString.h>
+#include <wtf/text/WTFString.h>
namespace WebKit {
diff --git a/WebKit2/Shared/WebPreferencesStore.h b/WebKit2/Shared/WebPreferencesStore.h
index b7cd977..8933461 100644
--- a/WebKit2/Shared/WebPreferencesStore.h
+++ b/WebKit2/Shared/WebPreferencesStore.h
@@ -29,7 +29,7 @@
#include "ArgumentDecoder.h"
#include "ArgumentEncoder.h"
#include "WebCoreArgumentCoders.h"
-#include <WebCore/PlatformString.h>
+#include <wtf/text/WTFString.h>
namespace WebKit {
diff --git a/WebKit2/Shared/WebString.h b/WebKit2/Shared/WebString.h
index 8b8557c..5e69ce7 100644
--- a/WebKit2/Shared/WebString.h
+++ b/WebKit2/Shared/WebString.h
@@ -27,8 +27,8 @@
#define WebString_h
#include "APIObject.h"
-#include <WebCore/PlatformString.h>
#include <wtf/PassRefPtr.h>
+#include <wtf/text/WTFString.h>
namespace WebKit {
diff --git a/WebKit2/Shared/WebURL.h b/WebKit2/Shared/WebURL.h
index de05e71..5d111fa 100644
--- a/WebKit2/Shared/WebURL.h
+++ b/WebKit2/Shared/WebURL.h
@@ -27,8 +27,8 @@
#define WebURL_h
#include "APIObject.h"
-#include <WebCore/PlatformString.h>
#include <wtf/PassRefPtr.h>
+#include <wtf/text/WTFString.h>
namespace WebKit {
diff --git a/WebKit2/Shared/mac/CommandLineMac.cpp b/WebKit2/Shared/mac/CommandLineMac.cpp
index a8b86da..8540b12 100644
--- a/WebKit2/Shared/mac/CommandLineMac.cpp
+++ b/WebKit2/Shared/mac/CommandLineMac.cpp
@@ -25,8 +25,6 @@
#include "CommandLine.h"
-using namespace WebCore;
-
namespace WebKit {
// FIXME: There's nothing Mac specific about this command line parser.
diff --git a/WebKit2/Shared/qt/UpdateChunk.cpp b/WebKit2/Shared/qt/UpdateChunk.cpp
index 32d7c29..2940adc 100644
--- a/WebKit2/Shared/qt/UpdateChunk.cpp
+++ b/WebKit2/Shared/qt/UpdateChunk.cpp
@@ -35,7 +35,7 @@
#include <QImage>
#include <QTemporaryFile>
#include <WebCore/FloatRect.h>
-#include <WebCore/PlatformString.h>
+#include <wtf/text/WTFString.h>
#include <wtf/Vector.h>
using namespace WebCore;
diff --git a/WebKit2/UIProcess/API/C/WKContext.cpp b/WebKit2/UIProcess/API/C/WKContext.cpp
index 315c2cb..745036b 100644
--- a/WebKit2/UIProcess/API/C/WKContext.cpp
+++ b/WebKit2/UIProcess/API/C/WKContext.cpp
@@ -29,9 +29,9 @@
#include "WKAPICast.h"
#include "WebContext.h"
#include "WebPreferences.h"
-#include <WebCore/PlatformString.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
+#include <wtf/text/WTFString.h>
using namespace WebKit;
diff --git a/WebKit2/UIProcess/API/C/cf/WKStringCF.cpp b/WebKit2/UIProcess/API/C/cf/WKStringCF.cpp
index 531f561..295704b 100644
--- a/WebKit2/UIProcess/API/C/cf/WKStringCF.cpp
+++ b/WebKit2/UIProcess/API/C/cf/WKStringCF.cpp
@@ -26,7 +26,7 @@
#include "WKStringCF.h"
#include "WKAPICast.h"
-#include <WebCore/PlatformString.h>
+#include <wtf/text/WTFString.h>
using namespace WebCore;
diff --git a/WebKit2/UIProcess/API/C/cf/WKURLCF.cpp b/WebKit2/UIProcess/API/C/cf/WKURLCF.cpp
index 26efdc5..3f4cf51 100644
--- a/WebKit2/UIProcess/API/C/cf/WKURLCF.cpp
+++ b/WebKit2/UIProcess/API/C/cf/WKURLCF.cpp
@@ -26,11 +26,11 @@
#include "WKURLCF.h"
#include "WKAPICast.h"
-#include <WebCore/PlatformString.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
#include <wtf/RetainPtr.h>
#include <wtf/text/CString.h>
+#include <wtf/text/WTFString.h>
using namespace WebCore;
using namespace WebKit;
diff --git a/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp b/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp
index e80e520..11e85b1 100644
--- a/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp
+++ b/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp
@@ -22,8 +22,8 @@
#include "WKAPICast.h"
#include <QString>
-#include <WebCore/PlatformString.h>
#include <wtf/RefPtr.h>
+#include <wtf/text/WTFString.h>
WKStringRef WKStringCreateWithQString(const QString& qString)
{
diff --git a/WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp b/WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp
index 0ee6e3c..ee11d11 100644
--- a/WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp
+++ b/WebKit2/UIProcess/API/cpp/qt/WKURLQt.cpp
@@ -22,8 +22,8 @@
#include "WKAPICast.h"
#include <QString>
-#include <WebCore/PlatformString.h>
#include <wtf/RefPtr.h>
+#include <wtf/text/WTFString.h>
WKURLRef WKURLCreateWithQUrl(const QUrl& qURL)
{
diff --git a/WebKit2/UIProcess/API/mac/PageClientImpl.mm b/WebKit2/UIProcess/API/mac/PageClientImpl.mm
index 5dd7417..bea9f7b 100644
--- a/WebKit2/UIProcess/API/mac/PageClientImpl.mm
+++ b/WebKit2/UIProcess/API/mac/PageClientImpl.mm
@@ -30,7 +30,7 @@
#import "WKViewInternal.h"
#import <WebCore/Cursor.h>
#import <WebCore/FoundationExtras.h>
-#import <WebCore/PlatformString.h>
+#import <wtf/text/WTFString.h>
using namespace WebCore;
diff --git a/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp b/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
index dde8572..fd0b86e 100644
--- a/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
+++ b/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
@@ -33,9 +33,9 @@
#include <QScrollBar>
#include <QStyleOptionGraphicsItem>
#include <QtDebug>
-#include <WebCore/PlatformString.h>
#include <WebKit2/WKRetainPtr.h>
#include <wtf/RefPtr.h>
+#include <wtf/text/WTFString.h>
using namespace WebKit;
using namespace WebCore;
diff --git a/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm b/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm
index b0edce0..4851b74 100644
--- a/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm
+++ b/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm
@@ -28,7 +28,6 @@
#include "RunLoop.h"
#include "WebProcess.h"
#include "WebSystemInterface.h"
-#include <WebCore/PlatformString.h>
#include <crt_externs.h>
#include <runtime/InitializeThreading.h>
#include <servers/bootstrap.h>
@@ -36,6 +35,7 @@
#include <wtf/PassRefPtr.h>
#include <wtf/Threading.h>
#include <wtf/text/CString.h>
+#include <wtf/text/WTFString.h>
using namespace WebCore;
diff --git a/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp b/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp
index 5be4419..2941c08 100644
--- a/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp
+++ b/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp
@@ -29,11 +29,11 @@
#include "Connection.h"
#include "RunLoop.h"
#include "WebProcess.h"
-#include <WebCore/PlatformString.h>
#include <runtime/InitializeThreading.h>
#include <string>
#include <wtf/PassRefPtr.h>
#include <wtf/Threading.h>
+#include <wtf/text/WTFString.h>
#include <QApplication>
#include <QDebug>
diff --git a/WebKit2/UIProcess/Launcher/win/ProcessLauncherWin.cpp b/WebKit2/UIProcess/Launcher/win/ProcessLauncherWin.cpp
index 6d7979d..d7f2044 100644
--- a/WebKit2/UIProcess/Launcher/win/ProcessLauncherWin.cpp
+++ b/WebKit2/UIProcess/Launcher/win/ProcessLauncherWin.cpp
@@ -28,9 +28,9 @@
#include "Connection.h"
#include "RunLoop.h"
#include "WebProcess.h"
-#include <WebCore/PlatformString.h>
#include <runtime/InitializeThreading.h>
#include <wtf/Threading.h>
+#include <wtf/text/WTFString.h>
using namespace WebCore;
diff --git a/WebKit2/UIProcess/WebBackForwardListItem.cpp b/WebKit2/UIProcess/WebBackForwardListItem.cpp
index dca4395..487d65a 100644
--- a/WebKit2/UIProcess/WebBackForwardListItem.cpp
+++ b/WebKit2/UIProcess/WebBackForwardListItem.cpp
@@ -25,8 +25,6 @@
#include "WebBackForwardListItem.h"
-using namespace WebCore;
-
namespace WebKit {
WebBackForwardListItem::WebBackForwardListItem(const String& originalURL, const String& url, const String& title, uint64_t itemID)
diff --git a/WebKit2/UIProcess/WebBackForwardListItem.h b/WebKit2/UIProcess/WebBackForwardListItem.h
index 0d689ba..dcbb398 100644
--- a/WebKit2/UIProcess/WebBackForwardListItem.h
+++ b/WebKit2/UIProcess/WebBackForwardListItem.h
@@ -27,8 +27,8 @@
#define WebBackForwardListItem_h
#include "APIObject.h"
-#include <WebCore/PlatformString.h>
#include <wtf/PassRefPtr.h>
+#include <wtf/text/WTFString.h>
namespace WebKit {
diff --git a/WebKit2/UIProcess/WebContext.h b/WebKit2/UIProcess/WebContext.h
index 71a00ab..ff08c12 100644
--- a/WebKit2/UIProcess/WebContext.h
+++ b/WebKit2/UIProcess/WebContext.h
@@ -34,12 +34,12 @@
#include "WebHistoryClient.h"
#include "WebProcessProxy.h"
#include <WebCore/LinkHash.h>
-#include <WebCore/PlatformString.h>
#include <wtf/Forward.h>
#include <wtf/HashSet.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
#include <wtf/text/StringHash.h>
+#include <wtf/text/WTFString.h>
struct WKContextStatistics;
diff --git a/WebKit2/UIProcess/WebContextInjectedBundleClient.cpp b/WebKit2/UIProcess/WebContextInjectedBundleClient.cpp
index f7848a0..161c2f2 100644
--- a/WebKit2/UIProcess/WebContextInjectedBundleClient.cpp
+++ b/WebKit2/UIProcess/WebContextInjectedBundleClient.cpp
@@ -26,7 +26,7 @@
#include "WebContextInjectedBundleClient.h"
#include "WKAPICast.h"
-#include <WebCore/PlatformString.h>
+#include <wtf/text/WTFString.h>
using namespace WebCore;
diff --git a/WebKit2/UIProcess/WebFrameProxy.cpp b/WebKit2/UIProcess/WebFrameProxy.cpp
index 40d9f69..f1cf0e0 100644
--- a/WebKit2/UIProcess/WebFrameProxy.cpp
+++ b/WebKit2/UIProcess/WebFrameProxy.cpp
@@ -25,10 +25,10 @@
#include "WebFrameProxy.h"
-#include "WebPageProxy.h"
#include "WebFormSubmissionListenerProxy.h"
#include "WebFramePolicyListenerProxy.h"
-#include <WebCore/PlatformString.h>
+#include "WebPageProxy.h"
+#include <wtf/text/WTFString.h>
using namespace WebCore;
diff --git a/WebKit2/UIProcess/WebFrameProxy.h b/WebKit2/UIProcess/WebFrameProxy.h
index c629779..47c78eb 100644
--- a/WebKit2/UIProcess/WebFrameProxy.h
+++ b/WebKit2/UIProcess/WebFrameProxy.h
@@ -29,9 +29,9 @@
#include "APIObject.h"
#include "WebFrameListenerProxy.h"
#include <WebCore/FrameLoaderTypes.h>
-#include <WebCore/PlatformString.h>
#include <wtf/Forward.h>
#include <wtf/PassRefPtr.h>
+#include <wtf/text/WTFString.h>
namespace CoreIPC {
class ArgumentDecoder;
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index d281688..50f020b 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -38,12 +38,12 @@
#include "WebPolicyClient.h"
#include "WebUIClient.h"
#include <WebCore/FrameLoaderTypes.h>
-#include <WebCore/PlatformString.h>
#include <wtf/HashMap.h>
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
+#include <wtf/text/WTFString.h>
namespace CoreIPC {
class ArgumentDecoder;
diff --git a/WebKit2/UIProcess/WebPolicyClient.cpp b/WebKit2/UIProcess/WebPolicyClient.cpp
index 8c6fad8..a7d3ddc 100644
--- a/WebKit2/UIProcess/WebPolicyClient.cpp
+++ b/WebKit2/UIProcess/WebPolicyClient.cpp
@@ -26,7 +26,7 @@
#include "WebPolicyClient.h"
#include "WKAPICast.h"
-#include <WebCore/PlatformString.h>
+#include <wtf/text/WTFString.h>
using namespace WebCore;
diff --git a/WebKit2/UIProcess/WebProcessProxy.cpp b/WebKit2/UIProcess/WebProcessProxy.cpp
index 69831de..18d0e74 100644
--- a/WebKit2/UIProcess/WebProcessProxy.cpp
+++ b/WebKit2/UIProcess/WebProcessProxy.cpp
@@ -36,8 +36,8 @@
#include "WebProcessMessageKinds.h"
#include "WebProcessProxyMessageKinds.h"
#include <WebCore/KURL.h>
-#include <WebCore/PlatformString.h>
#include <wtf/text/CString.h>
+#include <wtf/text/WTFString.h>
#if ENABLE(WEB_PROCESS_SANDBOX)
#include <sandbox.h>
diff --git a/WebKit2/UIProcess/WebUIClient.cpp b/WebKit2/UIProcess/WebUIClient.cpp
index b22e69c..094072c 100644
--- a/WebKit2/UIProcess/WebUIClient.cpp
+++ b/WebKit2/UIProcess/WebUIClient.cpp
@@ -28,8 +28,8 @@
#include "WKAPICast.h"
#include "WebPageProxy.h"
#include <WebCore/IntSize.h>
-#include <WebCore/PlatformString.h>
#include <string.h>
+#include <wtf/text/WTFString.h>
using namespace WebCore;
diff --git a/WebKit2/UIProcess/win/WebView.cpp b/WebKit2/UIProcess/win/WebView.cpp
index 2107019..5813d63 100644
--- a/WebKit2/UIProcess/win/WebView.cpp
+++ b/WebKit2/UIProcess/win/WebView.cpp
@@ -32,9 +32,9 @@
#include "WebPageProxy.h"
#include <Commctrl.h>
#include <WebCore/IntRect.h>
-#include <WebCore/PlatformString.h>
#include <WebCore/WebCoreInstanceHandle.h>
#include <WebCore/WindowMessageBroadcaster.h>
+#include <wtf/text/WTFString.h>
using namespace WebCore;
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
index c1453ca..38a6973 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
@@ -29,7 +29,6 @@
#include "WKAPICast.h"
#include "WKBundleAPICast.h"
#include "WebPage.h"
-#include <WebCore/PlatformString.h>
using namespace WebKit;
diff --git a/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h b/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
index fb79ca1..504b88b 100644
--- a/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
+++ b/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
@@ -28,8 +28,8 @@
#include "APIObject.h"
#include "WKBundle.h"
-#include <WebCore/PlatformString.h>
#include <wtf/PassRefPtr.h>
+#include <wtf/text/WTFString.h>
namespace CoreIPC {
class ArgumentDecoder;
diff --git a/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp b/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp
index 052dfa5..4df8ee9 100644
--- a/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp
@@ -27,7 +27,7 @@
#include "WKAPICast.h"
#include "WKBundleAPICast.h"
-#include <WebCore/PlatformString.h>
+#include <wtf/text/WTFString.h>
using namespace WebCore;
diff --git a/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp b/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp
index 3e64e50..376cd6f 100644
--- a/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp
@@ -27,7 +27,7 @@
#include "WKAPICast.h"
#include "WKBundleAPICast.h"
-#include <WebCore/PlatformString.h>
+#include <wtf/text/WTFString.h>
using namespace WebCore;
diff --git a/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp b/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp
index b19c67f..9c461d4 100644
--- a/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp
@@ -27,7 +27,7 @@
#include "WKAPICast.h"
#include "WKBundleAPICast.h"
-#include <WebCore/PlatformString.h>
+#include <wtf/text/WTFString.h>
using namespace WebCore;
diff --git a/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.cpp b/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.cpp
index c961282..3a3ffb4 100644
--- a/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.cpp
@@ -27,9 +27,9 @@
#include "WKBundleAPICast.h"
#include "WKBundleInitialize.h"
-#include <WebCore/PlatformString.h>
-#include <wtf/text/CString.h>
#include <wtf/RetainPtr.h>
+#include <wtf/text/CString.h>
+#include <wtf/text/WTFString.h>
#if ENABLE(WEB_PROCESS_SANDBOX)
#include <sandbox.h>
diff --git a/WebKit2/WebProcess/Plugins/JSNPObject.cpp b/WebKit2/WebProcess/Plugins/JSNPObject.cpp
index 386ed93..9465526 100644
--- a/WebKit2/WebProcess/Plugins/JSNPObject.cpp
+++ b/WebKit2/WebProcess/Plugins/JSNPObject.cpp
@@ -31,10 +31,10 @@
#include "NPRuntimeUtilities.h"
#include <JavaScriptCore/Error.h>
#include <JavaScriptCore/JSGlobalObject.h>
-#include <JavaScriptCore/ObjectPrototype.h>
#include <JavaScriptCore/JSLock.h>
+#include <JavaScriptCore/ObjectPrototype.h>
#include <WebCore/IdentifierRep.h>
-#include <WebCore/PlatformString.h>
+#include <wtf/text/WTFString.h>
using namespace JSC;
using namespace WebCore;
diff --git a/WebKit2/WebProcess/Plugins/NPJSObject.cpp b/WebKit2/WebProcess/Plugins/NPJSObject.cpp
index fbc8454..deedf7b 100644
--- a/WebKit2/WebProcess/Plugins/NPJSObject.cpp
+++ b/WebKit2/WebProcess/Plugins/NPJSObject.cpp
@@ -34,7 +34,7 @@
#include <JavaScriptCore/JSObject.h>
#include <WebCore/Frame.h>
#include <WebCore/IdentifierRep.h>
-#include <WebCore/PlatformString.h>
+#include <wtf/text/WTFString.h>
using namespace JSC;
using namespace WebCore;
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginModule.cpp b/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginModule.cpp
index e609013..a3b8788 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginModule.cpp
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginModule.cpp
@@ -29,8 +29,6 @@
#include "NetscapeBrowserFuncs.h"
#include <wtf/PassOwnPtr.h>
-using namespace WebCore;
-
namespace WebKit {
static Vector<NetscapePluginModule*>& initializedNetscapePluginModules()
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginModule.h b/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginModule.h
index 965e17a..c2331b3 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginModule.h
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginModule.h
@@ -27,9 +27,9 @@
#define NetscapePluginModule_h
#include "Module.h"
-#include <WebCore/PlatformString.h>
#include <WebCore/npfunctions.h>
#include <wtf/RefCounted.h>
+#include <wtf/text/WTFString.h>
namespace WebKit {
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
index 9e85c28..eaffefa 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
+++ b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
@@ -28,7 +28,7 @@
#define WebChromeClient_h
#include <WebCore/ChromeClient.h>
-#include <WebCore/PlatformString.h>
+#include <wtf/text/WTFString.h>
namespace WebKit {
diff --git a/WebKit2/WebProcess/WebKitMain.cpp b/WebKit2/WebProcess/WebKitMain.cpp
index 09cf261..7c6df84 100644
--- a/WebKit2/WebProcess/WebKitMain.cpp
+++ b/WebKit2/WebProcess/WebKitMain.cpp
@@ -31,7 +31,6 @@
#include <objc/objc-auto.h>
#endif
-using namespace WebCore;
using namespace WebKit;
#if PLATFORM(MAC)
diff --git a/WebKit2/WebProcess/win/WebProcessMainWin.cpp b/WebKit2/WebProcess/win/WebProcessMainWin.cpp
index e822ed8..94730df 100644
--- a/WebKit2/WebProcess/win/WebProcessMainWin.cpp
+++ b/WebKit2/WebProcess/win/WebProcessMainWin.cpp
@@ -28,13 +28,11 @@
#include "CommandLine.h"
#include "RunLoop.h"
#include "WebProcess.h"
-#include <WebCore/PlatformString.h>
#include <WebCore/SoftLinking.h>
#include <runtime/InitializeThreading.h>
#include <wtf/Threading.h>
#include <wtf/text/StringHash.h>
-
-using namespace WebCore;
+#include <wtf/text/WTFString.h>
namespace WebKit {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list