diff options
author | Ben Murdoch <benm@google.com> | 2010-08-11 18:17:05 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-08-13 12:41:54 +0100 |
commit | 45b64f60af3cbfa8c78388e35e9b669a0c284bdc (patch) | |
tree | bd6df4524a5532b7b090ab042f90e72da3085b9c /WebCore | |
parent | 82eeb7b660065e6e990280e6563ca7eafe4be1cd (diff) | |
download | external_webkit-45b64f60af3cbfa8c78388e35e9b669a0c284bdc.zip external_webkit-45b64f60af3cbfa8c78388e35e9b669a0c284bdc.tar.gz external_webkit-45b64f60af3cbfa8c78388e35e9b669a0c284bdc.tar.bz2 |
Merge WebKit at r65072: String class has moved to the WTF namespace.
See http://trac.webkit.org/changeset/65021
Change-Id: I779a8ec0c3e1e0aed8f8d1894cfc1e5ca33ee549
Diffstat (limited to 'WebCore')
-rw-r--r-- | WebCore/platform/graphics/android/FontCustomPlatformData.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/FontCustomPlatformData.h b/WebCore/platform/graphics/android/FontCustomPlatformData.h index 452a0b3..b41417c 100644 --- a/WebCore/platform/graphics/android/FontCustomPlatformData.h +++ b/WebCore/platform/graphics/android/FontCustomPlatformData.h @@ -27,6 +27,7 @@ #define FontCustomPlatformData_h #include "FontRenderingMode.h" +#include <wtf/Forward.h> #include <wtf/Noncopyable.h> class SkTypeface; @@ -35,7 +36,6 @@ namespace WebCore { class FontPlatformData; class SharedBuffer; -class String; class FontCustomPlatformData : public Noncopyable { public: |