Title: [193678] branches/safari-601-branch/Source/WebCore
- Revision
- 193678
- Author
- matthew_han...@apple.com
- Date
- 2015-12-07 17:53:21 -0800 (Mon, 07 Dec 2015)
Log Message
Follow-up merge of r191014. rdar://problem/23769801
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193677 => 193678)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-08 01:42:46 UTC (rev 193677)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-08 01:53:21 UTC (rev 193678)
@@ -1,3 +1,13 @@
+2015-12-07 Matthew Hanson <matthew_han...@apple.com>
+
+ Follow-up merge of r191014. rdar://problem/23769801
+
+ Complete the merge of r191014. The missing change was iOS only, but if that ever
+ changes we don't want to expose a known compile error.
+
+ * platform/graphics/FontCascade.cpp:
+ (WebCore::FontCascade::FontCascade):
+
2015-10-18 Myles C. Maxfield <mmaxfi...@apple.com>
Stop honoring the user default "WebKitKerningAndLigaturesEnabledByDefault"
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp (193677 => 193678)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp 2015-12-08 01:42:46 UTC (rev 193677)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp 2015-12-08 01:53:21 UTC (rev 193678)
@@ -141,7 +141,8 @@
: m_weakPtrFactory(this)
, m_letterSpacing(0)
, m_wordSpacing(0)
- , m_typesettingFeatures(computeTypesettingFeatures())
+ , m_enableKerning(computeEnableKerning())
+ , m_requiresShaping(computeRequiresShaping())
{
CTFontRef primaryFont = fontData.font();
m_fontDescription.setSpecifiedSize(CTFontGetSize(primaryFont));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
