<!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>[192303] releases/WebKitGTK/webkit-2.10</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/192303">192303</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-11 01:04:33 -0800 (Wed, 11 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/189557">r189557</a> - ASSERTION FAILED: typesettingFeatures & (Kerning | Ligatures) in WebCore::applyFontTransforms
https://bugs.webkit.org/show_bug.cgi?id=146194
Reviewed by Dean Jackson.
Source/WebCore:
We might trigger shaping even if the author hasn't specified kerning or ligatures.
Test: fast/text/softbank-emoji-no-ligatures-nor-kerning.html
* platform/graphics/WidthIterator.cpp:
(WebCore::isSoftBankEmoji):
(WebCore::WidthIterator::applyFontTransforms):
(WebCore::WidthIterator::advanceInternal):
(WebCore::applyFontTransforms): Deleted.
* platform/graphics/WidthIterator.h:
LayoutTests:
* fast/text/softbank-emoji-no-ligatures-nor-kerning-expected.html: Added
* fast/text/softbank-emoji-no-ligatures-nor-kerning.html: Added</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsWidthIteratorcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/WidthIterator.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsWidthIteratorh">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/WidthIterator.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfasttextsoftbankemojinoligaturesnorkerningexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/text/softbank-emoji-no-ligatures-nor-kerning-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfasttextsoftbankemojinoligaturesnorkerninghtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/text/softbank-emoji-no-ligatures-nor-kerning.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (192302 => 192303)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-11-11 08:56:37 UTC (rev 192302)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-11-11 09:04:33 UTC (rev 192303)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-09-09 Myles C. Maxfield <mmaxfield@apple.com>
+
+ ASSERTION FAILED: typesettingFeatures & (Kerning | Ligatures) in WebCore::applyFontTransforms
+ https://bugs.webkit.org/show_bug.cgi?id=146194
+
+ Reviewed by Dean Jackson.
+
+ * fast/text/softbank-emoji-no-ligatures-nor-kerning-expected.html: Added
+ * fast/text/softbank-emoji-no-ligatures-nor-kerning.html: Added
+
</ins><span class="cx"> 2015-11-09 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash when right clicking in input box with -webkit-user-select: none
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfasttextsoftbankemojinoligaturesnorkerningexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/text/softbank-emoji-no-ligatures-nor-kerning-expected.txt (0 => 192303)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/text/softbank-emoji-no-ligatures-nor-kerning-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/text/softbank-emoji-no-ligatures-nor-kerning-expected.txt 2015-11-11 09:04:33 UTC (rev 192303)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+This test makes sure there is no ASSERT when laying out SoftBank emoji symbols without kerning or ligatures. The test passes if there is no ASSERT.
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfasttextsoftbankemojinoligaturesnorkerninghtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/text/softbank-emoji-no-ligatures-nor-kerning.html (0 => 192303)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/text/softbank-emoji-no-ligatures-nor-kerning.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/text/softbank-emoji-no-ligatures-nor-kerning.html 2015-11-11 09:04:33 UTC (rev 192303)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+This test makes sure there is no ASSERT when laying out SoftBank emoji symbols without kerning or ligatures.
+The test passes if there is no ASSERT.
+<div style="text-rendering: optimizeSpeed;">&#xE001;</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (192302 => 192303)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-11-11 08:56:37 UTC (rev 192302)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-11-11 09:04:33 UTC (rev 192303)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-09-09 Myles C. Maxfield <mmaxfield@apple.com>
+
+ ASSERTION FAILED: typesettingFeatures & (Kerning | Ligatures) in WebCore::applyFontTransforms
+ https://bugs.webkit.org/show_bug.cgi?id=146194
+
+ Reviewed by Dean Jackson.
+
+ We might trigger shaping even if the author hasn't specified kerning or ligatures.
+
+ Test: fast/text/softbank-emoji-no-ligatures-nor-kerning.html
+
+ * platform/graphics/WidthIterator.cpp:
+ (WebCore::isSoftBankEmoji):
+ (WebCore::WidthIterator::applyFontTransforms):
+ (WebCore::WidthIterator::advanceInternal):
+ (WebCore::applyFontTransforms): Deleted.
+ * platform/graphics/WidthIterator.h:
+
</ins><span class="cx"> 2015-11-09 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash when right clicking in input box with -webkit-user-select: none
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsWidthIteratorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/WidthIterator.cpp (192302 => 192303)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/WidthIterator.cpp 2015-11-11 08:56:37 UTC (rev 192302)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/WidthIterator.cpp 2015-11-11 09:04:33 UTC (rev 192303)
</span><span class="lines">@@ -95,12 +95,24 @@
</span><span class="cx"> float advanceAtCharacter;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-typedef Vector<std::pair<int, OriginalAdvancesForCharacterTreatedAsSpace>, 64> CharactersTreatedAsSpace;
</del><ins>+static inline bool isSoftBankEmoji(UChar32 codepoint)
+{
+ return codepoint >= 0xE001 && codepoint <= 0xE537;
+}
</ins><span class="cx">
</span><del>-static inline float applyFontTransforms(GlyphBuffer* glyphBuffer, bool ltr, int& lastGlyphCount, const Font* font, WidthIterator& iterator, TypesettingFeatures typesettingFeatures, bool force, CharactersTreatedAsSpace& charactersTreatedAsSpace)
</del><ins>+inline auto WidthIterator::shouldApplyFontTransforms(const GlyphBuffer* glyphBuffer, int lastGlyphCount, UChar32 previousCharacter) const -> TransformsType
</ins><span class="cx"> {
</span><del>- ASSERT(typesettingFeatures & (Kerning | Ligatures));
</del><ins>+ if (glyphBuffer && glyphBuffer->size() == (lastGlyphCount + 1) && isSoftBankEmoji(previousCharacter))
+ return TransformsType::Forced;
+ if (m_run.length() <= 1 || !(m_typesettingFeatures & (Kerning | Ligatures)))
+ return TransformsType::None;
+ return TransformsType::NotForced;
+}
</ins><span class="cx">
</span><ins>+inline float WidthIterator::applyFontTransforms(GlyphBuffer* glyphBuffer, bool ltr, int& lastGlyphCount, const Font* font, TypesettingFeatures typesettingFeatures, UChar32 previousCharacter, bool force, CharactersTreatedAsSpace& charactersTreatedAsSpace)
+{
+ ASSERT_UNUSED(previousCharacter, shouldApplyFontTransforms(glyphBuffer, lastGlyphCount, previousCharacter) != WidthIterator::TransformsType::None);
+
</ins><span class="cx"> if (!glyphBuffer)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="lines">@@ -118,16 +130,14 @@
</span><span class="cx"> if (!ltr)
</span><span class="cx"> glyphBuffer->reverse(lastGlyphCount, glyphBufferSize - lastGlyphCount);
</span><span class="cx">
</span><del>-#if !ENABLE(SVG_FONTS)
- UNUSED_PARAM(iterator);
-#else
</del><ins>+#if ENABLE(SVG_FONTS)
</ins><span class="cx"> // We need to handle transforms on SVG fonts internally, since they are rendered internally.
</span><span class="cx"> if (font->isSVGFont()) {
</span><span class="cx"> // SVG font ligatures are handled during glyph selection, only kerning remaining.
</span><del>- if (iterator.run().renderingContext() && (typesettingFeatures & Kerning)) {
</del><ins>+ if (run().renderingContext() && (typesettingFeatures & Kerning)) {
</ins><span class="cx"> // FIXME: We could pass the necessary context down to this level so we can lazily create rendering contexts at this point.
</span><span class="cx"> // However, a larger refactoring of SVG fonts might necessary to sidestep this problem completely.
</span><del>- iterator.run().renderingContext()->applySVGKerning(font, iterator, glyphBuffer, lastGlyphCount);
</del><ins>+ run().renderingContext()->applySVGKerning(font, *this, glyphBuffer, lastGlyphCount);
</ins><span class="cx"> }
</span><span class="cx"> } else
</span><span class="cx"> #endif
</span><span class="lines">@@ -194,20 +204,6 @@
</span><span class="cx"> return std::make_pair(expandLeft, expandRight);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool isSoftBankEmoji(UChar32 codepoint)
-{
- return codepoint >= 0xE001 && codepoint <= 0xE537;
-}
-
-inline auto WidthIterator::shouldApplyFontTransforms(const GlyphBuffer* glyphBuffer, int lastGlyphCount, UChar32 previousCharacter) const -> TransformsType
-{
- if (glyphBuffer && glyphBuffer->size() == lastGlyphCount + 1 && isSoftBankEmoji(previousCharacter))
- return TransformsType::Forced;
- if (m_run.length() <= 1 || !(m_typesettingFeatures & (Kerning | Ligatures)))
- return TransformsType::None;
- return TransformsType::NotForced;
-}
-
</del><span class="cx"> template <typename TextIterator>
</span><span class="cx"> inline unsigned WidthIterator::advanceInternal(TextIterator& textIterator, GlyphBuffer* glyphBuffer)
</span><span class="cx"> {
</span><span class="lines">@@ -269,7 +265,7 @@
</span><span class="cx"> if (font != lastFontData && width) {
</span><span class="cx"> auto transformsType = shouldApplyFontTransforms(glyphBuffer, lastGlyphCount, previousCharacter);
</span><span class="cx"> if (transformsType != TransformsType::None) {
</span><del>- m_runWidthSoFar += applyFontTransforms(glyphBuffer, m_run.ltr(), lastGlyphCount, lastFontData, *this, m_typesettingFeatures, transformsType == TransformsType::Forced, charactersTreatedAsSpace);
</del><ins>+ m_runWidthSoFar += applyFontTransforms(glyphBuffer, m_run.ltr(), lastGlyphCount, lastFontData, m_typesettingFeatures, previousCharacter, transformsType == TransformsType::Forced, charactersTreatedAsSpace);
</ins><span class="cx"> if (glyphBuffer)
</span><span class="cx"> glyphBuffer->shrink(lastGlyphCount);
</span><span class="cx"> }
</span><span class="lines">@@ -427,7 +423,7 @@
</span><span class="cx">
</span><span class="cx"> auto transformsType = shouldApplyFontTransforms(glyphBuffer, lastGlyphCount, previousCharacter);
</span><span class="cx"> if (transformsType != TransformsType::None) {
</span><del>- m_runWidthSoFar += applyFontTransforms(glyphBuffer, m_run.ltr(), lastGlyphCount, lastFontData, *this, m_typesettingFeatures, transformsType == TransformsType::Forced, charactersTreatedAsSpace);
</del><ins>+ m_runWidthSoFar += applyFontTransforms(glyphBuffer, m_run.ltr(), lastGlyphCount, lastFontData, m_typesettingFeatures, previousCharacter, transformsType == TransformsType::Forced, charactersTreatedAsSpace);
</ins><span class="cx"> if (glyphBuffer)
</span><span class="cx"> glyphBuffer->shrink(lastGlyphCount);
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsWidthIteratorh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/WidthIterator.h (192302 => 192303)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/WidthIterator.h 2015-11-11 08:56:37 UTC (rev 192302)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/WidthIterator.h 2015-11-11 09:04:33 UTC (rev 192303)
</span><span class="lines">@@ -35,7 +35,10 @@
</span><span class="cx"> class Font;
</span><span class="cx"> class TextRun;
</span><span class="cx"> struct GlyphData;
</span><ins>+struct OriginalAdvancesForCharacterTreatedAsSpace;
</ins><span class="cx">
</span><ins>+typedef Vector<std::pair<int, OriginalAdvancesForCharacterTreatedAsSpace>, 64> CharactersTreatedAsSpace;
+
</ins><span class="cx"> struct WidthIterator {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="lines">@@ -90,6 +93,7 @@
</span><span class="cx">
</span><span class="cx"> enum class TransformsType { None, Forced, NotForced };
</span><span class="cx"> TransformsType shouldApplyFontTransforms(const GlyphBuffer*, int lastGlyphCount, UChar32 previousCharacter) const;
</span><ins>+ float applyFontTransforms(GlyphBuffer*, bool ltr, int& lastGlyphCount, const Font*, TypesettingFeatures, UChar32 previousCharacter, bool force, CharactersTreatedAsSpace&);
</ins><span class="cx">
</span><span class="cx"> TypesettingFeatures m_typesettingFeatures;
</span><span class="cx"> HashSet<const Font*>* m_fallbackFonts;
</span></span></pre>
</div>
</div>
</body>
</html>