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/WebCoreSupport | |
| 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/WebCoreSupport')
| -rw-r--r-- | WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/V8Counters.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
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 { |