Merge webkit.org at r58033 : Update location of CString.h

See http://trac.webkit.org/changeset/56825

Change-Id: I8ba6a9685dcd1d8c4dec3400fba81e19fcbfe74d

20 files changed, 26 insertions, 28 deletions

diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp
index 878b86a..0543037 100644
--- a/WebCore/bindings/v8/V8Proxy.cpp
+++ b/WebCore/bindings/v8/V8Proxy.cpp
@@ -79,7 +79,7 @@
 #endif
 
 #if PLATFORM(ANDROID)
-#include "CString.h"
+#include <wtf/text/CString.h>
 #endif
 
 namespace WebCore {
diff --git a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
index 201022a..0d22719 100644
--- a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
@@ -21,7 +21,6 @@
 
 #include "AndroidAnimation.h"
 #include "Animation.h"
-#include "CString.h"
 #include "FloatRect.h"
 #include "GraphicsContext.h"
 #include "Image.h"
@@ -39,6 +38,7 @@
 
 #include <cutils/log.h>
 #include <wtf/CurrentTime.h>
+#include <wtf/text/CString.h>
 
 #undef LOG
 #define LOG(...) android_printLog(ANDROID_LOG_DEBUG, "GraphicsLayer", __VA_ARGS__)
diff --git a/WebCore/plugins/android/PluginPackageAndroid.cpp b/WebCore/plugins/android/PluginPackageAndroid.cpp
index 5c3a25a..a48eca0 100644
--- a/WebCore/plugins/android/PluginPackageAndroid.cpp
+++ b/WebCore/plugins/android/PluginPackageAndroid.cpp
@@ -29,7 +29,6 @@
 
 #ifdef ANDROID_PLUGINS
 
-#include "CString.h"
 #include "JNIUtility.h"
 #include "PlatformString.h"
 #include "PluginDatabase.h"
@@ -39,6 +38,7 @@
 #include "npruntime_impl.h"
 #include <dlfcn.h>
 #include <errno.h>
+#include <wtf/text/CString.h>
 
 // un-comment this to enable logging
 //#define PLUGIN_DEBUG_LOCAL
diff --git a/WebKit/android/RenderSkinButton.cpp b/WebKit/android/RenderSkinButton.cpp
index 63f545a..ff739f6 100644
--- a/WebKit/android/RenderSkinButton.cpp
+++ b/WebKit/android/RenderSkinButton.cpp
@@ -26,7 +26,6 @@
 #define LOG_TAG "WebCore"
 
 #include "config.h"
-#include "CString.h"
 #include "android_graphics.h"
 #include "Document.h"
 #include "IntRect.h"
@@ -37,6 +36,7 @@
 #include "SkRect.h"
 #include <utils/Debug.h>
 #include <utils/Log.h>
+#include <wtf/text/CString.h>
 
 struct PatchData {
     const char* name;
diff --git a/WebKit/android/RenderSkinCombo.cpp b/WebKit/android/RenderSkinCombo.cpp
index 4378371..f9a80d5 100644
--- a/WebKit/android/RenderSkinCombo.cpp
+++ b/WebKit/android/RenderSkinCombo.cpp
@@ -26,7 +26,6 @@
 #include "config.h"
 #include "RenderSkinCombo.h"
 
-#include "CString.h"
 #include "Document.h"
 #include "Element.h"
 #include "Node.h"
@@ -34,6 +33,7 @@
 #include "RenderStyle.h"
 #include "SkCanvas.h"
 #include "SkNinePatch.h"
+#include <wtf/text/CString.h>
 
 namespace WebCore {
 
diff --git a/WebKit/android/RenderSkinMediaButton.cpp b/WebKit/android/RenderSkinMediaButton.cpp
index 149be4e..9055e89 100644
--- a/WebKit/android/RenderSkinMediaButton.cpp
+++ b/WebKit/android/RenderSkinMediaButton.cpp
@@ -26,7 +26,6 @@
 #define LOG_TAG "WebCore"
 
 #include "config.h"
-#include "CString.h"
 #include "android_graphics.h"
 #include "Document.h"
 #include "IntRect.h"
@@ -37,6 +36,7 @@
 #include "SkRect.h"
 #include <utils/Debug.h>
 #include <utils/Log.h>
+#include <wtf/text/CString.h>
 
 struct PatchData {
     const char* name;
diff --git a/WebKit/android/RenderSkinRadio.cpp b/WebKit/android/RenderSkinRadio.cpp
index a1fc659..ef26f01 100644
--- a/WebKit/android/RenderSkinRadio.cpp
+++ b/WebKit/android/RenderSkinRadio.cpp
@@ -26,7 +26,6 @@
 #include "config.h"
 #include "RenderSkinRadio.h"
 
-#include "CString.h"
 #include "android_graphics.h"
 #include "Document.h"
 #include "Element.h"
@@ -37,6 +36,7 @@
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkRect.h"
+#include <wtf/text/CString.h>
 
 static const char* checks[] = { "btn_check_off.png",
                                 "btn_check_on.png",
diff --git a/WebKit/android/TimeCounter.cpp b/WebKit/android/TimeCounter.cpp
index da09b07..3b1e476 100644
--- a/WebKit/android/TimeCounter.cpp
+++ b/WebKit/android/TimeCounter.cpp
@@ -28,17 +28,16 @@
 #include "config.h"
 #include "TimeCounter.h"
 
-#include "CString.h"
 #include "Cache.h"
 #include "KURL.h"
 #include "Node.h"
 #include "SystemTime.h"
 #include "StyleBase.h"
-#include <utils/Log.h>
-#include <wtf/CurrentTime.h>
-
 #include <sys/time.h>
 #include <time.h>
+#include <utils/Log.h>
+#include <wtf/CurrentTime.h>
+#include <wtf/text/CString.h>
 
 #if USE(JSC)
 #include "JSDOMWindow.h"
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
index 6d912fd..d13a006 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
@@ -29,7 +29,6 @@
 
 #include "ApplicationCacheStorage.h"
 #include "ChromeClientAndroid.h"
-#include "CString.h"
 #include "DatabaseTracker.h"
 #include "Document.h"
 #include "PlatformString.h"
@@ -47,6 +46,7 @@
 #include "WebViewCore.h"
 #include "WindowFeatures.h"
 #include "Settings.h"
+#include <wtf/text/CString.h>
 
 namespace android {
 
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index bd2c69a..cf4691b 100644
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -29,7 +29,6 @@
 #include "FrameLoaderClientAndroid.h"
 
 #include "BackForwardList.h"
-#include "CString.h"
 #include "CachedFrame.h"
 #include "CachedFramePlatformDataAndroid.h"
 #include "Chrome.h"
@@ -77,6 +76,7 @@
 #include "android_graphics.h"
 
 #include <utils/AssetManager.h>
+#include <wtf/text/CString.h>
 
 extern android::AssetManager* globalAssetManager();
 
diff --git a/WebKit/android/WebCoreSupport/V8Counters.cpp b/WebKit/android/WebCoreSupport/V8Counters.cpp
index 7f3f3ad..7472447 100644
--- a/WebKit/android/WebCoreSupport/V8Counters.cpp
+++ b/WebKit/android/WebCoreSupport/V8Counters.cpp
@@ -33,9 +33,9 @@
 #include "V8Counters.h"
 #include "NotImplemented.h"
 
-#include <CString.h>
 #include <StringHash.h>
 #include <utils/Log.h>
+#include <wtf/text/CString.h>
 
 namespace WebCore {
 
diff --git a/WebKit/android/benchmark/Intercept.cpp b/WebKit/android/benchmark/Intercept.cpp
index fe8e7bb..e5a98f1 100644
--- a/WebKit/android/benchmark/Intercept.cpp
+++ b/WebKit/android/benchmark/Intercept.cpp
@@ -27,7 +27,6 @@
 #include "config.h"
 
 #include "Base64.h"
-#include "CString.h"
 #include "HTTPParsers.h"
 #include "Intercept.h"
 #include "ResourceHandle.h"
@@ -38,6 +37,7 @@
 #include "TextEncoding.h"
 #include <utils/Log.h>
 #include <wtf/HashMap.h>
+#include <wtf/text/CString.h>
 
 PassRefPtr<WebCore::ResourceLoaderAndroid> MyResourceLoader::create(
         ResourceHandle* handle, String url)
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index 250ffc9..9ecb121 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -32,7 +32,6 @@
 #include "AtomicString.h"
 #include "BackForwardList.h"
 #include "Cache.h"
-#include "CString.h"
 #include "Chrome.h"
 #include "ChromeClientAndroid.h"
 #include "ContextMenuClientAndroid.h"
@@ -93,6 +92,7 @@
 #include <utils/AssetManager.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/Platform.h>
+#include <wtf/text/CString.h>
 
 #if USE(JSC)
 #include "GCController.h"
diff --git a/WebKit/android/jni/WebCoreResourceLoader.cpp b/WebKit/android/jni/WebCoreResourceLoader.cpp
index 297ecb0..32e8cd8 100644
--- a/WebKit/android/jni/WebCoreResourceLoader.cpp
+++ b/WebKit/android/jni/WebCoreResourceLoader.cpp
@@ -28,7 +28,6 @@
 #include "config.h"
 #include "WebCoreResourceLoader.h"
 
-#include "CString.h"
 #include "ResourceError.h"
 #include "ResourceHandle.h"
 #include "ResourceHandleClient.h"
@@ -46,6 +45,7 @@
 #include <stdlib.h>
 #include <utils/misc.h>
 #include <wtf/Platform.h>
+#include <wtf/text/CString.h>
 
 namespace android {
   
diff --git a/WebKit/android/jni/WebHistory.cpp b/WebKit/android/jni/WebHistory.cpp
index d518ba8..b2af67a 100644
--- a/WebKit/android/jni/WebHistory.cpp
+++ b/WebKit/android/jni/WebHistory.cpp
@@ -29,7 +29,6 @@
 #include "WebHistory.h"
 
 #include "BackForwardList.h"
-#include "CString.h"
 #include "DocumentLoader.h"
 #include "Frame.h"
 #include "FrameLoader.h"
@@ -49,6 +48,7 @@
 #include <utils/misc.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/Platform.h>
+#include <wtf/text/CString.h>
 
 namespace android {
 
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 56b0601..bff45cb 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -109,9 +109,9 @@
 #include <wtf/CurrentTime.h>
 
 #if USE(V8)
-#include "CString.h"
 #include "ScriptController.h"
 #include "V8Counters.h"
+#include <wtf/text/CString.h>
 #endif
 
 #if DEBUG_NAV_UI
@@ -125,7 +125,7 @@
 #ifdef ANDROID_DOM_LOGGING
 #include "AndroidLog.h"
 #include "RenderTreeAsText.h"
-#include "CString.h"
+#include <wtf/text/CString.h>
 
 FILE* gDomTreeFile = 0;
 FILE* gRenderTreeFile = 0;
@@ -1272,7 +1272,7 @@ void WebViewCore::dumpDomTree(bool useFile)
 void WebViewCore::dumpRenderTree(bool useFile)
 {
 #ifdef ANDROID_DOM_LOGGING
-    WebCore::CString renderDump = WebCore::externalRepresentation(m_mainFrame).utf8();
+    WTF::CString renderDump = WebCore::externalRepresentation(m_mainFrame).utf8();
     const char* data = renderDump.data();
     if (useFile) {
         gRenderTreeFile = fopen(RENDER_TREE_LOG_FILE, "w");
@@ -2989,7 +2989,7 @@ static void SetJsFlags(JNIEnv *env, jobject obj, jstring flags)
 {
 #if USE(V8)
     WebCore::String flagsString = to_string(env, flags);
-    WebCore::CString utf8String = flagsString.utf8();
+    WTF::CString utf8String = flagsString.utf8();
     WebCore::ScriptController::setFlags(utf8String.data(), utf8String.length());
 #endif
 }
diff --git a/WebKit/android/nav/SelectText.cpp b/WebKit/android/nav/SelectText.cpp
index e471307..0fcbe95 100644
--- a/WebKit/android/nav/SelectText.cpp
+++ b/WebKit/android/nav/SelectText.cpp
@@ -41,7 +41,7 @@
 #include "SkUtils.h"
 
 #ifdef DEBUG_NAV_UI
-#include "CString.h"
+#include <wtf/text/CString.h>
 #endif
 
 namespace android {
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index d53b669..b3d42c5 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -33,7 +33,6 @@
 #include "CachedFrame.h"
 #include "CachedNode.h"
 #include "CachedRoot.h"
-#include "CString.h"
 #include "DrawExtra.h"
 #include "FindCanvas.h"
 #include "Frame.h"
@@ -68,6 +67,7 @@
 #include <JNIHelp.h>
 #include <jni.h>
 #include <ui/KeycodeLabels.h>
+#include <wtf/text/CString.h>
 
 namespace android {
 
diff --git a/WebKit/android/plugins/ANPSystemInterface.cpp b/WebKit/android/plugins/ANPSystemInterface.cpp
index 42ec9e4..34fe162 100644
--- a/WebKit/android/plugins/ANPSystemInterface.cpp
+++ b/WebKit/android/plugins/ANPSystemInterface.cpp
@@ -26,7 +26,7 @@
 // must include config.h first for webkit to fiddle with new/delete
 #include "config.h"
 
-#include "CString.h"
+#include "ANPSystem_npapi.h"
 #include "JavaSharedClient.h"
 #include "PluginClient.h"
 #include "PluginPackage.h"
@@ -34,8 +34,7 @@
 #include "PluginWidgetAndroid.h"
 #include "SkString.h"
 #include "WebViewCore.h"
-
-#include "ANPSystem_npapi.h"
+#include <wtf/text/CString.h>
 
 static const char* gApplicationDataDir = NULL;
 
diff --git a/WebKit/android/wds/Command.cpp b/WebKit/android/wds/Command.cpp
index 7f2046e..bd8536f 100644
--- a/WebKit/android/wds/Command.cpp
+++ b/WebKit/android/wds/Command.cpp
@@ -27,7 +27,6 @@
 #include "config.h"
 
 #include "AndroidLog.h"
-#include "CString.h"
 #include "Command.h"
 #include "Connection.h"
 #include "DebugServer.h"
@@ -36,6 +35,7 @@
 #include "RenderView.h"
 #include "WebViewCore.h"
 #include <utils/Log.h>
+#include <wtf/text/CString.h>
 
 #if ENABLE(WDS)