<!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>[180580] 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/180580">180580</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-02-24 12:42:41 -0800 (Tue, 24 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Switch BackgroundImageGeometry's m_phase from LayoutPoint to LayoutSize.
https://bugs.webkit.org/show_bug.cgi?id=141972
Reviewed by Simon Fraser.
Image geometry's phase represents distance.
No change in functionality.
* WebCore.order:
* platform/graphics/GraphicsLayer.h:
(WebCore::GraphicsLayer::setContentsTilePhase):
(WebCore::GraphicsLayer::contentsTilePhase):
* platform/graphics/texmap/TextureMapperLayer.cpp:
(WebCore::TextureMapperLayer::computePatternTransformIfNeeded):
(WebCore::TextureMapperLayer::setContentsTilePhase):
* platform/graphics/texmap/TextureMapperLayer.h:
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
(WebCore::CoordinatedGraphicsLayer::setContentsTilePhase):
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintFillLayerExtended):
(WebCore::BackgroundImageGeometry::setNoRepeatX):
(WebCore::BackgroundImageGeometry::setNoRepeatY):
(WebCore::BackgroundImageGeometry::useFixedAttachment):
(WebCore::BackgroundImageGeometry::relativePhase):
(WebCore::RenderBoxModelObject::pixelSnapBackgroundImageGeometryForPainting):
(WebCore::RenderBoxModelObject::getGeometryForBackgroundImage):
* rendering/RenderBoxModelObject.h:
(WebCore::BackgroundImageGeometry::phase):
(WebCore::BackgroundImageGeometry::setPhase):
(WebCore::BackgroundImageGeometry::setPhaseX):
(WebCore::BackgroundImageGeometry::setPhaseY):
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::resetContentsRect):
(WebCore::RenderLayerBacking::updateDirectlyCompositedBackgroundImage):
* rendering/svg/RenderSVGResourceMasker.cpp:
(WebCore::RenderSVGResourceMasker::drawMaskForRenderer):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreorder">trunk/Source/WebCore/WebCore.order</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerh">trunk/Source/WebCore/platform/graphics/GraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayercpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayerh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayerh">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsStateh">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h</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>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceMaskercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180579 => 180580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-24 19:49:24 UTC (rev 180579)
+++ trunk/Source/WebCore/ChangeLog 2015-02-24 20:42:41 UTC (rev 180580)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2015-02-24 Zalan Bujtas <zalan@apple.com>
+
+ Switch BackgroundImageGeometry's m_phase from LayoutPoint to LayoutSize.
+ https://bugs.webkit.org/show_bug.cgi?id=141972
+
+ Reviewed by Simon Fraser.
+
+ Image geometry's phase represents distance.
+
+ No change in functionality.
+
+ * WebCore.order:
+ * platform/graphics/GraphicsLayer.h:
+ (WebCore::GraphicsLayer::setContentsTilePhase):
+ (WebCore::GraphicsLayer::contentsTilePhase):
+ * platform/graphics/texmap/TextureMapperLayer.cpp:
+ (WebCore::TextureMapperLayer::computePatternTransformIfNeeded):
+ (WebCore::TextureMapperLayer::setContentsTilePhase):
+ * platform/graphics/texmap/TextureMapperLayer.h:
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+ (WebCore::CoordinatedGraphicsLayer::setContentsTilePhase):
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::paintFillLayerExtended):
+ (WebCore::BackgroundImageGeometry::setNoRepeatX):
+ (WebCore::BackgroundImageGeometry::setNoRepeatY):
+ (WebCore::BackgroundImageGeometry::useFixedAttachment):
+ (WebCore::BackgroundImageGeometry::relativePhase):
+ (WebCore::RenderBoxModelObject::pixelSnapBackgroundImageGeometryForPainting):
+ (WebCore::RenderBoxModelObject::getGeometryForBackgroundImage):
+ * rendering/RenderBoxModelObject.h:
+ (WebCore::BackgroundImageGeometry::phase):
+ (WebCore::BackgroundImageGeometry::setPhase):
+ (WebCore::BackgroundImageGeometry::setPhaseX):
+ (WebCore::BackgroundImageGeometry::setPhaseY):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::resetContentsRect):
+ (WebCore::RenderLayerBacking::updateDirectlyCompositedBackgroundImage):
+ * rendering/svg/RenderSVGResourceMasker.cpp:
+ (WebCore::RenderSVGResourceMasker::drawMaskForRenderer):
+
</ins><span class="cx"> 2015-02-24 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] WebKit abandons overlay scrollbar CALayers.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreorder"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.order (180579 => 180580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.order 2015-02-24 19:49:24 UTC (rev 180579)
+++ trunk/Source/WebCore/WebCore.order 2015-02-24 20:42:41 UTC (rev 180580)
</span><span class="lines">@@ -2864,7 +2864,7 @@
</span><span class="cx"> __ZNK7WebCore20RenderBoxModelObject13paddingBottomEv
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA15setContentsRectERKNS_7IntRectE
</span><span class="cx"> __ZN7WebCore13GraphicsLayer19setContentsTileSizeERKNS_7IntSizeE
</span><del>-__ZN7WebCore13GraphicsLayer20setContentsTilePhaseERKNS_8IntPointE
</del><ins>+__ZN7WebCore13GraphicsLayer20setContentsTilePhaseERKNS_9FloatSizeE
</ins><span class="cx"> __ZN7WebCore18RenderLayerBacking18updateDrawsContentEb
</span><span class="cx"> __ZNK7WebCore18RenderLayerBacking22containsPaintedContentEv
</span><span class="cx"> __ZN7WebCore18RenderLayerBacking23registerScrollingLayersEv
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (180579 => 180580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2015-02-24 19:49:24 UTC (rev 180579)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2015-02-24 20:42:41 UTC (rev 180580)
</span><span class="lines">@@ -361,8 +361,8 @@
</span><span class="cx"> virtual void setContentsNeedsDisplay() { };
</span><span class="cx">
</span><span class="cx"> // The tile phase is relative to the GraphicsLayer bounds.
</span><del>- virtual void setContentsTilePhase(const FloatPoint& p) { m_contentsTilePhase = p; }
- FloatPoint contentsTilePhase() const { return m_contentsTilePhase; }
</del><ins>+ virtual void setContentsTilePhase(const FloatSize& p) { m_contentsTilePhase = p; }
+ FloatSize contentsTilePhase() const { return m_contentsTilePhase; }
</ins><span class="cx">
</span><span class="cx"> virtual void setContentsTileSize(const FloatSize& s) { m_contentsTileSize = s; }
</span><span class="cx"> FloatSize contentsTileSize() const { return m_contentsTileSize; }
</span><span class="lines">@@ -599,7 +599,7 @@
</span><span class="cx"> FloatRect m_contentsRect;
</span><span class="cx"> FloatRoundedRect m_contentsClippingRect;
</span><span class="cx"> FloatRoundedRect m_masksToBoundsRect;
</span><del>- FloatPoint m_contentsTilePhase;
</del><ins>+ FloatSize m_contentsTilePhase;
</ins><span class="cx"> FloatSize m_contentsTileSize;
</span><span class="cx">
</span><span class="cx"> int m_repaintCount;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp (180579 => 180580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp 2015-02-24 19:49:24 UTC (rev 180579)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp 2015-02-24 20:42:41 UTC (rev 180580)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> m_patternTransformDirty = false;
</span><span class="cx"> m_patternTransform =
</span><span class="cx"> TransformationMatrix::rectToRect(FloatRect(FloatPoint::zero(), m_state.contentsTileSize), FloatRect(FloatPoint::zero(), m_state.contentsRect.size()))
</span><del>- .multiply(TransformationMatrix().translate(m_state.contentsTilePhase.x() / m_state.contentsRect.width(), m_state.contentsTilePhase.y() / m_state.contentsRect.height()));
</del><ins>+ .multiply(TransformationMatrix().translate(m_state.contentsTilePhase.width() / m_state.contentsRect.width(), m_state.contentsTilePhase.height() / m_state.contentsRect.height()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextureMapperLayer::paintSelf(const TextureMapperPaintOptions& options)
</span><span class="lines">@@ -554,7 +554,7 @@
</span><span class="cx"> m_patternTransformDirty = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TextureMapperLayer::setContentsTilePhase(const FloatPoint& phase)
</del><ins>+void TextureMapperLayer::setContentsTilePhase(const FloatSize& phase)
</ins><span class="cx"> {
</span><span class="cx"> if (phase == m_state.contentsTilePhase)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h (180579 => 180580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h 2015-02-24 19:49:24 UTC (rev 180579)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h 2015-02-24 20:42:41 UTC (rev 180580)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> void setOpacity(float);
</span><span class="cx"> void setSolidColor(const Color&);
</span><span class="cx"> void setContentsTileSize(const FloatSize&);
</span><del>- void setContentsTilePhase(const FloatPoint&);
</del><ins>+ void setContentsTilePhase(const FloatSize&);
</ins><span class="cx"> void setFilters(const FilterOperations&);
</span><span class="cx">
</span><span class="cx"> bool hasFilters() const
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> float opacity;
</span><span class="cx"> FloatRect contentsRect;
</span><span class="cx"> FloatSize contentsTileSize;
</span><del>- FloatPoint contentsTilePhase;
</del><ins>+ FloatSize contentsTilePhase;
</ins><span class="cx"> TextureMapperLayer* maskLayer;
</span><span class="cx"> TextureMapperLayer* replicaLayer;
</span><span class="cx"> Color solidColor;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (180579 => 180580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2015-02-24 19:49:24 UTC (rev 180579)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2015-02-24 20:42:41 UTC (rev 180580)
</span><span class="lines">@@ -355,7 +355,7 @@
</span><span class="cx"> didChangeLayerState();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CoordinatedGraphicsLayer::setContentsTilePhase(const FloatPoint& p)
</del><ins>+void CoordinatedGraphicsLayer::setContentsTilePhase(const FloatSize& p)
</ins><span class="cx"> {
</span><span class="cx"> if (contentsTilePhase() == p)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h (180579 => 180580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h 2015-02-24 19:49:24 UTC (rev 180579)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h 2015-02-24 20:42:41 UTC (rev 180580)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> virtual void setBackfaceVisibility(bool) override;
</span><span class="cx"> virtual void setOpacity(float) override;
</span><span class="cx"> virtual void setContentsRect(const FloatRect&) override;
</span><del>- virtual void setContentsTilePhase(const FloatPoint&) override;
</del><ins>+ virtual void setContentsTilePhase(const FloatSize&) override;
</ins><span class="cx"> virtual void setContentsTileSize(const FloatSize&) override;
</span><span class="cx"> virtual void setContentsToImage(Image*) override;
</span><span class="cx"> virtual void setContentsToSolidColor(const Color&) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h (180579 => 180580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h 2015-02-24 19:49:24 UTC (rev 180579)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h 2015-02-24 20:42:41 UTC (rev 180580)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> TransformationMatrix transform;
</span><span class="cx"> TransformationMatrix childrenTransform;
</span><span class="cx"> FloatRect contentsRect;
</span><del>- FloatPoint contentsTilePhase;
</del><ins>+ FloatSize contentsTilePhase;
</ins><span class="cx"> FloatSize contentsTileSize;
</span><span class="cx"> float opacity;
</span><span class="cx"> Color solidColor;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (180579 => 180580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-02-24 19:49:24 UTC (rev 180579)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-02-24 20:42:41 UTC (rev 180580)
</span><span class="lines">@@ -859,7 +859,7 @@
</span><span class="cx"> bool useLowQualityScaling = shouldPaintAtLowQuality(context, image.get(), bgLayer, geometry.tileSize());
</span><span class="cx"> if (image.get())
</span><span class="cx"> image->setSpaceSize(geometry.spaceSize());
</span><del>- context->drawTiledImage(image.get(), style().colorSpace(), geometry.destRect(), geometry.relativePhase(), geometry.tileSize(), ImagePaintingOptions(compositeOp, bgLayer->blendMode(), ImageOrientationDescription(), useLowQualityScaling));
</del><ins>+ context->drawTiledImage(image.get(), style().colorSpace(), geometry.destRect(), toLayoutPoint(geometry.relativePhase()), geometry.tileSize(), ImagePaintingOptions(compositeOp, bgLayer->blendMode(), ImageOrientationDescription(), useLowQualityScaling));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1036,20 +1036,20 @@
</span><span class="cx"> void BackgroundImageGeometry::setNoRepeatX(LayoutUnit xOffset)
</span><span class="cx"> {
</span><span class="cx"> m_destRect.move(std::max<LayoutUnit>(xOffset, 0), 0);
</span><del>- m_phase.setX(-std::min<LayoutUnit>(xOffset, 0));
</del><ins>+ m_phase.setWidth(-std::min<LayoutUnit>(xOffset, 0));
</ins><span class="cx"> m_destRect.setWidth(m_tileSize.width() + std::min<float>(xOffset, 0));
</span><span class="cx"> }
</span><span class="cx"> void BackgroundImageGeometry::setNoRepeatY(LayoutUnit yOffset)
</span><span class="cx"> {
</span><span class="cx"> m_destRect.move(0, std::max<LayoutUnit>(yOffset, 0));
</span><del>- m_phase.setY(-std::min<LayoutUnit>(yOffset, 0));
</del><ins>+ m_phase.setHeight(-std::min<LayoutUnit>(yOffset, 0));
</ins><span class="cx"> m_destRect.setHeight(m_tileSize.height() + std::min<float>(yOffset, 0));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BackgroundImageGeometry::useFixedAttachment(const LayoutPoint& attachmentPoint)
</span><span class="cx"> {
</span><span class="cx"> FloatPoint alignedPoint = attachmentPoint;
</span><del>- m_phase.move(std::max<LayoutUnit>(alignedPoint.x() - m_destRect.x(), 0), std::max<LayoutUnit>(alignedPoint.y() - m_destRect.y(), 0));
</del><ins>+ m_phase.expand(std::max<LayoutUnit>(alignedPoint.x() - m_destRect.x(), 0), std::max<LayoutUnit>(alignedPoint.y() - m_destRect.y(), 0));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BackgroundImageGeometry::clip(const LayoutRect& clipRect)
</span><span class="lines">@@ -1057,9 +1057,9 @@
</span><span class="cx"> m_destRect.intersect(clipRect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LayoutPoint BackgroundImageGeometry::relativePhase() const
</del><ins>+LayoutSize BackgroundImageGeometry::relativePhase() const
</ins><span class="cx"> {
</span><del>- LayoutPoint phase = m_phase;
</del><ins>+ LayoutSize phase = m_phase;
</ins><span class="cx"> phase += m_destRect.location() - m_destOrigin;
</span><span class="cx"> return phase;
</span><span class="cx"> }
</span><span class="lines">@@ -1098,7 +1098,8 @@
</span><span class="cx"> geometry.setSpaceSize(LayoutSize(snapRectToDevicePixels(LayoutRect(LayoutPoint(), geometry.spaceSize()), deviceScaleFactor).size()));
</span><span class="cx"> geometry.setDestOrigin(LayoutPoint(roundPointToDevicePixels(geometry.destOrigin(), deviceScaleFactor)));
</span><span class="cx"> geometry.setDestRect(LayoutRect(snapRectToDevicePixels(geometry.destRect(), deviceScaleFactor)));
</span><del>- geometry.setPhase(LayoutPoint(roundPointToDevicePixels(geometry.phase(), deviceScaleFactor)));
</del><ins>+ FloatSize pixelSnappedPhase = toFloatSize(roundPointToDevicePixels(toLayoutPoint(geometry.phase()), deviceScaleFactor));
+ geometry.setPhase(LayoutSize(pixelSnappedPhase));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBoxModelObject::calculateBackgroundImageGeometry(const RenderLayerModelObject* paintContainer, const FillLayer* fillLayer, const LayoutRect& paintRect,
</span><span class="lines">@@ -1250,7 +1251,7 @@
</span><span class="cx"> pixelSnapBackgroundImageGeometryForPainting(geometry);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBoxModelObject::getGeometryForBackgroundImage(const RenderLayerModelObject* paintContainer, FloatRect& destRect, FloatPoint& phase, FloatSize& tileSize) const
</del><ins>+void RenderBoxModelObject::getGeometryForBackgroundImage(const RenderLayerModelObject* paintContainer, FloatRect& destRect, FloatSize& phase, FloatSize& tileSize) const
</ins><span class="cx"> {
</span><span class="cx"> const FillLayer* backgroundLayer = style().backgroundLayers();
</span><span class="cx"> BackgroundImageGeometry geometry;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.h (180579 => 180580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2015-02-24 19:49:24 UTC (rev 180579)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2015-02-24 20:42:41 UTC (rev 180580)
</span><span class="lines">@@ -78,20 +78,19 @@
</span><span class="cx"> void setDestRect(const LayoutRect& destRect) { m_destRect = destRect; }
</span><span class="cx">
</span><span class="cx"> // Returns the phase relative to the destination rectangle.
</span><del>- LayoutPoint relativePhase() const;
</del><ins>+ LayoutSize relativePhase() const;
</ins><span class="cx">
</span><del>- LayoutPoint phase() const { return m_phase; }
- void setPhase(const LayoutPoint& phase) { m_phase = phase; }
-
</del><ins>+ LayoutSize phase() const { return m_phase; }
+ void setPhase(const LayoutSize& phase) { m_phase = phase; }
+ void setPhaseX(LayoutUnit deltaX) { m_phase.setWidth(deltaX); }
+ void setPhaseY(LayoutUnit deltaY) { m_phase.setHeight(deltaY); }
+
</ins><span class="cx"> LayoutSize tileSize() const { return m_tileSize; }
</span><span class="cx"> void setTileSize(const LayoutSize& tileSize) { m_tileSize = tileSize; }
</span><span class="cx">
</span><span class="cx"> LayoutSize spaceSize() const { return m_space; }
</span><span class="cx"> void setSpaceSize(const LayoutSize& space) { m_space = space; }
</span><span class="cx">
</span><del>- void setPhaseX(LayoutUnit x) { m_phase.setX(x); }
- void setPhaseY(LayoutUnit y) { m_phase.setY(y); }
-
</del><span class="cx"> void setNoRepeatX(LayoutUnit xOffset);
</span><span class="cx"> void setNoRepeatY(LayoutUnit yOffset);
</span><span class="cx">
</span><span class="lines">@@ -105,7 +104,7 @@
</span><span class="cx"> private:
</span><span class="cx"> LayoutRect m_destRect;
</span><span class="cx"> LayoutPoint m_destOrigin;
</span><del>- LayoutPoint m_phase;
</del><ins>+ LayoutSize m_phase;
</ins><span class="cx"> LayoutSize m_tileSize;
</span><span class="cx"> LayoutSize m_space;
</span><span class="cx"> bool m_hasNonLocalGeometry; // Has background-attachment: fixed. Implies that we can't always cheaply compute destRect.
</span><span class="lines">@@ -236,7 +235,7 @@
</span><span class="cx">
</span><span class="cx"> bool canHaveBoxInfoInRegion() const { return !isFloating() && !isReplaced() && !isInline() && !isTableCell() && isRenderBlock() && !isRenderSVGBlock(); }
</span><span class="cx">
</span><del>- void getGeometryForBackgroundImage(const RenderLayerModelObject* paintContainer, FloatRect& destRect, FloatPoint& phase, FloatSize& tileSize) const;
</del><ins>+ void getGeometryForBackgroundImage(const RenderLayerModelObject* paintContainer, FloatRect& destRect, FloatSize& phase, FloatSize& tileSize) const;
</ins><span class="cx"> void contentChanged(ContentChangeType);
</span><span class="cx"> bool hasAcceleratedCompositing() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (180579 => 180580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-02-24 19:49:24 UTC (rev 180579)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-02-24 20:42:41 UTC (rev 180580)
</span><span class="lines">@@ -1122,7 +1122,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_graphicsLayer->setContentsTileSize(IntSize());
</span><del>- m_graphicsLayer->setContentsTilePhase(IntPoint());
</del><ins>+ m_graphicsLayer->setContentsTilePhase(IntSize());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayerBacking::updateDrawsContent()
</span><span class="lines">@@ -1652,7 +1652,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatRect destRect = backgroundBoxForPainting();
</span><del>- FloatPoint phase;
</del><ins>+ FloatSize phase;
</ins><span class="cx"> FloatSize tileSize;
</span><span class="cx">
</span><span class="cx"> RefPtr<Image> image = style.backgroundLayers()->image()->cachedImage()->image();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceMaskercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp (180579 => 180580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp 2015-02-24 19:49:24 UTC (rev 180579)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp 2015-02-24 20:42:41 UTC (rev 180580)
</span><span class="lines">@@ -147,8 +147,8 @@
</span><span class="cx">
</span><span class="cx"> FloatRect oneTileRect;
</span><span class="cx"> FloatSize actualTileSize(geometry.tileSize().width() + geometry.spaceSize().width(), geometry.tileSize().height() + geometry.spaceSize().height());
</span><del>- oneTileRect.setX(geometry.destRect().x() + fmodf(fmodf(-geometry.relativePhase().x(), actualTileSize.width()) - actualTileSize.width(), actualTileSize.width()));
- oneTileRect.setY(geometry.destRect().y() + fmodf(fmodf(-geometry.relativePhase().y(), actualTileSize.height()) - actualTileSize.height(), actualTileSize.height()));
</del><ins>+ oneTileRect.setX(geometry.destRect().x() + fmodf(fmodf(-geometry.relativePhase().width(), actualTileSize.width()) - actualTileSize.width(), actualTileSize.width()));
+ oneTileRect.setY(geometry.destRect().y() + fmodf(fmodf(-geometry.relativePhase().height(), actualTileSize.height()) - actualTileSize.height(), actualTileSize.height()));
</ins><span class="cx"> oneTileRect.setSize(geometry.tileSize());
</span><span class="cx">
</span><span class="cx"> FloatSize intrinsicTileSize = maskerData->maskImage->logicalSize();
</span></span></pre>
</div>
</div>
</body>
</html>