Title: [193580] branches/safari-601-branch/Source/WebCore
- Revision
- 193580
- Author
- matthew_han...@apple.com
- Date
- 2015-12-06 02:37:24 -0800 (Sun, 06 Dec 2015)
Log Message
Merge r190895. rdar://problem/23769817
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193579 => 193580)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-06 10:37:21 UTC (rev 193579)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-06 10:37:24 UTC (rev 193580)
@@ -1,5 +1,25 @@
2015-12-06 Matthew Hanson <matthew_han...@apple.com>
+ Merge r190895. rdar://problem/23769817
+
+ 2015-10-12 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ [Font Features] Tiny cleanup regarding FontCascade::typesettingFeatures()
+ https://bugs.webkit.org/show_bug.cgi?id=150051
+
+ Reviewed by Simon Fraser.
+
+ There are no typesetting features which aren't kerning nor ligatures.
+
+ No new tests because there is no behavior difference.
+
+ * platform/graphics/FontCascade.cpp:
+ (WebCore::FontCascade::codePath):
+ * platform/graphics/WidthIterator.h:
+ (WebCore::WidthIterator::supportsTypesettingFeatures): Deleted.
+
+2015-12-06 Matthew Hanson <matthew_han...@apple.com>
+
Merge r190999. rdar://problem/23769821
2015-10-13 Myles C. Maxfield <mmaxfi...@apple.com>
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp (193579 => 193580)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp 2015-12-06 10:37:21 UTC (rev 193579)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp 2015-12-06 10:37:24 UTC (rev 193580)
@@ -619,9 +619,11 @@
// FIXME: This shouldn't be necessary because Font::applyTransforms() should perform all necessary shaping.
if (m_fontDescription.featureSettings().size() > 0 || !m_fontDescription.variantSettings().isAllNormal())
return Complex;
-
- if (run.length() > 1 && !WidthIterator::supportsTypesettingFeatures(*this))
+
+#if !PLATFORM(COCOA)
+ if (run.length() > 1 && typesettingFeatures())
return Complex;
+#endif
if (!run.characterScanForCodePath())
return Simple;
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/WidthIterator.h (193579 => 193580)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/WidthIterator.h 2015-12-06 10:37:21 UTC (rev 193579)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/WidthIterator.h 2015-12-06 10:37:24 UTC (rev 193580)
@@ -58,15 +58,6 @@
Vector<SVGGlyph::ArabicForm>& arabicForms() { return m_arabicForms; }
#endif
- static bool supportsTypesettingFeatures(const FontCascade& font)
- {
-#if PLATFORM(COCOA)
- return !(font.typesettingFeatures() & ~(Kerning | Ligatures));
-#else
- return !font.typesettingFeatures();
-#endif
- }
-
const FontCascade* m_font;
const TextRun& m_run;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
