<!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>[205771] 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/205771">205771</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-09-09 14:54:31 -0700 (Fri, 09 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unused member of GlyphBuffer
https://bugs.webkit.org/show_bug.cgi?id=161814
Reviewed by Simon Fraser.
This m_offsets member never actually affected anything. It just made
FontCascade::drawGlyphBuffer() slower.
No new tests because there is no behavior change.
* platform/graphics/FontCascade.cpp:
(WebCore::FontCascade::drawGlyphBuffer):
* platform/graphics/GlyphBuffer.h:
(WebCore::GlyphBuffer::clear):
(WebCore::GlyphBuffer::advanceAt):
(WebCore::GlyphBuffer::add):
(WebCore::GlyphBuffer::shrink):
(WebCore::GlyphBuffer::swap):
(WebCore::GlyphBuffer::offsetAt): Deleted.
* platform/graphics/win/UniscribeController.cpp:
(WebCore::UniscribeController::shapeAndPlaceItem):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadecpp">trunk/Source/WebCore/platform/graphics/FontCascade.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGlyphBufferh">trunk/Source/WebCore/platform/graphics/GlyphBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinUniscribeControllercpp">trunk/Source/WebCore/platform/graphics/win/UniscribeController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205770 => 205771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-09 21:44:55 UTC (rev 205770)
+++ trunk/Source/WebCore/ChangeLog 2016-09-09 21:54:31 UTC (rev 205771)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-09-09 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Remove unused member of GlyphBuffer
+ https://bugs.webkit.org/show_bug.cgi?id=161814
+
+ Reviewed by Simon Fraser.
+
+ This m_offsets member never actually affected anything. It just made
+ FontCascade::drawGlyphBuffer() slower.
+
+ No new tests because there is no behavior change.
+
+ * platform/graphics/FontCascade.cpp:
+ (WebCore::FontCascade::drawGlyphBuffer):
+ * platform/graphics/GlyphBuffer.h:
+ (WebCore::GlyphBuffer::clear):
+ (WebCore::GlyphBuffer::advanceAt):
+ (WebCore::GlyphBuffer::add):
+ (WebCore::GlyphBuffer::shrink):
+ (WebCore::GlyphBuffer::swap):
+ (WebCore::GlyphBuffer::offsetAt): Deleted.
+ * platform/graphics/win/UniscribeController.cpp:
+ (WebCore::UniscribeController::shapeAndPlaceItem):
+
</ins><span class="cx"> 2016-09-09 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Text replacement candidates don't always overwrite the entire original string
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (205770 => 205771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2016-09-09 21:44:55 UTC (rev 205770)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2016-09-09 21:54:31 UTC (rev 205771)
</span><span class="lines">@@ -1284,7 +1284,6 @@
</span><span class="cx"> {
</span><span class="cx"> // Draw each contiguous run of glyphs that use the same font data.
</span><span class="cx"> const Font* fontData = glyphBuffer.fontAt(0);
</span><del>- FloatSize offset = glyphBuffer.offsetAt(0);
</del><span class="cx"> FloatPoint startPoint(point.x(), point.y() - glyphBuffer.initialAdvance().height());
</span><span class="cx"> float nextX = startPoint.x() + glyphBuffer.advanceAt(0).width();
</span><span class="cx"> float nextY = startPoint.y() + glyphBuffer.advanceAt(0).height();
</span><span class="lines">@@ -1292,14 +1291,12 @@
</span><span class="cx"> unsigned nextGlyph = 1;
</span><span class="cx"> while (nextGlyph < glyphBuffer.size()) {
</span><span class="cx"> const Font* nextFontData = glyphBuffer.fontAt(nextGlyph);
</span><del>- FloatSize nextOffset = glyphBuffer.offsetAt(nextGlyph);
</del><span class="cx">
</span><del>- if (nextFontData != fontData || nextOffset != offset) {
</del><ins>+ if (nextFontData != fontData) {
</ins><span class="cx"> context.drawGlyphs(*this, *fontData, glyphBuffer, lastFrom, nextGlyph - lastFrom, startPoint);
</span><span class="cx">
</span><span class="cx"> lastFrom = nextGlyph;
</span><span class="cx"> fontData = nextFontData;
</span><del>- offset = nextOffset;
</del><span class="cx"> startPoint.setX(nextX);
</span><span class="cx"> startPoint.setY(nextY);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGlyphBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GlyphBuffer.h (205770 => 205771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GlyphBuffer.h 2016-09-09 21:44:55 UTC (rev 205770)
+++ trunk/Source/WebCore/platform/graphics/GlyphBuffer.h 2016-09-09 21:54:31 UTC (rev 205771)
</span><span class="lines">@@ -87,9 +87,6 @@
</span><span class="cx"> m_advances.clear();
</span><span class="cx"> if (m_offsetsInString)
</span><span class="cx"> m_offsetsInString->clear();
</span><del>-#if PLATFORM(WIN)
- m_offsets.clear();
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GlyphBufferGlyph* glyphs(unsigned from) { return m_glyphs.data() + from; }
</span><span class="lines">@@ -118,19 +115,9 @@
</span><span class="cx"> {
</span><span class="cx"> return m_advances[index];
</span><span class="cx"> }
</span><del>-
- FloatSize offsetAt(unsigned index) const
- {
-#if PLATFORM(WIN)
- return m_offsets[index];
-#else
- UNUSED_PARAM(index);
- return FloatSize();
-#endif
- }
</del><span class="cx">
</span><span class="cx"> static const unsigned noOffset = UINT_MAX;
</span><del>- void add(Glyph glyph, const Font* font, float width, unsigned offsetInString = noOffset, const FloatSize* offset = 0)
</del><ins>+ void add(Glyph glyph, const Font* font, float width, unsigned offsetInString = noOffset)
</ins><span class="cx"> {
</span><span class="cx"> m_font.append(font);
</span><span class="cx">
</span><span class="lines">@@ -148,15 +135,6 @@
</span><span class="cx"> #else
</span><span class="cx"> m_advances.append(FloatSize(width, 0));
</span><span class="cx"> #endif
</span><del>-
-#if PLATFORM(WIN)
- if (offset)
- m_offsets.append(*offset);
- else
- m_offsets.append(FloatSize());
-#else
- UNUSED_PARAM(offset);
-#endif
</del><span class="cx">
</span><span class="cx"> if (offsetInString != noOffset && m_offsetsInString)
</span><span class="cx"> m_offsetsInString->append(offsetInString);
</span><span class="lines">@@ -212,9 +190,6 @@
</span><span class="cx"> m_advances.shrink(truncationPoint);
</span><span class="cx"> if (m_offsetsInString)
</span><span class="cx"> m_offsetsInString->shrink(truncationPoint);
</span><del>-#if PLATFORM(WIN)
- m_offsets.shrink(truncationPoint);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -231,12 +206,6 @@
</span><span class="cx"> GlyphBufferAdvance s = m_advances[index1];
</span><span class="cx"> m_advances[index1] = m_advances[index2];
</span><span class="cx"> m_advances[index2] = s;
</span><del>-
-#if PLATFORM(WIN)
- FloatSize offset = m_offsets[index1];
- m_offsets[index1] = m_offsets[index2];
- m_offsets[index2] = offset;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<const Font*, 2048> m_font;
</span><span class="lines">@@ -244,9 +213,6 @@
</span><span class="cx"> Vector<GlyphBufferAdvance, 2048> m_advances;
</span><span class="cx"> GlyphBufferAdvance m_initialAdvance;
</span><span class="cx"> std::unique_ptr<Vector<unsigned, 2048>> m_offsetsInString;
</span><del>-#if PLATFORM(WIN)
- Vector<FloatSize, 2048> m_offsets;
-#endif
</del><span class="cx"> float m_leadingExpansion;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinUniscribeControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/UniscribeController.cpp (205770 => 205771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/UniscribeController.cpp 2016-09-09 21:44:55 UTC (rev 205770)
+++ trunk/Source/WebCore/platform/graphics/win/UniscribeController.cpp 2016-09-09 21:54:31 UTC (rev 205771)
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx"> // translation.
</span><span class="cx"> if (glyphBuffer) {
</span><span class="cx"> FloatSize size(offsetX, -offsetY);
</span><del>- glyphBuffer->add(glyph, fontData, advance, GlyphBuffer::noOffset, &size);
</del><ins>+ glyphBuffer->add(glyph, fontData, advance, GlyphBuffer::noOffset);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatRect glyphBounds = fontData->boundsForGlyph(glyph);
</span></span></pre>
</div>
</div>
</body>
</html>