diff options
| author | Steve Block <steveblock@google.com> | 2010-07-12 10:34:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-12 10:34:10 -0700 |
| commit | 641074aac7439f6af9fa90bcaf9e2bb0ac274a4a (patch) | |
| tree | 0b2a044b957a238bd7c29b11e6851d7205c79865 | |
| parent | d66cc5d8dc3be3dcfc78f5155cf9f7b8015ee7b4 (diff) | |
| parent | dcaff4ee5696402068bb625c4c60f788a3f0f01f (diff) | |
| download | external_webkit-641074aac7439f6af9fa90bcaf9e2bb0ac274a4a.zip external_webkit-641074aac7439f6af9fa90bcaf9e2bb0ac274a4a.tar.gz external_webkit-641074aac7439f6af9fa90bcaf9e2bb0ac274a4a.tar.bz2 | |
Merge "Update CachedFont.cpp to reflect upstreaming in WebKit change 63088"
| -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 71dd8f9..272166e 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) && (OS(WINDOWS) || OS(LINUX))) || PLATFORM(HAIKU) || OS(WINCE) || OS(ANDROID) +#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (OS(WINDOWS) || OS(LINUX))) || PLATFORM(HAIKU) || OS(WINCE) || PLATFORM(ANDROID) #define STORE_FONT_CUSTOM_PLATFORM_DATA #endif |