diff options
| author | Iain Merrick <husky@google.com> | 2010-08-20 12:00:05 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-08-23 15:16:07 +0100 |
| commit | dd7ee22af4f03672fa823324323466054f19a054 (patch) | |
| tree | 21a04203e47a38c3aa84a8fca3bcb27e1c8295db /WebKit/android/benchmark | |
| parent | 5fad69d9971b460f791574bbb29b3b3217b406e7 (diff) | |
| download | external_webkit-dd7ee22af4f03672fa823324323466054f19a054.zip external_webkit-dd7ee22af4f03672fa823324323466054f19a054.tar.gz external_webkit-dd7ee22af4f03672fa823324323466054f19a054.tar.bz2 | |
Merge WebKit at r65615 : Fix include paths for string headers.
These moved to <wtf/text> in http://trac.webkit.org/changeset/65077
Change-Id: Ie234f1a09013e48a5241d9e240c5b2e85ca75125
Diffstat (limited to 'WebKit/android/benchmark')
| -rw-r--r-- | WebKit/android/benchmark/Intercept.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebKit/android/benchmark/Intercept.cpp b/WebKit/android/benchmark/Intercept.cpp index e5a98f1..1ae6d6f 100644 --- a/WebKit/android/benchmark/Intercept.cpp +++ b/WebKit/android/benchmark/Intercept.cpp @@ -33,11 +33,12 @@ #include "ResourceHandleClient.h" #include "ResourceRequest.h" #include "ResourceResponse.h" -#include "StringHash.h" #include "TextEncoding.h" + #include <utils/Log.h> #include <wtf/HashMap.h> #include <wtf/text/CString.h> +#include <wtf/text/StringHash.h> PassRefPtr<WebCore::ResourceLoaderAndroid> MyResourceLoader::create( ResourceHandle* handle, String url) |