<!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>[280102] 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/280102">280102</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2021-07-20 13:40:10 -0700 (Tue, 20 Jul 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use references instead of pointers in WidthIterator::advanceInternal()
https://bugs.webkit.org/show_bug.cgi?id=228099

Reviewed by Fujii Hironori.

We assert that font is non-null, so we should be able to use a reference for it instead of a pointer.

No new tests because there is no behavior change.

* platform/graphics/WidthIterator.cpp:
(WebCore::WidthIterator::advanceInternal):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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 (280101 => 280102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-07-20 20:39:35 UTC (rev 280101)
+++ trunk/Source/WebCore/ChangeLog      2021-07-20 20:40:10 UTC (rev 280102)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2021-07-20  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Use references instead of pointers in WidthIterator::advanceInternal()
+        https://bugs.webkit.org/show_bug.cgi?id=228099
+
+        Reviewed by Fujii Hironori.
+
+        We assert that font is non-null, so we should be able to use a reference for it instead of a pointer.
+
+        No new tests because there is no behavior change.
+
+        * platform/graphics/WidthIterator.cpp:
+        (WebCore::WidthIterator::advanceInternal):
+
</ins><span class="cx"> 2021-07-20  Fujii Hironori  <Hironori.Fujii@sony.com>
</span><span class="cx"> 
</span><span class="cx">         Use WeakHashSet for Page::m_activityStateChangeObservers
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsWidthIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/WidthIterator.cpp (280101 => 280102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/WidthIterator.cpp 2021-07-20 20:39:35 UTC (rev 280101)
+++ trunk/Source/WebCore/platform/graphics/WidthIterator.cpp    2021-07-20 20:40:10 UTC (rev 280102)
</span><span class="lines">@@ -233,16 +233,15 @@
</span><span class="cx">             currentCharacterIndex = textIterator.currentIndex();
</span><span class="cx">             continue;
</span><span class="cx">         }
</span><del>-        const Font* font = glyphData.font ? glyphData.font : &m_font.primaryFont();
-        ASSERT(font);
</del><ins>+        const Font& font = glyphData.font ? *glyphData.font : primaryFont;
</ins><span class="cx"> 
</span><span class="cx">         previousWidth = width;
</span><del>-        width = font->widthForGlyph(glyph);
</del><ins>+        width = font.widthForGlyph(glyph);
</ins><span class="cx"> 
</span><del>-        if (font != lastFontData) {
</del><ins>+        if (&font != lastFontData) {
</ins><span class="cx">             commitCurrentFontRange(glyphBuffer, lastGlyphCount, currentCharacterIndex, *lastFontData, primaryFont, character, widthOfCurrentFontRange, charactersTreatedAsSpace);
</span><span class="cx">             lastGlyphCount = glyphBuffer.size();
</span><del>-            lastFontData = font;
</del><ins>+            lastFontData = &font;
</ins><span class="cx">             widthOfCurrentFontRange = width;
</span><span class="cx">         } else
</span><span class="cx">             widthOfCurrentFontRange += width;
</span><span class="lines">@@ -257,7 +256,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if (m_accountForGlyphBounds) {
</span><del>-            bounds = font->boundsForGlyph(glyph);
</del><ins>+            bounds = font.boundsForGlyph(glyph);
</ins><span class="cx">             if (!currentCharacterIndex)
</span><span class="cx">                 m_firstGlyphOverflow = std::max<float>(0, -bounds.x());
</span><span class="cx">         }
</span><span class="lines">@@ -265,7 +264,7 @@
</span><span class="cx">         if (m_forTextEmphasis && !FontCascade::canReceiveTextEmphasis(character))
</span><span class="cx">             glyph = 0;
</span><span class="cx"> 
</span><del>-        glyphBuffer.add(glyph, *font, width, currentCharacterIndex);
</del><ins>+        glyphBuffer.add(glyph, font, width, currentCharacterIndex);
</ins><span class="cx"> #if USE(CTFONTSHAPEGLYPHS)
</span><span class="cx">         // These 0 glyphs are needed by shapers if the source text has surrogate pairs.
</span><span class="cx">         // However, CTFontTransformGlyphs() can't delete these 0 glyphs from the shaped text,
</span><span class="lines">@@ -272,7 +271,7 @@
</span><span class="cx">         // so we shouldn't add them in the first place if we're using that shaping routine.
</span><span class="cx">         // Any other shaping routine should delete these glyphs from the shaped text.
</span><span class="cx">         if (!U_IS_BMP(character))
</span><del>-            glyphBuffer.add(0, *font, 0, currentCharacterIndex + 1);
</del><ins>+            glyphBuffer.add(0, font, 0, currentCharacterIndex + 1);
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">         // Advance past the character we just dealt with.
</span></span></pre>
</div>
</div>

</body>
</html>