<!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>[180581] 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/180581">180581</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-02-24 13:33:51 -0800 (Tue, 24 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>RenderBoxModelObject::calculateBackgroundImageGeometry should return BackgroundImageGeometry.
https://bugs.webkit.org/show_bug.cgi?id=141979
Reviewed by Simon Fraser.
No change in functionality.
* rendering/RenderBox.cpp:
(WebCore::RenderBox::getBackgroundPaintedExtent):
(WebCore::RenderBox::maskClipRect):
(WebCore::RenderBox::repaintLayerRectsForImage):
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintFillLayerExtended):
(WebCore::RenderBoxModelObject::calculateBackgroundImageGeometry):
(WebCore::RenderBoxModelObject::getGeometryForBackgroundImage):
* rendering/RenderBoxModelObject.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjecth">trunk/Source/WebCore/rendering/RenderBoxModelObject.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180580 => 180581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-24 20:42:41 UTC (rev 180580)
+++ trunk/Source/WebCore/ChangeLog 2015-02-24 21:33:51 UTC (rev 180581)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-02-24 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><ins>+ RenderBoxModelObject::calculateBackgroundImageGeometry should return BackgroundImageGeometry.
+ https://bugs.webkit.org/show_bug.cgi?id=141979
+
+ Reviewed by Simon Fraser.
+
+ No change in functionality.
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::getBackgroundPaintedExtent):
+ (WebCore::RenderBox::maskClipRect):
+ (WebCore::RenderBox::repaintLayerRectsForImage):
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::paintFillLayerExtended):
+ (WebCore::RenderBoxModelObject::calculateBackgroundImageGeometry):
+ (WebCore::RenderBoxModelObject::getGeometryForBackgroundImage):
+ * rendering/RenderBoxModelObject.h:
+
+2015-02-24 Zalan Bujtas <zalan@apple.com>
+
</ins><span class="cx"> Switch BackgroundImageGeometry's m_phase from LayoutPoint to LayoutSize.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=141972
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (180580 => 180581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2015-02-24 20:42:41 UTC (rev 180580)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2015-02-24 21:33:51 UTC (rev 180581)
</span><span class="lines">@@ -1342,8 +1342,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- BackgroundImageGeometry geometry;
- calculateBackgroundImageGeometry(0, style().backgroundLayers(), backgroundRect, geometry);
</del><ins>+ BackgroundImageGeometry geometry = calculateBackgroundImageGeometry(0, style().backgroundLayers(), backgroundRect);
</ins><span class="cx"> paintedExtent = geometry.destRect();
</span><span class="cx"> return !geometry.hasNonLocalGeometry();
</span><span class="cx"> }
</span><span class="lines">@@ -1555,9 +1554,8 @@
</span><span class="cx"> LayoutRect borderBox = borderBoxRect();
</span><span class="cx"> for (const FillLayer* maskLayer = style().maskLayers(); maskLayer; maskLayer = maskLayer->next()) {
</span><span class="cx"> if (maskLayer->maskImage()) {
</span><del>- BackgroundImageGeometry geometry;
</del><span class="cx"> // Masks should never have fixed attachment, so it's OK for paintContainer to be null.
</span><del>- calculateBackgroundImageGeometry(0, maskLayer, borderBox, geometry);
</del><ins>+ BackgroundImageGeometry geometry = calculateBackgroundImageGeometry(0, maskLayer, borderBox);
</ins><span class="cx"> result.unite(geometry.destRect());
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1683,8 +1681,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- BackgroundImageGeometry geometry;
- layerRenderer->calculateBackgroundImageGeometry(nullptr, curLayer, rendererRect, geometry);
</del><ins>+ BackgroundImageGeometry geometry = layerRenderer->calculateBackgroundImageGeometry(nullptr, curLayer, rendererRect);
</ins><span class="cx"> if (geometry.hasNonLocalGeometry()) {
</span><span class="cx"> // Rather than incur the costs of computing the paintContainer for renderers with fixed backgrounds
</span><span class="cx"> // in order to get the right destRect, just repaint the entire renderer.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (180580 => 180581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-02-24 20:42:41 UTC (rev 180580)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-02-24 21:33:51 UTC (rev 180581)
</span><span class="lines">@@ -842,8 +842,7 @@
</span><span class="cx">
</span><span class="cx"> // no progressive loading of the background image
</span><span class="cx"> if (!baseBgColorOnly && (shouldPaintBackgroundImage || bgLayer->hasMaskImage())) {
</span><del>- BackgroundImageGeometry geometry;
- calculateBackgroundImageGeometry(paintInfo.paintContainer, bgLayer, scrolledPaintRect, geometry, backgroundObject);
</del><ins>+ BackgroundImageGeometry geometry = calculateBackgroundImageGeometry(paintInfo.paintContainer, bgLayer, scrolledPaintRect, backgroundObject);
</ins><span class="cx"> geometry.clip(LayoutRect(pixelSnappedRect));
</span><span class="cx">
</span><span class="cx"> if (!geometry.destRect().isEmpty()) {
</span><span class="lines">@@ -1102,9 +1101,10 @@
</span><span class="cx"> geometry.setPhase(LayoutSize(pixelSnappedPhase));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBoxModelObject::calculateBackgroundImageGeometry(const RenderLayerModelObject* paintContainer, const FillLayer* fillLayer, const LayoutRect& paintRect,
- BackgroundImageGeometry& geometry, RenderElement* backgroundObject) const
</del><ins>+BackgroundImageGeometry RenderBoxModelObject::calculateBackgroundImageGeometry(const RenderLayerModelObject* paintContainer, const FillLayer* fillLayer, const LayoutRect& paintRect,
+ RenderElement* backgroundObject) const
</ins><span class="cx"> {
</span><ins>+ BackgroundImageGeometry geometry;
</ins><span class="cx"> LayoutUnit left = 0;
</span><span class="cx"> LayoutUnit top = 0;
</span><span class="cx"> LayoutSize positioningAreaSize;
</span><span class="lines">@@ -1249,14 +1249,14 @@
</span><span class="cx"> geometry.setDestOrigin(geometry.destRect().location());
</span><span class="cx">
</span><span class="cx"> pixelSnapBackgroundImageGeometryForPainting(geometry);
</span><ins>+ return geometry;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBoxModelObject::getGeometryForBackgroundImage(const RenderLayerModelObject* paintContainer, FloatRect& destRect, FloatSize& phase, FloatSize& tileSize) const
</span><span class="cx"> {
</span><span class="cx"> const FillLayer* backgroundLayer = style().backgroundLayers();
</span><del>- BackgroundImageGeometry geometry;
- LayoutRect paintRect = LayoutRect(destRect);
- calculateBackgroundImageGeometry(paintContainer, backgroundLayer, paintRect, geometry);
</del><ins>+ LayoutRect paintRect(destRect);
+ BackgroundImageGeometry geometry = calculateBackgroundImageGeometry(paintContainer, backgroundLayer, paintRect);
</ins><span class="cx"> phase = geometry.phase();
</span><span class="cx"> tileSize = geometry.tileSize();
</span><span class="cx"> destRect = geometry.destRect();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.h (180580 => 180581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2015-02-24 20:42:41 UTC (rev 180580)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2015-02-24 21:33:51 UTC (rev 180581)
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx"> LayoutPoint adjustedPositionRelativeToOffsetParent(const LayoutPoint&) const;
</span><span class="cx">
</span><span class="cx"> bool hasBoxDecorationStyle() const;
</span><del>- void calculateBackgroundImageGeometry(const RenderLayerModelObject* paintContainer, const FillLayer*, const LayoutRect& paintRect, BackgroundImageGeometry&, RenderElement* = 0) const;
</del><ins>+ BackgroundImageGeometry calculateBackgroundImageGeometry(const RenderLayerModelObject* paintContainer, const FillLayer*, const LayoutRect& paintRect, RenderElement* = 0) const;
</ins><span class="cx"> bool borderObscuresBackgroundEdge(const FloatSize& contextScale) const;
</span><span class="cx"> bool borderObscuresBackground() const;
</span><span class="cx"> RoundedRect backgroundRoundedRectAdjustedForBleedAvoidance(const GraphicsContext&, const LayoutRect&, BackgroundBleedAvoidance, InlineFlowBox*, const LayoutSize&, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const;
</span></span></pre>
</div>
</div>
</body>
</html>