<!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>[180586] 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/180586">180586</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-02-24 14:53:09 -0800 (Tue, 24 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pass FillLayer reference instead of pointer to RenderBoxModelObject::calculateBackgroundImageGeometry.
https://bugs.webkit.org/show_bug.cgi?id=141982
Reviewed by Simon Fraser.
There should always be a valid FillLayer.
No change in functionality.
* rendering/RenderBox.cpp:
(WebCore::RenderBox::getBackgroundPaintedExtent):
(WebCore::RenderBox::maskClipRect):
(WebCore::RenderBox::repaintLayerRectsForImage):
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintFillLayerExtended):
(WebCore::RenderBoxModelObject::calculateFillTileSize):
(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 (180585 => 180586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-24 22:40:30 UTC (rev 180585)
+++ trunk/Source/WebCore/ChangeLog 2015-02-24 22:53:09 UTC (rev 180586)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-02-24 Zalan Bujtas <zalan@apple.com>
+
+ Pass FillLayer reference instead of pointer to RenderBoxModelObject::calculateBackgroundImageGeometry.
+ https://bugs.webkit.org/show_bug.cgi?id=141982
+
+ Reviewed by Simon Fraser.
+
+ There should always be a valid FillLayer.
+
+ No change in functionality.
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::getBackgroundPaintedExtent):
+ (WebCore::RenderBox::maskClipRect):
+ (WebCore::RenderBox::repaintLayerRectsForImage):
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::paintFillLayerExtended):
+ (WebCore::RenderBoxModelObject::calculateFillTileSize):
+ (WebCore::RenderBoxModelObject::calculateBackgroundImageGeometry):
+ (WebCore::RenderBoxModelObject::getGeometryForBackgroundImage):
+ * rendering/RenderBoxModelObject.h:
+
</ins><span class="cx"> 2015-02-24 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS Media] Be specific about which document to use for the timeline background canvas
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (180585 => 180586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2015-02-24 22:40:30 UTC (rev 180585)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2015-02-24 22:53:09 UTC (rev 180586)
</span><span class="lines">@@ -1342,7 +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);
</del><ins>+ BackgroundImageGeometry geometry = calculateBackgroundImageGeometry(nullptr, *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,7 +1555,7 @@
</span><span class="cx"> for (const FillLayer* maskLayer = style().maskLayers(); maskLayer; maskLayer = maskLayer->next()) {
</span><span class="cx"> if (maskLayer->maskImage()) {
</span><span class="cx"> // Masks should never have fixed attachment, so it's OK for paintContainer to be null.
</span><del>- BackgroundImageGeometry geometry = calculateBackgroundImageGeometry(0, maskLayer, borderBox);
</del><ins>+ BackgroundImageGeometry geometry = calculateBackgroundImageGeometry(nullptr, *maskLayer, borderBox);
</ins><span class="cx"> result.unite(geometry.destRect());
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1681,7 +1681,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- BackgroundImageGeometry geometry = layerRenderer->calculateBackgroundImageGeometry(nullptr, curLayer, rendererRect);
</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 (180585 => 180586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-02-24 22:40:30 UTC (rev 180585)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-02-24 22:53:09 UTC (rev 180586)
</span><span class="lines">@@ -842,7 +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, 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">@@ -959,10 +959,10 @@
</span><span class="cx"> return positioningAreaSize;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LayoutSize RenderBoxModelObject::calculateFillTileSize(const FillLayer* fillLayer, const LayoutSize& positioningAreaSize) const
</del><ins>+LayoutSize RenderBoxModelObject::calculateFillTileSize(const FillLayer& fillLayer, const LayoutSize& positioningAreaSize) const
</ins><span class="cx"> {
</span><del>- StyleImage* image = fillLayer->image();
- EFillSizeType type = fillLayer->size().type;
</del><ins>+ StyleImage* image = fillLayer.image();
+ EFillSizeType type = fillLayer.size().type;
</ins><span class="cx">
</span><span class="cx"> LayoutSize imageIntrinsicSize;
</span><span class="cx"> if (image) {
</span><span class="lines">@@ -975,8 +975,8 @@
</span><span class="cx"> case SizeLength: {
</span><span class="cx"> LayoutSize tileSize = positioningAreaSize;
</span><span class="cx">
</span><del>- Length layerWidth = fillLayer->size().size.width();
- Length layerHeight = fillLayer->size().size.height();
</del><ins>+ Length layerWidth = fillLayer.size().size.width();
+ Length layerHeight = fillLayer.size().size.height();
</ins><span class="cx">
</span><span class="cx"> if (layerWidth.isFixed())
</span><span class="cx"> tileSize.setWidth(layerWidth.value());
</span><span class="lines">@@ -1093,7 +1093,7 @@
</span><span class="cx"> geometry.setPhase(LayoutSize(pixelSnappedPhase));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-BackgroundImageGeometry RenderBoxModelObject::calculateBackgroundImageGeometry(const RenderLayerModelObject* paintContainer, const FillLayer* fillLayer, const LayoutRect& paintRect,
</del><ins>+BackgroundImageGeometry RenderBoxModelObject::calculateBackgroundImageGeometry(const RenderLayerModelObject* paintContainer, const FillLayer& fillLayer, const LayoutRect& paintRect,
</ins><span class="cx"> RenderElement* backgroundObject) const
</span><span class="cx"> {
</span><span class="cx"> BackgroundImageGeometry geometry;
</span><span class="lines">@@ -1103,19 +1103,19 @@
</span><span class="cx"> // Determine the background positioning area and set destRect to the background painting area.
</span><span class="cx"> // destRect will be adjusted later if the background is non-repeating.
</span><span class="cx"> // FIXME: transforms spec says that fixed backgrounds behave like scroll inside transforms. https://bugs.webkit.org/show_bug.cgi?id=15679
</span><del>- bool fixedAttachment = fillLayer->attachment() == FixedBackgroundAttachment;
</del><ins>+ bool fixedAttachment = fillLayer.attachment() == FixedBackgroundAttachment;
</ins><span class="cx"> if (!fixedAttachment) {
</span><span class="cx"> geometry.setDestRect(paintRect);
</span><span class="cx">
</span><span class="cx"> LayoutUnit right = 0;
</span><span class="cx"> LayoutUnit bottom = 0;
</span><span class="cx"> // Scroll and Local.
</span><del>- if (fillLayer->origin() != BorderFillBox) {
</del><ins>+ if (fillLayer.origin() != BorderFillBox) {
</ins><span class="cx"> left = borderLeft();
</span><span class="cx"> right = borderRight();
</span><span class="cx"> top = borderTop();
</span><span class="cx"> bottom = borderBottom();
</span><del>- if (fillLayer->origin() == ContentFillBox) {
</del><ins>+ if (fillLayer.origin() == ContentFillBox) {
</ins><span class="cx"> left += paddingLeft();
</span><span class="cx"> right += paddingRight();
</span><span class="cx"> top += paddingTop();
</span><span class="lines">@@ -1160,20 +1160,20 @@
</span><span class="cx">
</span><span class="cx"> auto clientForBackgroundImage = backgroundObject ? backgroundObject : this;
</span><span class="cx"> LayoutSize fillTileSize = calculateFillTileSize(fillLayer, positioningAreaSize);
</span><del>- if (StyleImage* layerImage = fillLayer->image())
</del><ins>+ if (StyleImage* layerImage = fillLayer.image())
</ins><span class="cx"> layerImage->setContainerSizeForRenderer(clientForBackgroundImage, fillTileSize, style().effectiveZoom());
</span><span class="cx">
</span><span class="cx"> geometry.setTileSize(fillTileSize);
</span><span class="cx">
</span><del>- EFillRepeat backgroundRepeatX = fillLayer->repeatX();
- EFillRepeat backgroundRepeatY = fillLayer->repeatY();
</del><ins>+ EFillRepeat backgroundRepeatX = fillLayer.repeatX();
+ EFillRepeat backgroundRepeatY = fillLayer.repeatY();
</ins><span class="cx"> LayoutUnit availableWidth = positioningAreaSize.width() - geometry.tileSize().width();
</span><span class="cx"> LayoutUnit availableHeight = positioningAreaSize.height() - geometry.tileSize().height();
</span><span class="cx">
</span><del>- LayoutUnit computedXPosition = minimumValueForLength(fillLayer->xPosition(), availableWidth, false);
</del><ins>+ LayoutUnit computedXPosition = minimumValueForLength(fillLayer.xPosition(), availableWidth, false);
</ins><span class="cx"> if (backgroundRepeatX == RoundFill && positioningAreaSize.width() > 0 && fillTileSize.width() > 0) {
</span><span class="cx"> int numTiles = std::max(1, roundToInt(positioningAreaSize.width() / fillTileSize.width()));
</span><del>- if (fillLayer->size().size.height().isAuto() && backgroundRepeatY != RoundFill)
</del><ins>+ if (fillLayer.size().size.height().isAuto() && backgroundRepeatY != RoundFill)
</ins><span class="cx"> fillTileSize.setHeight(fillTileSize.height() * positioningAreaSize.width() / (numTiles * fillTileSize.width()));
</span><span class="cx">
</span><span class="cx"> fillTileSize.setWidth(positioningAreaSize.width() / numTiles);
</span><span class="lines">@@ -1182,10 +1182,10 @@
</span><span class="cx"> geometry.setSpaceSize(LayoutSize());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LayoutUnit computedYPosition = minimumValueForLength(fillLayer->yPosition(), availableHeight, false);
</del><ins>+ LayoutUnit computedYPosition = minimumValueForLength(fillLayer.yPosition(), availableHeight, false);
</ins><span class="cx"> if (backgroundRepeatY == RoundFill && positioningAreaSize.height() > 0 && fillTileSize.height() > 0) {
</span><span class="cx"> int numTiles = std::max(1, roundToInt(positioningAreaSize.height() / fillTileSize.height()));
</span><del>- if (fillLayer->size().size.width().isAuto() && backgroundRepeatX != RoundFill)
</del><ins>+ if (fillLayer.size().size.width().isAuto() && backgroundRepeatX != RoundFill)
</ins><span class="cx"> fillTileSize.setWidth(fillTileSize.width() * positioningAreaSize.height() / (numTiles * fillTileSize.height()));
</span><span class="cx">
</span><span class="cx"> fillTileSize.setHeight(positioningAreaSize.height() / numTiles);
</span><span class="lines">@@ -1209,7 +1209,7 @@
</span><span class="cx"> backgroundRepeatX = NoRepeatFill;
</span><span class="cx"> }
</span><span class="cx"> if (backgroundRepeatX == NoRepeatFill) {
</span><del>- LayoutUnit xOffset = fillLayer->backgroundXOrigin() == RightEdge ? availableWidth - computedXPosition : computedXPosition;
</del><ins>+ LayoutUnit xOffset = fillLayer.backgroundXOrigin() == RightEdge ? availableWidth - computedXPosition : computedXPosition;
</ins><span class="cx"> geometry.setNoRepeatX(left + xOffset);
</span><span class="cx"> geometry.setSpaceSize(LayoutSize(0, geometry.spaceSize().height()));
</span><span class="cx"> }
</span><span class="lines">@@ -1229,7 +1229,7 @@
</span><span class="cx"> backgroundRepeatY = NoRepeatFill;
</span><span class="cx"> }
</span><span class="cx"> if (backgroundRepeatY == NoRepeatFill) {
</span><del>- LayoutUnit yOffset = fillLayer->backgroundYOrigin() == BottomEdge ? availableHeight - computedYPosition : computedYPosition;
</del><ins>+ LayoutUnit yOffset = fillLayer.backgroundYOrigin() == BottomEdge ? availableHeight - computedYPosition : computedYPosition;
</ins><span class="cx"> geometry.setNoRepeatY(top + yOffset);
</span><span class="cx"> geometry.setSpaceSize(LayoutSize(geometry.spaceSize().width(), 0));
</span><span class="cx"> }
</span><span class="lines">@@ -1244,9 +1244,8 @@
</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><del>- const FillLayer* backgroundLayer = style().backgroundLayers();
</del><span class="cx"> LayoutRect paintRect(destRect);
</span><del>- BackgroundImageGeometry geometry = calculateBackgroundImageGeometry(paintContainer, backgroundLayer, paintRect);
</del><ins>+ BackgroundImageGeometry geometry = calculateBackgroundImageGeometry(paintContainer, *style().backgroundLayers(), 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 (180585 => 180586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2015-02-24 22:40:30 UTC (rev 180585)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2015-02-24 22:53:09 UTC (rev 180586)
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> LayoutPoint adjustedPositionRelativeToOffsetParent(const LayoutPoint&) const;
</span><span class="cx">
</span><span class="cx"> bool hasBoxDecorationStyle() const;
</span><del>- BackgroundImageGeometry calculateBackgroundImageGeometry(const RenderLayerModelObject* paintContainer, const FillLayer*, const LayoutRect& paintRect, 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 class="lines">@@ -306,7 +306,7 @@
</span><span class="cx">
</span><span class="cx"> virtual LayoutRect frameRectForStickyPositioning() const = 0;
</span><span class="cx">
</span><del>- LayoutSize calculateFillTileSize(const FillLayer*, const LayoutSize& scaledPositioningAreaSize) const;
</del><ins>+ LayoutSize calculateFillTileSize(const FillLayer&, const LayoutSize& scaledPositioningAreaSize) const;
</ins><span class="cx">
</span><span class="cx"> RoundedRect getBackgroundRoundedRect(const LayoutRect&, InlineFlowBox*, LayoutUnit inlineBoxWidth, LayoutUnit inlineBoxHeight,
</span><span class="cx"> bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const;
</span></span></pre>
</div>
</div>
</body>
</html>