<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[193693] branches/safari-601.1.46-branch</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/193693">193693</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-07 21:40:37 -0800 (Mon, 07 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191331">r191331</a>. rdar://problem/23769700</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsFontcpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Font.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsFonth">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Font.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsFontCascadecpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsFontCascadeh">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsWidthIteratorcpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/WidthIterator.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsWidthIteratorh">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/WidthIterator.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicscocoaFontCocoamm">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsmacComplexTextControllerCoreTextmm">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsmacGlyphPageMaccpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsmacSimpleFontDataCoreTextcpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoresvgSVGFontDatah">branches/safari-601.1.46-branch/Source/WebCore/svg/SVGFontData.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsfasttextmultiplefeaturepropertiesexpectedhtml">branches/safari-601.1.46-branch/LayoutTests/fast/text/multiple-feature-properties-expected.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfasttextmultiplefeaturepropertieshtml">branches/safari-601.1.46-branch/LayoutTests/fast/text/multiple-feature-properties.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (193692 => 193693)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-08 05:40:29 UTC (rev 193692)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-08 05:40:37 UTC (rev 193693)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-10-19 Myles C. Maxfield <mmaxfield@apple.com>
+
+ FontCascade::typesettingFeatures() is not privy to font-variant-* nor font-feature-settings
+ https://bugs.webkit.org/show_bug.cgi?id=149775
+
+ Reviewed by Darin Adler.
+
+ * fast/text/multiple-feature-properties-expected.html: Added.
+ * fast/text/multiple-feature-properties.html: Added.
+
</ins><span class="cx"> 2015-12-06 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r190999. rdar://problem/23770070
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfasttextmultiplefeaturepropertiesexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/fast/text/multiple-feature-properties-expected.html (0 => 193693)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/text/multiple-feature-properties-expected.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/text/multiple-feature-properties-expected.html 2015-12-08 05:40:37 UTC (rev 193693)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that feature resolution order is honored. For more information, click <a href="http://www.w3.org/TR/css3-fonts/#feature-precedence">here</a>. The test passes if there is a particular sequence of Xs and check marks below.
+<div style="font-family: FontWithFeaturesOTF;">
+<span>B</span>
+<span>B</span>
+<span>A</span>
+<span>B</span>
+<span>A</span>
+<span>B</span>
+<span>A</span>
+<span>B</span>
+<span>B</span>
+<span>A</span>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfasttextmultiplefeaturepropertieshtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/fast/text/multiple-feature-properties.html (0 => 193693)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/text/multiple-feature-properties.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/text/multiple-feature-properties.html 2015-12-08 05:40:37 UTC (rev 193693)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that feature resolution order is honored. For more information, click <a href="http://www.w3.org/TR/css3-fonts/#feature-precedence">here</a>. The test passes if there is a particular sequence of Xs and check marks below.
+<div style="font-family: FontWithFeaturesOTF;">
+<span style="font-variant-ligatures: common-ligatures; text-rendering: optimizeSpeed;">C</span>
+<span style="font-variant-ligatures: no-common-ligatures; text-rendering: optimizeSpeed;">C</span>
+<span style="font-variant-ligatures: common-ligatures; text-rendering: optimizeLegibility;">C</span>
+<span style="font-variant-ligatures: no-common-ligatures; text-rendering: optimizeLegibility;">C</span>
+<span style="font-feature-settings: 'liga' 1, 'clig' 1; text-rendering: optimizeSpeed;">C</span>
+<span style="font-feature-settings: 'liga' 0, 'clig' 0; text-rendering: optimizeSpeed;">C</span>
+<span style="font-feature-settings: 'liga' 1, 'clig' 1; text-rendering: optimizeLegibility;">C</span>
+<span style="font-feature-settings: 'liga' 0, 'clig' 0; text-rendering: optimizeLegibility;">C</span>
+<span style="font-variant-ligatures: common-ligatures; font-feature-settings: 'liga' 0, 'clig' 0;">C</span>
+<span style="font-variant-ligatures: no-common-ligatures; font-feature-settings: 'liga' 1, 'clig' 1;">C</span>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193692 => 193693)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-08 05:40:29 UTC (rev 193692)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-08 05:40:37 UTC (rev 193693)
</span><span class="lines">@@ -1,3 +1,65 @@
</span><ins>+2015-10-19 Myles C. Maxfield <mmaxfield@apple.com>
+
+ FontCascade::typesettingFeatures() is not privy to font-variant-* nor font-feature-settings
+ https://bugs.webkit.org/show_bug.cgi?id=149775
+
+ Reviewed by Darin Adler.
+
+ This patch has two pieces:
+
+ We used to have a boolean, enableLigatures, which affected how we perform shaping in both our
+ simple and complex text codepaths. However, in this brave new world of font-feature-settings
+ and font-variant-*, there are many properties which may affect shaping (and multiple kinds
+ of ligatures). This patch renames this boolean to requiresShaping, and teaches it about all
+ the various properties which affect text shaping.
+
+ Similarly, one of the places which used this enableLigatures boolean was to tell CoreText
+ if it should disable ligatures. However, we now have much finer-grained control over
+ ligatures during font creation. This patch moves the responsibility of dictating which
+ font features should be enabled entirely to the Font. Therefore, getCFStringAttributes()
+ doesn't know anything about ligatures anymore; the logic inside font creation is used
+ instead.
+
+ An added benefit of moving all the font feature logic to one place is that we can implement
+ the feature resolution algorithm described in the CSS3 fonts spec. This patch adds a test to
+ makes sure that text-rendering, font-feature-settings, and font-variant-* play together
+ nicely.
+
+ Test: fast/text/multiple-feature-properties.html
+
+ * platform/graphics/Font.cpp:
+ (WebCore::Font::applyTransforms):
+ * platform/graphics/Font.h:
+ * platform/graphics/FontCascade.cpp:
+ (WebCore::FontCascade::FontCascade):
+ (WebCore::FontCascade::operator=):
+ (WebCore::FontCascade::update):
+ (WebCore::FontCascade::drawText):
+ (WebCore::FontCascade::drawEmphasisMarks):
+ (WebCore::FontCascade::width):
+ (WebCore::FontCascade::adjustSelectionRectForText):
+ (WebCore::FontCascade::offsetForPosition):
+ (WebCore::FontCascade::codePath):
+ (WebCore::FontCascade::floatWidthForSimpleText):
+ * platform/graphics/FontCascade.h:
+ (WebCore::FontCascade::requiresShaping):
+ (WebCore::FontCascade::computeRequiresShaping):
+ (WebCore::FontCascade::enableLigatures): Deleted.
+ (WebCore::FontCascade::computeEnableLigatures): Deleted.
+ * platform/graphics/WidthIterator.cpp:
+ (WebCore::WidthIterator::WidthIterator):
+ (WebCore::WidthIterator::applyFontTransforms):
+ * platform/graphics/WidthIterator.h:
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::preparePlatformFont):
+ * platform/graphics/cocoa/FontCocoa.mm:
+ (WebCore::Font::canRenderCombiningCharacterSequence):
+ * platform/graphics/mac/ComplexTextControllerCoreText.mm:
+ (WebCore::ComplexTextController::collectComplexTextRunsForCharacters):
+ * platform/graphics/mac/SimpleFontDataCoreText.cpp:
+ (WebCore::Font::getCFStringAttributes):
+ * svg/SVGFontData.h:
+
</ins><span class="cx"> 2015-10-13 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Split TypesettingFeatures into kerning and ligatures bools
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsFontcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Font.cpp (193692 => 193693)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Font.cpp 2015-12-08 05:40:29 UTC (rev 193692)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Font.cpp 2015-12-08 05:40:37 UTC (rev 193693)
</span><span class="lines">@@ -380,19 +380,19 @@
</span><span class="cx"> return platformCreateScaledFont(fontDescription, scaleFactor);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Font::applyTransforms(GlyphBufferGlyph* glyphs, GlyphBufferAdvance* advances, size_t glyphCount, bool enableKerning, bool enableLigatures) const
</del><ins>+bool Font::applyTransforms(GlyphBufferGlyph* glyphs, GlyphBufferAdvance* advances, size_t glyphCount, bool enableKerning, bool requiresShaping) const
</ins><span class="cx"> {
</span><span class="cx"> // We need to handle transforms on SVG fonts internally, since they are rendered internally.
</span><span class="cx"> ASSERT(!isSVGFont());
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- CTFontTransformOptions options = (enableKerning ? kCTFontTransformApplyPositioning : 0) | (enableLigatures ? kCTFontTransformApplyShaping : 0);
</del><ins>+ CTFontTransformOptions options = (enableKerning ? kCTFontTransformApplyPositioning : 0) | (requiresShaping ? kCTFontTransformApplyShaping : 0);
</ins><span class="cx"> return CTFontTransformGlyphs(m_platformData.ctFont(), glyphs, reinterpret_cast<CGSize*>(advances), glyphCount, options);
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(glyphs);
</span><span class="cx"> UNUSED_PARAM(advances);
</span><span class="cx"> UNUSED_PARAM(glyphCount);
</span><span class="cx"> UNUSED_PARAM(enableKerning);
</span><del>- UNUSED_PARAM(enableLigatures);
</del><ins>+ UNUSED_PARAM(requiresShaping);
</ins><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsFonth"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Font.h (193692 => 193693)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Font.h 2015-12-08 05:40:29 UTC (rev 193692)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Font.h 2015-12-08 05:40:37 UTC (rev 193693)
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> bool shouldNotBeUsedForArabic() const { return m_shouldNotBeUsedForArabic; };
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- CFDictionaryRef getCFStringAttributes(bool enableKerning, bool enableLigatures, FontOrientation) const;
</del><ins>+ CFDictionaryRef getCFStringAttributes(bool enableKerning, FontOrientation) const;
</ins><span class="cx"> bool hasCustomTracking() const { return isSystemFont(); }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> bool canRenderCombiningCharacterSequence(const UChar*, size_t) const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool applyTransforms(GlyphBufferGlyph*, GlyphBufferAdvance*, size_t glyphCount, bool enableKerning, bool enableLigatures) const;
</del><ins>+ bool applyTransforms(GlyphBufferGlyph*, GlyphBufferAdvance*, size_t glyphCount, bool enableKerning, bool requiresShaping) const;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA) || PLATFORM(WIN)
</span><span class="cx"> bool isSystemFont() const { return m_isSystemFont; }
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsFontCascadecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.cpp (193692 => 193693)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.cpp 2015-12-08 05:40:29 UTC (rev 193692)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.cpp 2015-12-08 05:40:37 UTC (rev 193693)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> , m_wordSpacing(0)
</span><span class="cx"> , m_useBackslashAsYenSymbol(false)
</span><span class="cx"> , m_enableKerning(false)
</span><del>- , m_enableLigatures(false)
</del><ins>+ , m_requiresShaping(false)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> , m_wordSpacing(wordSpacing)
</span><span class="cx"> , m_useBackslashAsYenSymbol(useBackslashAsYenSignForFamily(fd.firstFamily()))
</span><span class="cx"> , m_enableKerning(computeEnableKerning())
</span><del>- , m_enableLigatures(computeEnableKerning())
</del><ins>+ , m_requiresShaping(computeRequiresShaping())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> , m_wordSpacing(0)
</span><span class="cx"> , m_useBackslashAsYenSymbol(false)
</span><span class="cx"> , m_enableKerning(computeEnableKerning())
</span><del>- , m_enableLigatures(computeEnableKerning())
</del><ins>+ , m_requiresShaping(computeRequiresShaping())
</ins><span class="cx"> {
</span><span class="cx"> m_fontDescription.setFontSmoothing(fontSmoothingMode);
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> , m_wordSpacing(other.m_wordSpacing)
</span><span class="cx"> , m_useBackslashAsYenSymbol(other.m_useBackslashAsYenSymbol)
</span><span class="cx"> , m_enableKerning(computeEnableKerning())
</span><del>- , m_enableLigatures(computeEnableKerning())
</del><ins>+ , m_requiresShaping(computeRequiresShaping())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> m_wordSpacing = other.m_wordSpacing;
</span><span class="cx"> m_useBackslashAsYenSymbol = other.m_useBackslashAsYenSymbol;
</span><span class="cx"> m_enableKerning = other.m_enableKerning;
</span><del>- m_enableLigatures = other.m_enableLigatures;
</del><ins>+ m_requiresShaping = other.m_requiresShaping;
</ins><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx"> m_fonts = retrieveOrAddCachedFonts(m_fontDescription, fontSelector.get());
</span><span class="cx"> m_useBackslashAsYenSymbol = useBackslashAsYenSignForFamily(firstFamily());
</span><span class="cx"> m_enableKerning = computeEnableKerning();
</span><del>- m_enableLigatures = computeEnableLigatures();
</del><ins>+ m_requiresShaping = computeRequiresShaping();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float FontCascade::drawText(GraphicsContext* context, const TextRun& run, const FloatPoint& point, int from, int to, CustomFontNotReadyAction customFontNotReadyAction) const
</span><span class="lines">@@ -337,7 +337,7 @@
</span><span class="cx">
</span><span class="cx"> CodePath codePathToUse = codePath(run);
</span><span class="cx"> // FIXME: Use the fast code path once it handles partial runs with kerning and ligatures. See http://webkit.org/b/100050
</span><del>- if (codePathToUse != Complex && (enableKerning() || enableLigatures()) && (from || static_cast<unsigned>(to) != run.length()) && !isDrawnWithSVGFont(run))
</del><ins>+ if (codePathToUse != Complex && (enableKerning() || requiresShaping()) && (from || static_cast<unsigned>(to) != run.length()) && !isDrawnWithSVGFont(run))
</ins><span class="cx"> codePathToUse = Complex;
</span><span class="cx">
</span><span class="cx"> if (codePathToUse != Complex)
</span><span class="lines">@@ -356,7 +356,7 @@
</span><span class="cx">
</span><span class="cx"> CodePath codePathToUse = codePath(run);
</span><span class="cx"> // FIXME: Use the fast code path once it handles partial runs with kerning and ligatures. See http://webkit.org/b/100050
</span><del>- if (codePathToUse != Complex && (enableKerning() || enableLigatures()) && (from || static_cast<unsigned>(to) != run.length()) && !isDrawnWithSVGFont(run))
</del><ins>+ if (codePathToUse != Complex && (enableKerning() || requiresShaping()) && (from || static_cast<unsigned>(to) != run.length()) && !isDrawnWithSVGFont(run))
</ins><span class="cx"> codePathToUse = Complex;
</span><span class="cx">
</span><span class="cx"> if (codePathToUse != Complex)
</span><span class="lines">@@ -377,9 +377,8 @@
</span><span class="cx"> glyphOverflow = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool hasKerningOrLigatures = enableKerning() || enableLigatures();
</del><span class="cx"> bool hasWordSpacingOrLetterSpacing = wordSpacing() || letterSpacing();
</span><del>- float* cacheEntry = m_fonts->widthCache().add(run, std::numeric_limits<float>::quiet_NaN(), hasKerningOrLigatures, hasWordSpacingOrLetterSpacing, glyphOverflow);
</del><ins>+ float* cacheEntry = m_fonts->widthCache().add(run, std::numeric_limits<float>::quiet_NaN(), enableKerning() || requiresShaping(), hasWordSpacingOrLetterSpacing, glyphOverflow);
</ins><span class="cx"> if (cacheEntry && !std::isnan(*cacheEntry))
</span><span class="cx"> return *cacheEntry;
</span><span class="cx">
</span><span class="lines">@@ -529,7 +528,7 @@
</span><span class="cx">
</span><span class="cx"> CodePath codePathToUse = codePath(run);
</span><span class="cx"> // FIXME: Use the fast code path once it handles partial runs with kerning and ligatures. See http://webkit.org/b/100050
</span><del>- if (codePathToUse != Complex && (enableKerning() || enableLigatures()) && (from || static_cast<unsigned>(to) != run.length()) && !isDrawnWithSVGFont(run))
</del><ins>+ if (codePathToUse != Complex && (enableKerning() || requiresShaping()) && (from || static_cast<unsigned>(to) != run.length()) && !isDrawnWithSVGFont(run))
</ins><span class="cx"> codePathToUse = Complex;
</span><span class="cx">
</span><span class="cx"> if (codePathToUse != Complex)
</span><span class="lines">@@ -541,7 +540,7 @@
</span><span class="cx"> int FontCascade::offsetForPosition(const TextRun& run, float x, bool includePartialGlyphs) const
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Use the fast code path once it handles partial runs with kerning and ligatures. See http://webkit.org/b/100050
</span><del>- if (codePath(run) != Complex && (!(enableKerning() || enableLigatures()) || isDrawnWithSVGFont(run)))
</del><ins>+ if (codePath(run) != Complex && (!(enableKerning() || requiresShaping()) || isDrawnWithSVGFont(run)))
</ins><span class="cx"> return offsetForPositionForSimpleText(run, x, includePartialGlyphs);
</span><span class="cx">
</span><span class="cx"> return offsetForPositionForComplexText(run, x, includePartialGlyphs);
</span><span class="lines">@@ -624,12 +623,12 @@
</span><span class="cx"> return Simple;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- // FIXME: This shouldn't be necessary because Font::applyTransforms() should perform all necessary shaping.
</del><ins>+ // Because Font::applyTransforms() doesn't know which features to enable/disable it the simple code path can’t properly handle feature or variant settings.
</ins><span class="cx"> if (m_fontDescription.featureSettings().size() > 0 || !m_fontDescription.variantSettings().isAllNormal())
</span><span class="cx"> return Complex;
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(COCOA)
</span><del>- if (run.length() > 1 && (enableKerning() || enableLigatures()))
</del><ins>+ if (run.length() > 1 && (enableKerning() || requiresShaping()))
</ins><span class="cx"> return Complex;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1451,7 +1450,7 @@
</span><span class="cx"> {
</span><span class="cx"> WidthIterator it(this, run, fallbackFonts, glyphOverflow);
</span><span class="cx"> GlyphBuffer glyphBuffer;
</span><del>- it.advance(run.length(), (enableKerning() || enableLigatures()) ? &glyphBuffer : nullptr);
</del><ins>+ it.advance(run.length(), (enableKerning() || requiresShaping()) ? &glyphBuffer : nullptr);
</ins><span class="cx">
</span><span class="cx"> if (glyphOverflow) {
</span><span class="cx"> glyphOverflow->top = std::max<int>(glyphOverflow->top, ceilf(-it.minGlyphBoundingBoxY()) - (glyphOverflow->computeBounds ? 0 : fontMetrics().ascent()));
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsFontCascadeh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.h (193692 => 193693)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.h 2015-12-08 05:40:29 UTC (rev 193692)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.h 2015-12-08 05:40:37 UTC (rev 193693)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> FontRenderingMode renderingMode() const { return m_fontDescription.renderingMode(); }
</span><span class="cx">
</span><span class="cx"> bool enableKerning() const { return m_enableKerning; }
</span><del>- bool enableLigatures() const { return m_enableLigatures; }
</del><ins>+ bool requiresShaping() const { return m_requiresShaping; }
</ins><span class="cx">
</span><span class="cx"> const AtomicString& firstFamily() const { return m_fontDescription.firstFamily(); }
</span><span class="cx"> unsigned familyCount() const { return m_fontDescription.familyCount(); }
</span><span class="lines">@@ -324,13 +324,12 @@
</span><span class="cx"> return advancedTextRenderingMode();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool computeEnableLigatures() const
</del><ins>+ bool computeRequiresShaping() const
</ins><span class="cx"> {
</span><del>- auto ligatures = m_fontDescription.variantCommonLigatures();
- if (ligatures == FontVariantLigatures::Yes)
</del><ins>+ if (!m_fontDescription.variantSettings().isAllNormal())
</ins><span class="cx"> return true;
</span><del>- if (ligatures == FontVariantLigatures::No)
- return false;
</del><ins>+ if (m_fontDescription.featureSettings().size())
+ return true;
</ins><span class="cx"> return advancedTextRenderingMode();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -344,7 +343,7 @@
</span><span class="cx"> float m_wordSpacing;
</span><span class="cx"> mutable bool m_useBackslashAsYenSymbol;
</span><span class="cx"> mutable unsigned m_enableKerning : 1; // Computed from m_fontDescription.
</span><del>- mutable unsigned m_enableLigatures : 1; // Computed from m_fontDescription.
</del><ins>+ mutable unsigned m_requiresShaping : 1; // Computed from m_fontDescription.
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> void invalidateFontCascadeCache();
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsWidthIteratorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/WidthIterator.cpp (193692 => 193693)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/WidthIterator.cpp 2015-12-08 05:40:29 UTC (rev 193692)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/WidthIterator.cpp 2015-12-08 05:40:37 UTC (rev 193693)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> , m_fallbackFonts(fallbackFonts)
</span><span class="cx"> , m_accountForGlyphBounds(accountForGlyphBounds)
</span><span class="cx"> , m_enableKerning(font->enableKerning())
</span><del>- , m_enableLigatures(font->enableLigatures())
</del><ins>+ , m_requiresShaping(font->requiresShaping())
</ins><span class="cx"> , m_forTextEmphasis(forTextEmphasis)
</span><span class="cx"> {
</span><span class="cx"> // If the padding is non-zero, count the number of spaces in the run
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> }
</span><span class="cx"> } else
</span><span class="cx"> #endif
</span><del>- font->applyTransforms(glyphBuffer->glyphs(lastGlyphCount), advances + lastGlyphCount, glyphBufferSize - lastGlyphCount, iterator.enableKerning(), iterator.enableLigatures());
</del><ins>+ font->applyTransforms(glyphBuffer->glyphs(lastGlyphCount), advances + lastGlyphCount, glyphBufferSize - lastGlyphCount, iterator.enableKerning(), iterator.requiresShaping());
</ins><span class="cx">
</span><span class="cx"> if (!ltr)
</span><span class="cx"> glyphBuffer->reverse(lastGlyphCount, glyphBufferSize - lastGlyphCount);
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (glyphBuffer && glyphBuffer->size() == lastGlyphCount + 1 && isSoftBankEmoji(previousCharacter))
</span><span class="cx"> return TransformsType::Forced;
</span><del>- if (m_run.length() <= 1 || !(m_enableKerning || m_enableLigatures))
</del><ins>+ if (m_run.length() <= 1 || !(m_enableKerning || m_requiresShaping))
</ins><span class="cx"> return TransformsType::None;
</span><span class="cx"> return TransformsType::NotForced;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsWidthIteratorh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/WidthIterator.h (193692 => 193693)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/WidthIterator.h 2015-12-08 05:40:29 UTC (rev 193692)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/WidthIterator.h 2015-12-08 05:40:37 UTC (rev 193693)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> const TextRun& run() const { return m_run; }
</span><span class="cx"> float runWidthSoFar() const { return m_runWidthSoFar; }
</span><span class="cx"> bool enableKerning() const { return m_enableKerning; }
</span><del>- bool enableLigatures() const { return m_enableLigatures; }
</del><ins>+ bool requiresShaping() const { return m_requiresShaping; }
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SVG_FONTS)
</span><span class="cx"> String lastGlyphName() const { return m_lastGlyphName; }
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> HashSet<const Font*>* m_fallbackFonts { nullptr };
</span><span class="cx"> bool m_accountForGlyphBounds { false };
</span><span class="cx"> bool m_enableKerning { false };
</span><del>- bool m_enableLigatures { false };
</del><ins>+ bool m_requiresShaping { false };
</ins><span class="cx"> bool m_forTextEmphasis { false };
</span><span class="cx"> float m_maxGlyphBoundingBoxY { std::numeric_limits<float>::min() };
</span><span class="cx"> float m_minGlyphBoundingBoxY { std::numeric_limits<float>::max() };
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (193692 => 193693)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2015-12-08 05:40:29 UTC (rev 193692)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2015-12-08 05:40:37 UTC (rev 193693)
</span><span class="lines">@@ -320,10 +320,17 @@
</span><span class="cx"> if (!originalFont || (!features.size() && variantSettings.isAllNormal()))
</span><span class="cx"> return originalFont;
</span><span class="cx">
</span><del>- // FIXME: We don't consult with the @font-face first, like the spec says we should.
</del><ins>+ // This algorithm is described at http://www.w3.org/TR/css3-fonts/#feature-precedence
</ins><span class="cx">
</span><del>- // Spec says that font-feature-settings should override font-variant-*.
</del><ins>+ // Step 1: CoreText handles default features (such as required ligatures).
+
+ // Steps 2-3: Consult with @font-face
+ // FIXME: This is not yet implemented.
+
+ // Step 4: Font-variant
</ins><span class="cx"> auto fontFeatureSettingsFromVariants = computeFeatureSettingsFromVariants(variantSettings);
</span><ins>+
+ // Step 6: Font-feature-settings
</ins><span class="cx"> for (auto& newFeature : features)
</span><span class="cx"> fontFeatureSettingsFromVariants.set(newFeature.tag(), newFeature.value());
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicscocoaFontCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm (193692 => 193693)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2015-12-08 05:40:29 UTC (rev 193692)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2015-12-08 05:40:37 UTC (rev 193693)
</span><span class="lines">@@ -525,7 +525,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFTypeRef> fontEqualityObject = platformData().objectForEqualityCheck();
</span><span class="cx">
</span><del>- ProviderInfo info = { characters, length, getCFStringAttributes(false, false, platformData().orientation()) };
</del><ins>+ ProviderInfo info = { characters, length, getCFStringAttributes(false, platformData().orientation()) };
</ins><span class="cx"> RetainPtr<CTLineRef> line = adoptCF(CTLineCreateWithUniCharProvider(&provideStringAndAttributes, 0, &info));
</span><span class="cx">
</span><span class="cx"> CFArrayRef runArray = CTLineGetGlyphRuns(line.get());
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsmacComplexTextControllerCoreTextmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm (193692 => 193693)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2015-12-08 05:40:29 UTC (rev 193692)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2015-12-08 05:40:37 UTC (rev 193693)
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<WebCascadeList> cascadeList = adoptNS([[WebCascadeList alloc] initWithFont:&m_font character:baseCharacter]);
</span><span class="cx">
</span><del>- stringAttributes = adoptCF(CFDictionaryCreateMutableCopy(kCFAllocatorDefault, 0, font->getCFStringAttributes(m_font.enableKerning(), m_font.enableLigatures(), font->platformData().orientation())));
</del><ins>+ stringAttributes = adoptCF(CFDictionaryCreateMutableCopy(kCFAllocatorDefault, 0, font->getCFStringAttributes(m_font.enableKerning(), font->platformData().orientation())));
</ins><span class="cx"> static const void* attributeKeys[] = { kCTFontCascadeListAttribute };
</span><span class="cx"> const void* values[] = { cascadeList.get() };
</span><span class="cx"> RetainPtr<CFDictionaryRef> attributes = adoptCF(CFDictionaryCreate(kCFAllocatorDefault, attributeKeys, values, sizeof(attributeKeys) / sizeof(*attributeKeys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> RetainPtr<CTFontRef> fontWithCascadeList = adoptCF(CTFontCreateCopyWithAttributes(font->platformData().ctFont(), m_font.pixelSize(), 0, fontDescriptor.get()));
</span><span class="cx"> CFDictionarySetValue(const_cast<CFMutableDictionaryRef>(stringAttributes.get()), kCTFontAttributeName, fontWithCascadeList.get());
</span><span class="cx"> } else
</span><del>- stringAttributes = font->getCFStringAttributes(m_font.enableKerning(), m_font.enableLigatures(), font->platformData().orientation());
</del><ins>+ stringAttributes = font->getCFStringAttributes(m_font.enableKerning(), font->platformData().orientation());
</ins><span class="cx">
</span><span class="cx"> RetainPtr<CTLineRef> line;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsmacGlyphPageMaccpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp (193692 => 193693)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp 2015-12-08 05:40:29 UTC (rev 193692)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp 2015-12-08 05:40:37 UTC (rev 193693)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx">
</span><span class="cx"> // We ask CoreText for possible vertical variant glyphs
</span><span class="cx"> RetainPtr<CFStringRef> string = adoptCF(CFStringCreateWithCharactersNoCopy(kCFAllocatorDefault, buffer, bufferLength, kCFAllocatorNull));
</span><del>- RetainPtr<CFAttributedStringRef> attributedString = adoptCF(CFAttributedStringCreate(kCFAllocatorDefault, string.get(), fontData->getCFStringAttributes(false, false, fontData->hasVerticalGlyphs() ? Vertical : Horizontal)));
</del><ins>+ RetainPtr<CFAttributedStringRef> attributedString = adoptCF(CFAttributedStringCreate(kCFAllocatorDefault, string.get(), fontData->getCFStringAttributes(false, fontData->hasVerticalGlyphs() ? Vertical : Horizontal)));
</ins><span class="cx"> RetainPtr<CTLineRef> line = adoptCF(CTLineCreateWithAttributedString(attributedString.get()));
</span><span class="cx">
</span><span class="cx"> CFArrayRef runArray = CTLineGetGlyphRuns(line.get());
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsmacSimpleFontDataCoreTextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp (193692 => 193693)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp 2015-12-08 05:40:29 UTC (rev 193692)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp 2015-12-08 05:40:37 UTC (rev 193693)
</span><span class="lines">@@ -35,9 +35,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-CFDictionaryRef Font::getCFStringAttributes(bool enableKerning, bool enableLigatures, FontOrientation orientation) const
</del><ins>+CFDictionaryRef Font::getCFStringAttributes(bool enableKerning, FontOrientation orientation) const
</ins><span class="cx"> {
</span><del>- unsigned key = (enableKerning << 1 | enableLigatures) + 1;
</del><ins>+ unsigned key = static_cast<unsigned>(enableKerning) + 1;
</ins><span class="cx"> HashMap<unsigned, RetainPtr<CFDictionaryRef>>::AddResult addResult = m_CFStringAttributes.add(key, RetainPtr<CFDictionaryRef>());
</span><span class="cx"> RetainPtr<CFDictionaryRef>& attributesDictionary = addResult.iterator->value;
</span><span class="cx"> if (!addResult.isNewEntry)
</span><span class="lines">@@ -54,12 +54,6 @@
</span><span class="cx"> CFDictionarySetValue(mutableAttributes, kCTKernAttributeName, zeroKerningValue);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!((orientation == Horizontal && platformData().allowsLigatures()) || enableLigatures)) {
- const int zero = 0;
- static CFNumberRef essentialLigaturesValue = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &zero);
- CFDictionarySetValue(mutableAttributes, kCTLigatureAttributeName, essentialLigaturesValue);
- }
-
</del><span class="cx"> if (orientation == Vertical)
</span><span class="cx"> CFDictionarySetValue(mutableAttributes, kCTVerticalFormsAttributeName, kCFBooleanTrue);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoresvgSVGFontDatah"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/svg/SVGFontData.h (193692 => 193693)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/svg/SVGFontData.h 2015-12-08 05:40:29 UTC (rev 193692)
+++ branches/safari-601.1.46-branch/Source/WebCore/svg/SVGFontData.h 2015-12-08 05:40:37 UTC (rev 193693)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> bool fillBMPGlyphs(SVGFontElement*, GlyphPage* , unsigned offset, unsigned length, UChar* buffer, const Font*) const;
</span><span class="cx"> bool fillNonBMPGlyphs(SVGFontElement*, GlyphPage* , unsigned offset, unsigned length, UChar* buffer, const Font*) const;
</span><span class="cx">
</span><del>- bool applyTransforms(GlyphBufferGlyph*, GlyphBufferAdvance*, size_t, bool enableKerning, bool enableLigatures) const = delete;
</del><ins>+ bool applyTransforms(GlyphBufferGlyph*, GlyphBufferAdvance*, size_t, bool enableKerning, bool requiresShaping) const = delete;
</ins><span class="cx">
</span><span class="cx"> // Ths SVGFontFaceElement is kept alive --
</span><span class="cx"> // 1) in the external font case: by the CSSFontFaceSource, which holds a reference to the external SVG document
</span></span></pre>
</div>
</div>
</body>
</html>