[WinCairo] Build fix after addition of openTypeTable.

* platform/graphics/FontPlatformData.h:
(FontPlatformData): The openTypeTable declaration is needed
for WinCairo as well.
* platform/graphics/win/FontPlatformDataWin.cpp:
(WebCore):
(WebCore::FontPlatformData::openTypeTable): The implementation
of openTypeTable is needed for non-CG builds.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114044 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 2e3f8d9..a06e841 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2012-04-12  Brent Fulgham  <bfulgham@webkit.org>
+
+        [WinCairo] Build fix after addition of openTypeTable.
+
+        * platform/graphics/FontPlatformData.h:
+        (FontPlatformData): The openTypeTable declaration is needed
+        for WinCairo as well.
+        * platform/graphics/win/FontPlatformDataWin.cpp:
+        (WebCore):
+        (WebCore::FontPlatformData::openTypeTable): The implementation
+        of openTypeTable is needed for non-CG builds.
+
 2012-04-12  Balazs Kelemen  <kbalazs@webkit.org>
 
         [Qt] Fix WebKit1 build with V8

diff --git a/Source/WebCore/platform/graphics/FontPlatformData.h b/Source/WebCore/platform/graphics/FontPlatformData.h
index a6af503..e822e50 100644 (file)
--- a/Source/WebCore/platform/graphics/FontPlatformData.h
+++ b/Source/WebCore/platform/graphics/FontPlatformData.h
@@ -299,7 +299,7 @@ public:
 #endif
     }
 
-#if PLATFORM(WIN) && USE(CG)
+#if PLATFORM(WIN) && (USE(CG) || USE(CAIRO))
     PassRefPtr<SharedBuffer> openTypeTable(uint32_t table) const;
 #endif
 

diff --git a/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp b/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp
index 1081de9..f783685 100644 (file)
--- a/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp
+++ b/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp
@@ -75,7 +75,6 @@ FontPlatformData::FontPlatformData(HFONT font, float size, bool bold, bool obliq
     RestoreDC(hdc, -1);
 }
 
-#if USE(CG)
 PassRefPtr<SharedBuffer> FontPlatformData::openTypeTable(uint32_t table) const
 {
     HWndDC hdc(0);
@@ -92,7 +91,6 @@ PassRefPtr<SharedBuffer> FontPlatformData::openTypeTable(uint32_t table) const
     SelectObject(hdc, oldFont);
     return buffer.release();
 }
-#endif
 
 #ifndef NDEBUG
 String FontPlatformData::description() const