summaryrefslogtreecommitdiffstats
path: root/WebCore/platform
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-04-28 15:26:38 +0100
committerSteve Block <steveblock@google.com>2010-05-11 14:42:13 +0100
commit79768700a853c40c66ff0b0591957958667fdd9e (patch)
tree88e6c8a86f3a4ccb554f55313f496eb3170ffdc9 /WebCore/platform
parent98be84cc0473aaefc551ded18abd6c40bd108a8c (diff)
downloadexternal_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/platform')
-rw-r--r--WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp2
1 files changed, 1 insertions, 1 deletions
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__)