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 /WebCore | |
| 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 'WebCore')
| -rw-r--r-- | WebCore/platform/android/PackageNotifier.h | 3 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/FontPlatformData.h | 2 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/LayerAndroid.h | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/WebCore/platform/android/PackageNotifier.h b/WebCore/platform/android/PackageNotifier.h index d9b4fd4..8191d84 100644 --- a/WebCore/platform/android/PackageNotifier.h +++ b/WebCore/platform/android/PackageNotifier.h @@ -29,10 +29,11 @@ #if ENABLE(APPLICATION_INSTALLED) #include "PlatformString.h" -#include "StringHash.h" #include "Timer.h" + #include <wtf/HashSet.h> #include <wtf/Noncopyable.h> +#include <wtf/text/StringHash.h> namespace WebCore { diff --git a/WebCore/platform/graphics/android/FontPlatformData.h b/WebCore/platform/graphics/android/FontPlatformData.h index 19f83f8..7d2176d 100644 --- a/WebCore/platform/graphics/android/FontPlatformData.h +++ b/WebCore/platform/graphics/android/FontPlatformData.h @@ -34,7 +34,7 @@ #include "PlatformString.h" #endif -#include "StringImpl.h" +#include <wtf/text/StringImpl.h> class SkPaint; class SkTypeface; diff --git a/WebCore/platform/graphics/android/LayerAndroid.h b/WebCore/platform/graphics/android/LayerAndroid.h index 712d699..245d224 100644 --- a/WebCore/platform/graphics/android/LayerAndroid.h +++ b/WebCore/platform/graphics/android/LayerAndroid.h @@ -22,8 +22,9 @@ #include "RefPtr.h" #include "SkColor.h" #include "SkLayer.h" -#include "StringHash.h" + #include <wtf/HashMap.h> +#include <wtf/text/StringHash.h> #ifndef BZERO_DEFINED #define BZERO_DEFINED |