diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-30 11:29:39 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-30 11:29:39 -0800 |
| commit | df52d1194a5c266d0d20b5f65e24fd93edd34618 (patch) | |
| tree | a1f5292cb4545df151c3f09cb0840a0b014b443e /WebCore | |
| parent | db239ca3504af9998d5717708fdef4676e286602 (diff) | |
| parent | 11fe1a145d177f5a36812a6eec991057edeb9ecb (diff) | |
| download | external_webkit-df52d1194a5c266d0d20b5f65e24fd93edd34618.zip external_webkit-df52d1194a5c266d0d20b5f65e24fd93edd34618.tar.gz external_webkit-df52d1194a5c266d0d20b5f65e24fd93edd34618.tar.bz2 | |
Merge change I11fe1a14 into eclair-mr2
* changes:
add ANDROID to the list of platforms that support font-face
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/loader/CachedFont.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/loader/CachedFont.cpp b/WebCore/loader/CachedFont.cpp index 9cf152d..7fb25fb 100644 --- a/WebCore/loader/CachedFont.cpp +++ b/WebCore/loader/CachedFont.cpp @@ -27,7 +27,7 @@ #include "config.h" #include "CachedFont.h" -#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (PLATFORM(WIN_OS) || PLATFORM(LINUX))) || PLATFORM(HAIKU) || PLATFORM(WINCE) +#if PLATFORM(ANDROID) || PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (PLATFORM(WIN_OS) || PLATFORM(LINUX))) || PLATFORM(HAIKU) || PLATFORM(WINCE) #define STORE_FONT_CUSTOM_PLATFORM_DATA #endif |