Title: [190895] trunk/Source/WebCore
- Revision
- 190895
- Author
- mmaxfi...@apple.com
- Date
- 2015-10-12 15:40:36 -0700 (Mon, 12 Oct 2015)
Log Message
[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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (190894 => 190895)
--- trunk/Source/WebCore/ChangeLog 2015-10-12 22:36:03 UTC (rev 190894)
+++ trunk/Source/WebCore/ChangeLog 2015-10-12 22:40:36 UTC (rev 190895)
@@ -1,3 +1,19 @@
+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-10-12 Simon Fraser <simon.fra...@apple.com>
Add a CGContextStateSaver and use it
Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (190894 => 190895)
--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2015-10-12 22:36:03 UTC (rev 190894)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2015-10-12 22:40:36 UTC (rev 190895)
@@ -603,9 +603,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: trunk/Source/WebCore/platform/graphics/WidthIterator.h (190894 => 190895)
--- trunk/Source/WebCore/platform/graphics/WidthIterator.h 2015-10-12 22:36:03 UTC (rev 190894)
+++ trunk/Source/WebCore/platform/graphics/WidthIterator.h 2015-10-12 22:40:36 UTC (rev 190895)
@@ -61,15 +61,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
