<!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>[182192] trunk/Source/WebCore</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/182192">182192</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-03-31 11:53:25 -0700 (Tue, 31 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash in CGContextShowGlyphsWithAdvances when passing kCGFontIndexInvalid
https://bugs.webkit.org/show_bug.cgi?id=143114
This is a workaround for <rdar://problem/20230073>. Please remove when it is no longer necessary.
Reviewed by Alexey Proskuryakov.
Covered by:
compositing/regions/floated-region-with-transformed-child.html
compositing/regions/floated-region-with-transformed-child-expected.html
fast/regions/counters/extract-ordered-lists-in-regions-explicit-counters-005.html
fast/regions/counters/extract-ordered-lists-in-regions-explicit-counters-005-expected.html
fast/regions/overflow/overflow-content-transform-rotate.html
fast/regions/overflow/overflow-content-transform-rotate-expected.html
* platform/graphics/GlyphBuffer.h:
(WebCore::GlyphBuffer::shrink): Performing shaping may remove glyphs, so we need to shrink the GlyphBuffer.
* platform/graphics/WidthIterator.cpp:
(WebCore::applyFontTransforms): Filter out kCGFontIndexInvalid.
(WebCore::WidthIterator::advanceInternal): Moved code into applyFontTransforms, and trigger the
shrink of the GlyphBuffer.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGlyphBufferh">trunk/Source/WebCore/platform/graphics/GlyphBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsWidthIteratorcpp">trunk/Source/WebCore/platform/graphics/WidthIterator.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182191 => 182192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-31 18:26:16 UTC (rev 182191)
+++ trunk/Source/WebCore/ChangeLog 2015-03-31 18:53:25 UTC (rev 182192)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-03-31 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Crash in CGContextShowGlyphsWithAdvances when passing kCGFontIndexInvalid
+ https://bugs.webkit.org/show_bug.cgi?id=143114
+
+ This is a workaround for <rdar://problem/20230073>. Please remove when it is no longer necessary.
+
+ Reviewed by Alexey Proskuryakov.
+
+ Covered by:
+ compositing/regions/floated-region-with-transformed-child.html
+ compositing/regions/floated-region-with-transformed-child-expected.html
+ fast/regions/counters/extract-ordered-lists-in-regions-explicit-counters-005.html
+ fast/regions/counters/extract-ordered-lists-in-regions-explicit-counters-005-expected.html
+ fast/regions/overflow/overflow-content-transform-rotate.html
+ fast/regions/overflow/overflow-content-transform-rotate-expected.html
+
+ * platform/graphics/GlyphBuffer.h:
+ (WebCore::GlyphBuffer::shrink): Performing shaping may remove glyphs, so we need to shrink the GlyphBuffer.
+ * platform/graphics/WidthIterator.cpp:
+ (WebCore::applyFontTransforms): Filter out kCGFontIndexInvalid.
+ (WebCore::WidthIterator::advanceInternal): Moved code into applyFontTransforms, and trigger the
+ shrink of the GlyphBuffer.
+
</ins><span class="cx"> 2015-03-31 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r173484): Reducing content of scrollable region does not reset scroll
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGlyphBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GlyphBuffer.h (182191 => 182192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GlyphBuffer.h 2015-03-31 18:26:16 UTC (rev 182191)
+++ trunk/Source/WebCore/platform/graphics/GlyphBuffer.h 2015-03-31 18:53:25 UTC (rev 182192)
</span><span class="lines">@@ -202,6 +202,18 @@
</span><span class="cx"> return (*m_offsetsInString)[index];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void shrink(int truncationPoint)
+ {
+ m_font.shrink(truncationPoint);
+ m_glyphs.shrink(truncationPoint);
+ m_advances.shrink(truncationPoint);
+ if (m_offsetsInString)
+ m_offsetsInString->shrink(truncationPoint);
+#if PLATFORM(WIN)
+ m_offsets.shrink(truncationPoint);
+#endif
+ }
+
</ins><span class="cx"> private:
</span><span class="cx"> void swap(int index1, int index2)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsWidthIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/WidthIterator.cpp (182191 => 182192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/WidthIterator.cpp 2015-03-31 18:26:16 UTC (rev 182191)
+++ trunk/Source/WebCore/platform/graphics/WidthIterator.cpp 2015-03-31 18:53:25 UTC (rev 182192)
</span><span class="lines">@@ -108,8 +108,10 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> int glyphBufferSize = glyphBuffer->size();
</span><del>- if (glyphBuffer->size() <= lastGlyphCount + 1)
</del><ins>+ if (glyphBuffer->size() <= lastGlyphCount + 1) {
+ lastGlyphCount = glyphBufferSize;
</ins><span class="cx"> return 0;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> GlyphBufferAdvance* advances = glyphBuffer->advances(0);
</span><span class="cx"> float widthDifference = 0;
</span><span class="lines">@@ -146,6 +148,19 @@
</span><span class="cx"> }
</span><span class="cx"> charactersTreatedAsSpace.clear();
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC) || PLATFORM(IOS)
+ // Workaround for <rdar://problem/20230073> FIXME: Please remove this when no longer needed.
+ GlyphBufferGlyph* glyphs = glyphBuffer->glyphs(0);
+ int filteredIndex = lastGlyphCount;
+ for (int i = lastGlyphCount; i < glyphBufferSize; ++i) {
+ glyphs[filteredIndex] = glyphs[i];
+ advances[filteredIndex] = advances[i];
+ if (glyphs[filteredIndex] != kCGFontIndexInvalid)
+ ++filteredIndex;
+ }
+ glyphBufferSize = filteredIndex;
+#endif
+
</ins><span class="cx"> for (int i = lastGlyphCount; i < glyphBufferSize; ++i)
</span><span class="cx"> widthDifference += advances[i].width();
</span><span class="cx">
</span><span class="lines">@@ -207,7 +222,8 @@
</span><span class="cx"> if (font != lastFontData && width) {
</span><span class="cx"> if (shouldApplyFontTransforms()) {
</span><span class="cx"> m_runWidthSoFar += applyFontTransforms(glyphBuffer, m_run.ltr(), lastGlyphCount, lastFontData, *this, m_typesettingFeatures, charactersTreatedAsSpace);
</span><del>- lastGlyphCount = glyphBuffer->size(); // applyFontTransforms doesn't update when there had been only one glyph.
</del><ins>+ if (glyphBuffer)
+ glyphBuffer->shrink(lastGlyphCount);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> lastFontData = font;
</span><span class="lines">@@ -325,8 +341,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (shouldApplyFontTransforms())
</del><ins>+ if (shouldApplyFontTransforms()) {
</ins><span class="cx"> m_runWidthSoFar += applyFontTransforms(glyphBuffer, m_run.ltr(), lastGlyphCount, lastFontData, *this, m_typesettingFeatures, charactersTreatedAsSpace);
</span><ins>+ if (glyphBuffer)
+ glyphBuffer->shrink(lastGlyphCount);
+ }
</ins><span class="cx">
</span><span class="cx"> unsigned consumedCharacters = textIterator.currentCharacter() - m_currentCharacter;
</span><span class="cx"> m_currentCharacter = textIterator.currentCharacter();
</span></span></pre>
</div>
</div>
</body>
</html>