Title: [198300] branches/safari-601-branch/Source/WebCore
- Revision
- 198300
- Author
- matthew_han...@apple.com
- Date
- 2016-03-16 13:44:04 -0700 (Wed, 16 Mar 2016)
Log Message
Merge r188574. rdar://problem/25070230
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (198299 => 198300)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-03-16 20:44:01 UTC (rev 198299)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-03-16 20:44:04 UTC (rev 198300)
@@ -1,5 +1,17 @@
2016-03-16 Matthew Hanson <matthew_han...@apple.com>
+ Merge r188574. rdar://problem/25070230
+
+ 2015-08-17 Alex Christensen <achristen...@webkit.org>
+
+ WinCairo build fix after r188566
+
+ * platform/graphics/win/FontPlatformDataCairoWin.cpp:
+ (WebCore::FontPlatformData::FontPlatformData):
+ Remove reference to removed m_isCompositeFontReference.
+
+2016-03-16 Matthew Hanson <matthew_han...@apple.com>
+
Merge r188566. rdar://problem/25070230
2015-08-17 Myles C. Maxfield <mmaxfi...@apple.com>
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp (198299 => 198300)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp 2016-03-16 20:44:01 UTC (rev 198299)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp 2016-03-16 20:44:04 UTC (rev 198300)
@@ -62,7 +62,6 @@
, m_orientation(Horizontal)
, m_widthVariant(RegularWidth)
, m_scaledFont(0)
- , m_isCompositeFontReference(false)
, m_isColorBitmapFont(false)
, m_syntheticBold(bold)
, m_syntheticOblique(oblique)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
