<!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>[162150] 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/162150">162150</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-01-16 13:56:26 -0800 (Thu, 16 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Draw all underline segments in a particular run in the same call
https://bugs.webkit.org/show_bug.cgi?id=127082
Reviewed by Simon Fraser.
Instead of running CGContextFillRect() in a loop, we can instead call CGContextFillRects()
In my tests, this seems to have about 0.5% speedup.
This patch creates some redundant code, but I think that refactoring would make the code
much less readable. I also am hesitant to make drawLineForText call drawLinesForText because
of the overhead of the vector that would be needed.
As there is no behavior change, no new tests are necessary
* platform/graphics/GraphicsContext.h:
* platform/graphics/cairo/GraphicsContextCairo.cpp:
(WebCore::GraphicsContext::drawLinesForText):
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::GraphicsContext::platformInit):
* platform/graphics/wince/GraphicsContextWinCE.cpp:
(WebCore::GraphicsContext::drawLinesForText):
* rendering/InlineTextBox.cpp:
(WebCore::drawSkipInkUnderline):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContexth">trunk/Source/WebCore/platform/graphics/GraphicsContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp">trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp">trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinceGraphicsContextWinCEcpp">trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162149 => 162150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-16 21:52:44 UTC (rev 162149)
+++ trunk/Source/WebCore/ChangeLog 2014-01-16 21:56:26 UTC (rev 162150)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-01-15 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Draw all underline segments in a particular run in the same call
+ https://bugs.webkit.org/show_bug.cgi?id=127082
+
+ Reviewed by Simon Fraser.
+
+ Instead of running CGContextFillRect() in a loop, we can instead call CGContextFillRects()
+
+ In my tests, this seems to have about 0.5% speedup.
+
+ This patch creates some redundant code, but I think that refactoring would make the code
+ much less readable. I also am hesitant to make drawLineForText call drawLinesForText because
+ of the overhead of the vector that would be needed.
+
+ As there is no behavior change, no new tests are necessary
+
+ * platform/graphics/GraphicsContext.h:
+ * platform/graphics/cairo/GraphicsContextCairo.cpp:
+ (WebCore::GraphicsContext::drawLinesForText):
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::GraphicsContext::platformInit):
+ * platform/graphics/wince/GraphicsContextWinCE.cpp:
+ (WebCore::GraphicsContext::drawLinesForText):
+ * rendering/InlineTextBox.cpp:
+ (WebCore::drawSkipInkUnderline):
+
</ins><span class="cx"> 2014-01-16 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Use KeyedCoding as a persistent storage mechanism for blobs
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (162149 => 162150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2014-01-16 21:52:44 UTC (rev 162149)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2014-01-16 21:56:26 UTC (rev 162150)
</span><span class="lines">@@ -371,6 +371,7 @@
</span><span class="cx">
</span><span class="cx"> FloatRect computeLineBoundsForText(const FloatPoint&, float width, bool printing);
</span><span class="cx"> void drawLineForText(const FloatPoint&, float width, bool printing);
</span><ins>+ void drawLinesForText(const FloatPoint&, const DashArray& widths, bool printing);
</ins><span class="cx"> enum DocumentMarkerLineStyle {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> TextCheckingDictationPhraseWithAlternativesLineStyle,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (162149 => 162150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2014-01-16 21:52:44 UTC (rev 162149)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2014-01-16 21:56:26 UTC (rev 162150)
</span><span class="lines">@@ -641,6 +641,12 @@
</span><span class="cx"> cairo_restore(cairoContext);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void GraphicsContext::drawLinesForText(const FloatPoint& point, const DashArray& widths, bool printing)
+{
+ for (size_t i = 0; i < widths.size(); i += 2)
+ drawLineForText(FloatPoint(point.x() + widths[i], point.y()), widths[i+1] - widths[i], printing);
+}
+
</ins><span class="cx"> void GraphicsContext::updateDocumentMarkerResources()
</span><span class="cx"> {
</span><span class="cx"> // Unnecessary, since our document markers don't use resources.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (162149 => 162150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-01-16 21:52:44 UTC (rev 162149)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-01-16 21:56:26 UTC (rev 162150)
</span><span class="lines">@@ -1455,10 +1455,11 @@
</span><span class="cx"> if (restoreAntialiasMode)
</span><span class="cx"> CGContextSetShouldAntialias(platformContext(), shouldAntialiasLine);
</span><span class="cx">
</span><del>- if (fillColor() != strokeColor())
</del><ins>+ bool fillColorIsNotEqualToStrokeColor = fillColor() != strokeColor();
+ if (fillColorIsNotEqualToStrokeColor)
</ins><span class="cx"> setCGFillColor(platformContext(), strokeColor(), strokeColorSpace());
</span><span class="cx"> CGContextFillRect(platformContext(), bounds);
</span><del>- if (fillColor() != strokeColor())
</del><ins>+ if (fillColorIsNotEqualToStrokeColor)
</ins><span class="cx"> setCGFillColor(platformContext(), fillColor(), fillColorSpace());
</span><span class="cx"> CGContextSetShouldAntialias(platformContext(), savedShouldAntialias);
</span><span class="cx">
</span><span class="lines">@@ -1481,6 +1482,63 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void GraphicsContext::drawLinesForText(const FloatPoint& point, const DashArray& widths, bool printing)
+{
+ if (paintingDisabled())
+ return;
+
+ if (widths.size() <= 0)
+ return;
+
+#if !PLATFORM(IOS)
+ bool shouldAntialiasLine;
+ FloatRect bounds = computeLineBoundsAndAntialiasingModeForText(*this, point, widths.last(), printing, shouldAntialiasLine);
+
+ Vector<CGRect, 4> dashBounds;
+ ASSERT(!(widths.size() % 2));
+ dashBounds.reserveInitialCapacity(dashBounds.size() / 2);
+ for (size_t i = 0; i < widths.size(); i += 2)
+ dashBounds.append(CGRectMake(bounds.x() + widths[i], bounds.y(), widths[i+1] - widths[i], bounds.height()));
+
+ bool savedShouldAntialias = shouldAntialias();
+ bool restoreAntialiasMode = savedShouldAntialias != shouldAntialiasLine;
+
+ if (restoreAntialiasMode)
+ CGContextSetShouldAntialias(platformContext(), shouldAntialiasLine);
+
+ bool fillColorIsNotEqualToStrokeColor = fillColor() != strokeColor();
+ if (fillColorIsNotEqualToStrokeColor)
+ setCGFillColor(platformContext(), strokeColor(), strokeColorSpace());
+ CGContextFillRects(platformContext(), dashBounds.data(), dashBounds.size());
+ if (fillColorIsNotEqualToStrokeColor)
+ setCGFillColor(platformContext(), fillColor(), fillColorSpace());
+ CGContextSetShouldAntialias(platformContext(), savedShouldAntialias);
+
+ if (restoreAntialiasMode)
+ CGContextSetShouldAntialias(platformContext(), true);
+#else
+ CGContextRef context = platformContext();
+ CGContextSaveGState(context);
+
+ Color color(strokeColor());
+
+ bool shouldAntialiasLine;
+ FloatRect rect = computeLineBoundsAndAntialiasingModeForText(*this, point, width, printing, shouldAntialiasLine, color);
+
+ Vector<CGRect, 4> dashBounds;
+ ASSERT(!(widths.size() % 2));
+ dashBounds.reserveInitialCapacity(dashBounds.size() / 2);
+ for (size_t i = 0; i < widths.size(); i += 2)
+ dashBounds.append(CGRectMake(rect.x() + widths[i], rect.y(), widths[i+1] - widths[i], rect.height()));
+
+ if (m_state.shouldUseContextColors)
+ setCGFillColor(context, color, strokeColorSpace());
+ CGContextFillRects(context, dashBounds.data(), dashBounds.size());
+
+ CGContextRestoreGState(context);
+#endif
+}
+
</ins><span class="cx"> void GraphicsContext::setURLForRect(const URL& link, const IntRect& destRect)
</span><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinceGraphicsContextWinCEcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp (162149 => 162150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp 2014-01-16 21:52:44 UTC (rev 162149)
+++ trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp 2014-01-16 21:56:26 UTC (rev 162150)
</span><span class="lines">@@ -966,6 +966,12 @@
</span><span class="cx"> setStrokeStyle(oldStyle);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void GraphicsContext::drawLinesForText(const FloatPoint& point, const DashArray& widths, bool printing)
+{
+ for (size_t i = 0; i < widths.size(); i += 2)
+ drawLineForText(FloatPoint(point.x() + widths[i], point.y()), widths[i+1] - widths[i], printing);
+}
+
</ins><span class="cx"> void GraphicsContext::updateDocumentMarkerResources()
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (162149 => 162150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2014-01-16 21:52:44 UTC (rev 162149)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2014-01-16 21:56:26 UTC (rev 162150)
</span><span class="lines">@@ -127,8 +127,7 @@
</span><span class="cx"> DashArray a = translateIntersectionPointsToSkipInkBoundaries(intersections, underlineBoundingBox.height(), width);
</span><span class="cx">
</span><span class="cx"> ASSERT(!(a.size() % 2));
</span><del>- for (auto i = a.begin(); i != a.end(); i++, i++)
- context.drawLineForText(FloatPoint(localOrigin.x() + *i, localOrigin.y() + underlineOffset), *(i+1) - *i, isPrinting);
</del><ins>+ context.drawLinesForText(adjustedLocalOrigin, a, isPrinting);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>