summaryrefslogtreecommitdiffstats
path: root/WebKit/android/benchmark
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 /WebKit/android/benchmark
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 'WebKit/android/benchmark')
-rw-r--r--WebKit/android/benchmark/Intercept.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/benchmark/Intercept.cpp b/WebKit/android/benchmark/Intercept.cpp
index fe8e7bb..e5a98f1 100644
--- a/WebKit/android/benchmark/Intercept.cpp
+++ b/WebKit/android/benchmark/Intercept.cpp
@@ -27,7 +27,6 @@
#include "config.h"
#include "Base64.h"
-#include "CString.h"
#include "HTTPParsers.h"
#include "Intercept.h"
#include "ResourceHandle.h"
@@ -38,6 +37,7 @@
#include "TextEncoding.h"
#include <utils/Log.h>
#include <wtf/HashMap.h>
+#include <wtf/text/CString.h>
PassRefPtr<WebCore::ResourceLoaderAndroid> MyResourceLoader::create(
ResourceHandle* handle, String url)