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 /WebCore | |
| 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 'WebCore')
| -rw-r--r-- | WebCore/bindings/v8/V8Proxy.cpp | 2 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | 2 | ||||
| -rw-r--r-- | WebCore/plugins/android/PluginPackageAndroid.cpp | 2 |
3 files changed, 3 insertions, 3 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 |