diff options
| author | Steve Block <steveblock@google.com> | 2011-06-02 18:49:50 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 15:04:38 +0100 |
| commit | 8bee99452e987aba01b713dede89b52d280b9fbd (patch) | |
| tree | b9d78d9d8010294adbde921c718fe7adde05b609 /Source/WebCore/platform | |
| parent | 51d903c932419e958f11480f3cea5d2b3ce9d621 (diff) | |
| download | external_webkit-8bee99452e987aba01b713dede89b52d280b9fbd.zip external_webkit-8bee99452e987aba01b713dede89b52d280b9fbd.tar.gz external_webkit-8bee99452e987aba01b713dede89b52d280b9fbd.tar.bz2 | |
Merge WebKit at r82507: Continue to use Android's version of FontPlatformData.h
Each platform's version of this file is being merged upstream.
See http://trac.webkit.org/changeset/81977 (and its follow-up build
fixes r81982, r81988, r81990, r82018).
Change-Id: I1a4c17b5784de436ecd57e7e429837dd6c3dabb6
Diffstat (limited to 'Source/WebCore/platform')
| -rw-r--r-- | Source/WebCore/platform/graphics/FontPlatformData.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/FontPlatformData.h b/Source/WebCore/platform/graphics/FontPlatformData.h index 78c86ef..5981c16 100644 --- a/Source/WebCore/platform/graphics/FontPlatformData.h +++ b/Source/WebCore/platform/graphics/FontPlatformData.h @@ -35,6 +35,8 @@ #include "freetype/FontPlatformData.h" #elif (PLATFORM(EFL) || PLATFORM(GTK)) && USE(PANGO) #include "pango/FontPlatformData.h" +#elif PLATFORM(ANDROID) +#include "android/FontPlatformData.h" #else #ifndef FontPlatformData_h |