<!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>[213522] 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/213522">213522</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2017-03-07 09:33:45 -0800 (Tue, 07 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>ShadowBlur::calculateLayerBoundingRect doesn't need to return the enclosingIntRect of layerRect
https://bugs.webkit.org/show_bug.cgi?id=168650
Patch by Fujii Hironori <Hironori.Fujii@sony.com> on 2017-03-07
Reviewed by Simon Fraser.
No new tests, no behavior change.
* platform/graphics/ShadowBlur.h: Change the type of return value
from IntRect to IntSize.
* platform/graphics/ShadowBlur.cpp:
(WebCore::ShadowBlur::calculateLayerBoundingRect): Ditto.
(WebCore::ShadowBlur::drawRectShadow): Rename a variable layerRect layerSize.
(WebCore::ShadowBlur::drawInsetShadow): Ditto.
(WebCore::ShadowBlur::drawRectShadowWithoutTiling): Ditto.
(WebCore::ShadowBlur::drawInsetShadowWithoutTiling): Ditto.
(WebCore::ShadowBlur::beginShadowLayer): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsShadowBlurcpp">trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsShadowBlurh">trunk/Source/WebCore/platform/graphics/ShadowBlur.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213521 => 213522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-07 17:22:35 UTC (rev 213521)
+++ trunk/Source/WebCore/ChangeLog 2017-03-07 17:33:45 UTC (rev 213522)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-03-07 Fujii Hironori <Hironori.Fujii@sony.com>
+
+ ShadowBlur::calculateLayerBoundingRect doesn't need to return the enclosingIntRect of layerRect
+ https://bugs.webkit.org/show_bug.cgi?id=168650
+
+ Reviewed by Simon Fraser.
+
+ No new tests, no behavior change.
+
+ * platform/graphics/ShadowBlur.h: Change the type of return value
+ from IntRect to IntSize.
+ * platform/graphics/ShadowBlur.cpp:
+ (WebCore::ShadowBlur::calculateLayerBoundingRect): Ditto.
+ (WebCore::ShadowBlur::drawRectShadow): Rename a variable layerRect layerSize.
+ (WebCore::ShadowBlur::drawInsetShadow): Ditto.
+ (WebCore::ShadowBlur::drawRectShadowWithoutTiling): Ditto.
+ (WebCore::ShadowBlur::drawInsetShadowWithoutTiling): Ditto.
+ (WebCore::ShadowBlur::beginShadowLayer): Ditto.
+
</ins><span class="cx"> 2017-03-07 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Replace debug assertion with release one in Frame::setView()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsShadowBlurcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp (213521 => 213522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp 2017-03-07 17:22:35 UTC (rev 213521)
+++ trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp 2017-03-07 17:33:45 UTC (rev 213522)
</span><span class="lines">@@ -388,7 +388,7 @@
</span><span class="cx"> return edgeSize;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect ShadowBlur::calculateLayerBoundingRect(GraphicsContext& context, const FloatRect& shadowedRect, const IntRect& clipRect)
</del><ins>+IntSize ShadowBlur::calculateLayerBoundingRect(GraphicsContext& context, const FloatRect& shadowedRect, const IntRect& clipRect)
</ins><span class="cx"> {
</span><span class="cx"> IntSize edgeSize = blurredEdgeSize();
</span><span class="cx">
</span><span class="lines">@@ -418,7 +418,7 @@
</span><span class="cx"> if (!clipRect.contains(enclosingIntRect(layerRect))) {
</span><span class="cx"> // If we are totally outside the clip region, we aren't painting at all.
</span><span class="cx"> if (intersection(layerRect, clipRect).isEmpty())
</span><del>- return IntRect();
</del><ins>+ return IntSize();
</ins><span class="cx">
</span><span class="cx"> IntRect inflatedClip = clipRect;
</span><span class="cx"> // Pixels at the edges can be affected by pixels outside the buffer,
</span><span class="lines">@@ -451,7 +451,7 @@
</span><span class="cx"> float translationY = -shadowedRect.y() + inflation.height() - fabsf(clippedOut.height());
</span><span class="cx"> m_layerContextTranslation = FloatSize(translationX, translationY);
</span><span class="cx">
</span><del>- return enclosingIntRect(layerRect);
</del><ins>+ return expandedIntSize(layerRect.size());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ShadowBlur::drawShadowBuffer(GraphicsContext& graphicsContext)
</span><span class="lines">@@ -503,8 +503,8 @@
</span><span class="cx">
</span><span class="cx"> void ShadowBlur::drawRectShadow(GraphicsContext& graphicsContext, const FloatRoundedRect& shadowedRect)
</span><span class="cx"> {
</span><del>- IntRect layerRect = calculateLayerBoundingRect(graphicsContext, shadowedRect.rect(), graphicsContext.clipBounds());
- if (layerRect.isEmpty())
</del><ins>+ IntSize layerSize = calculateLayerBoundingRect(graphicsContext, shadowedRect.rect(), graphicsContext.clipBounds());
+ if (layerSize.isEmpty())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> adjustBlurRadius(graphicsContext);
</span><span class="lines">@@ -512,7 +512,7 @@
</span><span class="cx"> // drawRectShadowWithTiling does not work with rotations.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=45042
</span><span class="cx"> if (!graphicsContext.getCTM().preservesAxisAlignment() || m_type != BlurShadow) {
</span><del>- drawRectShadowWithoutTiling(graphicsContext, shadowedRect, layerRect);
</del><ins>+ drawRectShadowWithoutTiling(graphicsContext, shadowedRect, layerSize);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -522,7 +522,7 @@
</span><span class="cx">
</span><span class="cx"> if (templateSize.width() > rect.width() || templateSize.height() > rect.height()
</span><span class="cx"> || (templateSize.width() * templateSize.height() > m_sourceRect.width() * m_sourceRect.height())) {
</span><del>- drawRectShadowWithoutTiling(graphicsContext, shadowedRect, layerRect);
</del><ins>+ drawRectShadowWithoutTiling(graphicsContext, shadowedRect, layerSize);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -531,8 +531,8 @@
</span><span class="cx">
</span><span class="cx"> void ShadowBlur::drawInsetShadow(GraphicsContext& graphicsContext, const FloatRect& rect, const FloatRoundedRect& holeRect)
</span><span class="cx"> {
</span><del>- IntRect layerRect = calculateLayerBoundingRect(graphicsContext, rect, graphicsContext.clipBounds());
- if (layerRect.isEmpty())
</del><ins>+ IntSize layerSize = calculateLayerBoundingRect(graphicsContext, rect, graphicsContext.clipBounds());
+ if (layerSize.isEmpty())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> adjustBlurRadius(graphicsContext);
</span><span class="lines">@@ -540,7 +540,7 @@
</span><span class="cx"> // drawInsetShadowWithTiling does not work with rotations.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=45042
</span><span class="cx"> if (!graphicsContext.getCTM().preservesAxisAlignment() || m_type != BlurShadow) {
</span><del>- drawInsetShadowWithoutTiling(graphicsContext, rect, holeRect, layerRect);
</del><ins>+ drawInsetShadowWithoutTiling(graphicsContext, rect, holeRect, layerSize);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -550,7 +550,7 @@
</span><span class="cx">
</span><span class="cx"> if (templateSize.width() > hRect.width() || templateSize.height() > hRect.height()
</span><span class="cx"> || (templateSize.width() * templateSize.height() > hRect.width() * hRect.height())) {
</span><del>- drawInsetShadowWithoutTiling(graphicsContext, rect, holeRect, layerRect);
</del><ins>+ drawInsetShadowWithoutTiling(graphicsContext, rect, holeRect, layerSize);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -557,9 +557,9 @@
</span><span class="cx"> drawInsetShadowWithTiling(graphicsContext, rect, holeRect, templateSize, edgeSize);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ShadowBlur::drawRectShadowWithoutTiling(GraphicsContext& graphicsContext, const FloatRoundedRect& shadowedRect, const IntRect& layerRect)
</del><ins>+void ShadowBlur::drawRectShadowWithoutTiling(GraphicsContext& graphicsContext, const FloatRoundedRect& shadowedRect, const IntSize& layerSize)
</ins><span class="cx"> {
</span><del>- m_layerImage = ScratchBuffer::singleton().getScratchBuffer(layerRect.size());
</del><ins>+ m_layerImage = ScratchBuffer::singleton().getScratchBuffer(layerSize);
</ins><span class="cx"> if (!m_layerImage)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -584,7 +584,7 @@
</span><span class="cx"> shadowContext.fillPath(path);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- blurShadowBuffer(expandedIntSize(m_layerSize));
</del><ins>+ blurShadowBuffer(layerSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> drawShadowBuffer(graphicsContext);
</span><span class="lines">@@ -592,9 +592,9 @@
</span><span class="cx"> ScratchBuffer::singleton().scheduleScratchBufferPurge();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ShadowBlur::drawInsetShadowWithoutTiling(GraphicsContext& graphicsContext, const FloatRect& rect, const FloatRoundedRect& holeRect, const IntRect& layerRect)
</del><ins>+void ShadowBlur::drawInsetShadowWithoutTiling(GraphicsContext& graphicsContext, const FloatRect& rect, const FloatRoundedRect& holeRect, const IntSize& layerSize)
</ins><span class="cx"> {
</span><del>- m_layerImage = ScratchBuffer::singleton().getScratchBuffer(layerRect.size());
</del><ins>+ m_layerImage = ScratchBuffer::singleton().getScratchBuffer(layerSize);
</ins><span class="cx"> if (!m_layerImage)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -625,7 +625,7 @@
</span><span class="cx"> shadowContext.setFillColor(Color::black);
</span><span class="cx"> shadowContext.fillPath(path);
</span><span class="cx">
</span><del>- blurShadowBuffer(expandedIntSize(m_layerSize));
</del><ins>+ blurShadowBuffer(layerSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> drawShadowBuffer(graphicsContext);
</span><span class="lines">@@ -881,9 +881,9 @@
</span><span class="cx"> {
</span><span class="cx"> adjustBlurRadius(context);
</span><span class="cx">
</span><del>- IntRect layerRect = calculateLayerBoundingRect(context, layerArea, context.clipBounds());
</del><ins>+ IntSize layerSize = calculateLayerBoundingRect(context, layerArea, context.clipBounds());
</ins><span class="cx">
</span><del>- if (layerRect.isEmpty())
</del><ins>+ if (layerSize.isEmpty())
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> // We reset the scratch buffer values here, because the buffer will no longer contain
</span><span class="lines">@@ -890,7 +890,7 @@
</span><span class="cx"> // data from any previous rectangle or inset shadows drawn via the tiling path.
</span><span class="cx"> auto& scratchBuffer = ScratchBuffer::singleton();
</span><span class="cx"> scratchBuffer.setCachedShadowValues(FloatSize(), Color::black, IntRect(), FloatRoundedRect::Radii(), m_layerSize);
</span><del>- m_layerImage = scratchBuffer.getScratchBuffer(layerRect.size());
</del><ins>+ m_layerImage = scratchBuffer.getScratchBuffer(layerSize);
</ins><span class="cx">
</span><span class="cx"> GraphicsContext& shadowContext = m_layerImage->context();
</span><span class="cx"> shadowContext.save();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsShadowBlurh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ShadowBlur.h (213521 => 213522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ShadowBlur.h 2017-03-07 17:22:35 UTC (rev 213521)
+++ trunk/Source/WebCore/platform/graphics/ShadowBlur.h 2017-03-07 17:33:45 UTC (rev 213522)
</span><span class="lines">@@ -83,13 +83,13 @@
</span><span class="cx"> InnerShadow
</span><span class="cx"> };
</span><span class="cx">
</span><del>- IntRect calculateLayerBoundingRect(GraphicsContext&, const FloatRect& layerArea, const IntRect& clipRect);
</del><ins>+ IntSize calculateLayerBoundingRect(GraphicsContext&, const FloatRect& layerArea, const IntRect& clipRect);
</ins><span class="cx"> IntSize templateSize(const IntSize& blurredEdgeSize, const FloatRoundedRect::Radii&) const;
</span><span class="cx">
</span><del>- void drawRectShadowWithoutTiling(GraphicsContext&, const FloatRoundedRect&, const IntRect& layerRect);
</del><ins>+ void drawRectShadowWithoutTiling(GraphicsContext&, const FloatRoundedRect&, const IntSize& layerSize);
</ins><span class="cx"> void drawRectShadowWithTiling(GraphicsContext&, const FloatRoundedRect&, const IntSize& shadowTemplateSize, const IntSize& blurredEdgeSize);
</span><span class="cx">
</span><del>- void drawInsetShadowWithoutTiling(GraphicsContext&, const FloatRect&, const FloatRoundedRect& holeRect, const IntRect& layerRect);
</del><ins>+ void drawInsetShadowWithoutTiling(GraphicsContext&, const FloatRect&, const FloatRoundedRect& holeRect, const IntSize& layerSize);
</ins><span class="cx"> void drawInsetShadowWithTiling(GraphicsContext&, const FloatRect&, const FloatRoundedRect& holeRect, const IntSize& shadowTemplateSize, const IntSize& blurredEdgeSize);
</span><span class="cx">
</span><span class="cx"> void drawLayerPieces(GraphicsContext&, const FloatRect& shadowBounds, const FloatRoundedRect::Radii&, const IntSize& roundedRadius, const IntSize& templateSize, ShadowDirection);
</span></span></pre>
</div>
</div>
</body>
</html>