Get CSSFontFaceSource and CachedFont building under Linux

Review URL: http://codereview.chromium.org/7895


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3905 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 18 insertions, 0 deletions

diff --git a/webkit/port/platform/graphics/FontCustomPlatformData.cpp b/webkit/port/platform/graphics/FontCustomPlatformData.cpp
index 4c71f38..ab65b7e 100644
--- a/webkit/port/platform/graphics/FontCustomPlatformData.cpp
+++ b/webkit/port/platform/graphics/FontCustomPlatformData.cpp
@@ -23,6 +23,7 @@
 
 #include "SharedBuffer.h"
 #include "FontPlatformData.h"
+#include "NotImplemented.h"
 
 namespace WebCore {
 
@@ -40,11 +41,15 @@ FontCustomPlatformData* createFontCustomPlatformData(SharedBuffer* buffer)
 {
     ASSERT_ARG(buffer, buffer);
 
+#if PLATFORM(WIN_OS)
     HFONT font = 0;
     // FIXME: Figure out some way to get Windows to give us back a font object.
     if (!font)
         return 0;
     return new FontCustomPlatformData(font);
+#else
+    notImplemented();
+#endif
 }
 
 }
diff --git a/webkit/port/platform/graphics/FontCustomPlatformData.h b/webkit/port/platform/graphics/FontCustomPlatformData.h
index 2ed70a9..1689491 100644
--- a/webkit/port/platform/graphics/FontCustomPlatformData.h
+++ b/webkit/port/platform/graphics/FontCustomPlatformData.h
@@ -22,7 +22,10 @@
 #define FontCustomPlatformData_h
 
 #include <wtf/Noncopyable.h>
+
+#if PLATFORM(WIN_OS)
 #include <windows.h>
+#endif
 
 namespace WebCore {
 
@@ -30,14 +33,19 @@ class FontPlatformData;
 class SharedBuffer;
 
 struct FontCustomPlatformData : Noncopyable {
+#if PLATFORM(WIN_OS)
     FontCustomPlatformData(HFONT font)
         : m_font(font)
     {}
+#endif
+
     ~FontCustomPlatformData();
 
     FontPlatformData fontPlatformData(int size, bool bold, bool italic);
 
+#if PLATFORM(WIN_OS)
     HFONT m_font;
+#endif
 };
 
 FontCustomPlatformData* createFontCustomPlatformData(SharedBuffer*);
diff --git a/webkit/port/platform/graphics/chromium/FontPlatformDataLinux.cpp b/webkit/port/platform/graphics/chromium/FontPlatformDataLinux.cpp
index 814ca82..855d6d8 100644
--- a/webkit/port/platform/graphics/chromium/FontPlatformDataLinux.cpp
+++ b/webkit/port/platform/graphics/chromium/FontPlatformDataLinux.cpp
@@ -24,6 +24,10 @@ FontPlatformData::FontPlatformData(const FontDescription& fontDescription,
     notImplemented();
 }
 
+FontPlatformData::FontPlatformData(float size, bool bold, bool oblique) {
+    notImplemented();
+}
+
 FontPlatformData::~FontPlatformData() {
     notImplemented();
 }
diff --git a/webkit/port/platform/graphics/chromium/FontPlatformDataLinux.h b/webkit/port/platform/graphics/chromium/FontPlatformDataLinux.h
index 33ce2bb..383fbf3 100644
--- a/webkit/port/platform/graphics/chromium/FontPlatformDataLinux.h
+++ b/webkit/port/platform/graphics/chromium/FontPlatformDataLinux.h
@@ -23,6 +23,7 @@ public:
     FontPlatformData();
     FontPlatformData(WTF::HashTableDeletedValueType);
     FontPlatformData(const FontDescription&, const AtomicString& family);
+    FontPlatformData(float size, bool bold, bool oblique);
     ~FontPlatformData();
 
     bool isHashTableDeletedValue() const;