Title: [114044] trunk/Source/WebCore
- Revision
- 114044
- Author
- [email protected]
- Date
- 2012-04-12 16:08:01 -0700 (Thu, 12 Apr 2012)
Log Message
[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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (114043 => 114044)
--- trunk/Source/WebCore/ChangeLog 2012-04-12 23:00:16 UTC (rev 114043)
+++ trunk/Source/WebCore/ChangeLog 2012-04-12 23:08:01 UTC (rev 114044)
@@ -1,3 +1,15 @@
+2012-04-12 Brent Fulgham <[email protected]>
+
+ [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 <[email protected]>
[Qt] Fix WebKit1 build with V8
Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (114043 => 114044)
--- trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2012-04-12 23:00:16 UTC (rev 114043)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2012-04-12 23:08:01 UTC (rev 114044)
@@ -299,7 +299,7 @@
#endif
}
-#if PLATFORM(WIN) && USE(CG)
+#if PLATFORM(WIN) && (USE(CG) || USE(CAIRO))
PassRefPtr<SharedBuffer> openTypeTable(uint32_t table) const;
#endif
Modified: trunk/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp (114043 => 114044)
--- trunk/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp 2012-04-12 23:00:16 UTC (rev 114043)
+++ trunk/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp 2012-04-12 23:08:01 UTC (rev 114044)
@@ -75,7 +75,6 @@
RestoreDC(hdc, -1);
}
-#if USE(CG)
PassRefPtr<SharedBuffer> FontPlatformData::openTypeTable(uint32_t table) const
{
HWndDC hdc(0);
@@ -92,7 +91,6 @@
SelectObject(hdc, oldFont);
return buffer.release();
}
-#endif
#ifndef NDEBUG
String FontPlatformData::description() const
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
