diff options
| author | Steve Block <steveblock@google.com> | 2010-04-28 15:26:38 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:13 +0100 |
| commit | 79768700a853c40c66ff0b0591957958667fdd9e (patch) | |
| tree | 88e6c8a86f3a4ccb554f55313f496eb3170ffdc9 /WebKit/android/jni | |
| parent | 98be84cc0473aaefc551ded18abd6c40bd108a8c (diff) | |
| download | external_webkit-79768700a853c40c66ff0b0591957958667fdd9e.zip external_webkit-79768700a853c40c66ff0b0591957958667fdd9e.tar.gz external_webkit-79768700a853c40c66ff0b0591957958667fdd9e.tar.bz2 | |
Merge webkit.org at r58033 : Update location of CString.h
See http://trac.webkit.org/changeset/56825
Change-Id: I8ba6a9685dcd1d8c4dec3400fba81e19fcbfe74d
Diffstat (limited to 'WebKit/android/jni')
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/jni/WebCoreResourceLoader.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/jni/WebHistory.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 8 |
4 files changed, 7 insertions, 7 deletions
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 } |