<!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>[192726] 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/192726">192726</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-11-21 15:06:46 -0800 (Sat, 21 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tiny cleanup in ComplexTextController::collectComplexTextRuns()
https://bugs.webkit.org/show_bug.cgi?id=151534
Reviewed by Zalan Bujtas.
The isMissingGlyph boolean is completely unnecessary. Its entire
responsiblity is duplicated by the "font" pointer.
No new tests because there is no behavior change.
* platform/graphics/mac/ComplexTextController.cpp:
(WebCore::ComplexTextController::collectComplexTextRuns):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacComplexTextControllercpp">trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192725 => 192726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-21 20:02:34 UTC (rev 192725)
+++ trunk/Source/WebCore/ChangeLog 2015-11-21 23:06:46 UTC (rev 192726)
</span><span class="lines">@@ -1 +1,16 @@
</span><ins>+2015-11-21 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Tiny cleanup in ComplexTextController::collectComplexTextRuns()
+ https://bugs.webkit.org/show_bug.cgi?id=151534
+
+ Reviewed by Zalan Bujtas.
+
+ The isMissingGlyph boolean is completely unnecessary. Its entire
+ responsiblity is duplicated by the "font" pointer.
+
+ No new tests because there is no behavior change.
+
+ * platform/graphics/mac/ComplexTextController.cpp:
+ (WebCore::ComplexTextController::collectComplexTextRuns):
+
</ins><span class="cx"> == Rolled over to ChangeLog-2015-11-21 ==
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacComplexTextControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp (192725 => 192726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2015-11-21 20:02:34 UTC (rev 192725)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2015-11-21 23:06:46 UTC (rev 192726)
</span><span class="lines">@@ -313,9 +313,7 @@
</span><span class="cx"> const UChar* end = cp + m_end;
</span><span class="cx">
</span><span class="cx"> const Font* font;
</span><del>- bool isMissingGlyph;
</del><span class="cx"> const Font* nextFont;
</span><del>- bool nextIsMissingGlyph;
</del><span class="cx">
</span><span class="cx"> unsigned markCount;
</span><span class="cx"> const UChar* sequenceStart = curr;
</span><span class="lines">@@ -335,14 +333,10 @@
</span><span class="cx"> m_smallCapsBuffer[sequenceStart - cp + i + 1] = sequenceStart[i + 1];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- nextIsMissingGlyph = false;
</del><span class="cx"> nextFont = m_font.fontForCombiningCharacterSequence(sequenceStart, curr - sequenceStart, nextIsSmallCaps ? SmallCapsVariant : NormalVariant);
</span><del>- if (!nextFont)
- nextIsMissingGlyph = true;
</del><span class="cx">
</span><span class="cx"> while (curr < end) {
</span><span class="cx"> font = nextFont;
</span><del>- isMissingGlyph = nextIsMissingGlyph;
</del><span class="cx"> isSmallCaps = nextIsSmallCaps;
</span><span class="cx"> int index = curr - cp;
</span><span class="cx">
</span><span class="lines">@@ -360,19 +354,15 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- nextIsMissingGlyph = false;
</del><span class="cx"> if (baseCharacter == zeroWidthJoiner)
</span><span class="cx"> nextFont = font;
</span><del>- else {
</del><ins>+ else
</ins><span class="cx"> nextFont = m_font.fontForCombiningCharacterSequence(cp + index, curr - cp - index, nextIsSmallCaps ? SmallCapsVariant : NormalVariant);
</span><del>- if (!nextFont)
- nextIsMissingGlyph = true;
- }
</del><span class="cx">
</span><del>- if (nextFont != font || nextIsMissingGlyph != isMissingGlyph) {
</del><ins>+ if (nextFont != font) {
</ins><span class="cx"> int itemStart = static_cast<int>(indexOfFontTransition);
</span><span class="cx"> int itemLength = index - indexOfFontTransition;
</span><del>- collectComplexTextRunsForCharacters((isSmallCaps ? m_smallCapsBuffer.data() : cp) + itemStart, itemLength, itemStart, !isMissingGlyph ? font : 0);
</del><ins>+ collectComplexTextRunsForCharacters((isSmallCaps ? m_smallCapsBuffer.data() : cp) + itemStart, itemLength, itemStart, font);
</ins><span class="cx"> indexOfFontTransition = index;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -380,7 +370,7 @@
</span><span class="cx"> int itemLength = m_end - indexOfFontTransition;
</span><span class="cx"> if (itemLength) {
</span><span class="cx"> int itemStart = indexOfFontTransition;
</span><del>- collectComplexTextRunsForCharacters((nextIsSmallCaps ? m_smallCapsBuffer.data() : cp) + itemStart, itemLength, itemStart, !nextIsMissingGlyph ? nextFont : 0);
</del><ins>+ collectComplexTextRunsForCharacters((nextIsSmallCaps ? m_smallCapsBuffer.data() : cp) + itemStart, itemLength, itemStart, nextFont);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_run.ltr())
</span></span></pre>
</div>
</div>
</body>
</html>