Title: [188140] trunk/Source/WebCore
- Revision
- 188140
- Author
- [email protected]
- Date
- 2015-08-07 11:22:59 -0700 (Fri, 07 Aug 2015)
Log Message
Fix WinCairo build after r188130.
* platform/graphics/win/FontCustomPlatformDataCairo.cpp:
(WebCore::FontCustomPlatformData::~FontCustomPlatformData):
(WebCore::FontCustomPlatformData::fontPlatformData):
Update fontPlatformData parameters.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (188139 => 188140)
--- trunk/Source/WebCore/ChangeLog 2015-08-07 18:11:28 UTC (rev 188139)
+++ trunk/Source/WebCore/ChangeLog 2015-08-07 18:22:59 UTC (rev 188140)
@@ -1,3 +1,12 @@
+2015-08-07 Alex Christensen <[email protected]>
+
+ Fix WinCairo build after r188130.
+
+ * platform/graphics/win/FontCustomPlatformDataCairo.cpp:
+ (WebCore::FontCustomPlatformData::~FontCustomPlatformData):
+ (WebCore::FontCustomPlatformData::fontPlatformData):
+ Update fontPlatformData parameters.
+
2015-08-07 Daniel Bates <[email protected]>
Attempt to fix the Windows build after <http://trac.webkit.org/changeset/188130>
Modified: trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.cpp (188139 => 188140)
--- trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.cpp 2015-08-07 18:11:28 UTC (rev 188139)
+++ trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.cpp 2015-08-07 18:22:59 UTC (rev 188140)
@@ -39,8 +39,11 @@
RemoveFontMemResourceEx(m_fontReference);
}
-FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, FontWidthVariant, FontRenderingMode renderingMode)
+FontPlatformData FontCustomPlatformData::fontPlatformData(const FontDescription&, bool bold, bool italic)
{
+ int size = fontDescription.computedPixelSize();
+ FontRenderingMode renderingMode = fontDescription.renderingMode();
+
LOGFONT logFont;
memset(&logFont, 0, sizeof(LOGFONT));
wcsncpy(logFont.lfFaceName, m_name.charactersWithNullTermination().data(), LF_FACESIZE - 1);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
