From 8bee99452e987aba01b713dede89b52d280b9fbd Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 2 Jun 2011 18:49:50 +0100 Subject: 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 --- Source/WebCore/platform/graphics/FontPlatformData.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Source/WebCore/platform') 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 -- cgit v1.1