diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-17 14:09:28 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:17 +0100 |
| commit | 21e5a8c1ef0e857b93742093a0b034f9368cfe60 (patch) | |
| tree | fb042cd99a6f5c5db8ce4ae7c1f8571ea97bf37e /Source/WebCore/platform/graphics/android/FontAndroid.cpp | |
| parent | 3fbf8910ec513d0a9c19e991c840c5a8242d73d0 (diff) | |
| download | external_webkit-21e5a8c1ef0e857b93742093a0b034f9368cfe60.zip external_webkit-21e5a8c1ef0e857b93742093a0b034f9368cfe60.tar.gz external_webkit-21e5a8c1ef0e857b93742093a0b034f9368cfe60.tar.bz2 | |
Merge WebKit at r76408: Fix FontAndroid.cpp
TextRun.h was removed as an include from Font.h. This
is where FontAndroid was picking it up from. Add it into
FontAndroid.cpp.
See http://trac.webkit.org/changeset/76170
Change-Id: I2d1306fde1742a2e75cb7b47c2a0ad132939258c
Diffstat (limited to 'Source/WebCore/platform/graphics/android/FontAndroid.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/FontAndroid.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/FontAndroid.cpp b/Source/WebCore/platform/graphics/android/FontAndroid.cpp index a4fb51b..7fcad73 100644 --- a/Source/WebCore/platform/graphics/android/FontAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/FontAndroid.cpp @@ -42,6 +42,7 @@ #include "SkTemplates.h" #include "SkTypeface.h" #include "SkUtils.h" +#include "TextRun.h" #ifdef SUPPORT_COMPLEX_SCRIPTS #include "HarfbuzzSkia.h" |