From 79768700a853c40c66ff0b0591957958667fdd9e Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 28 Apr 2010 15:26:38 +0100
Subject: Merge webkit.org at r58033 : Update location of CString.h

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

Change-Id: I8ba6a9685dcd1d8c4dec3400fba81e19fcbfe74d
---
 WebKit/android/jni/WebViewCore.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'WebKit/android/jni/WebViewCore.cpp')

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
 }
-- 
cgit v1.1