<!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>[164415] 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/164415">164415</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-02-19 21:02:37 -0800 (Wed, 19 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel rendering: Make GraphicsLayer's offsetFromRenderer subpixel position based.
https://bugs.webkit.org/show_bug.cgi?id=128694
Reviewed by Simon Fraser.
Changing layers from using integral types to using Float/LayoutUnits so that
we can position them on subpixels. They are still integral positioned though.
Covered by existing tests.
* platform/graphics/GraphicsLayer.cpp:
(WebCore::GraphicsLayer::setOffsetFromRenderer):
(WebCore::GraphicsLayer::paintGraphicsLayerContents):
* platform/graphics/GraphicsLayer.h:
(WebCore::GraphicsLayer::offsetFromRenderer): removed incorrect comment.
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
(WebCore::RenderLayerBacking::adjustAncestorCompositingBoundsForFlowThread):
(WebCore::RenderLayerBacking::positionOverflowControlsLayers):
(WebCore::RenderLayerBacking::computeTransformOrigin):
(WebCore::RenderLayerBacking::computePerspectiveOrigin):
* rendering/RenderLayerBacking.h:
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::requiresOwnBackingStore):
* rendering/RenderLayerCompositor.h:
* rendering/RenderMultiColumnSet.cpp:
(WebCore::RenderMultiColumnSet::adjustRegionBoundsFromFlowThreadPortionRect):
* rendering/RenderMultiColumnSet.h:
* rendering/RenderRegion.cpp:
(WebCore::RenderRegion::adjustRegionBoundsFromFlowThreadPortionRect):
* rendering/RenderRegion.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayercpp">trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerh">trunk/Source/WebCore/platform/graphics/GraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingh">trunk/Source/WebCore/rendering/RenderLayerBacking.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorh">trunk/Source/WebCore/rendering/RenderLayerCompositor.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnSetcpp">trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnSeth">trunk/Source/WebCore/rendering/RenderMultiColumnSet.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderRegioncpp">trunk/Source/WebCore/rendering/RenderRegion.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderRegionh">trunk/Source/WebCore/rendering/RenderRegion.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164414 => 164415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-20 04:18:23 UTC (rev 164414)
+++ trunk/Source/WebCore/ChangeLog 2014-02-20 05:02:37 UTC (rev 164415)
</span><span class="lines">@@ -1,5 +1,39 @@
</span><span class="cx"> 2014-02-19 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><ins>+ Subpixel rendering: Make GraphicsLayer's offsetFromRenderer subpixel position based.
+ https://bugs.webkit.org/show_bug.cgi?id=128694
+
+ Reviewed by Simon Fraser.
+
+ Changing layers from using integral types to using Float/LayoutUnits so that
+ we can position them on subpixels. They are still integral positioned though.
+
+ Covered by existing tests.
+
+ * platform/graphics/GraphicsLayer.cpp:
+ (WebCore::GraphicsLayer::setOffsetFromRenderer):
+ (WebCore::GraphicsLayer::paintGraphicsLayerContents):
+ * platform/graphics/GraphicsLayer.h:
+ (WebCore::GraphicsLayer::offsetFromRenderer): removed incorrect comment.
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
+ (WebCore::RenderLayerBacking::adjustAncestorCompositingBoundsForFlowThread):
+ (WebCore::RenderLayerBacking::positionOverflowControlsLayers):
+ (WebCore::RenderLayerBacking::computeTransformOrigin):
+ (WebCore::RenderLayerBacking::computePerspectiveOrigin):
+ * rendering/RenderLayerBacking.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::requiresOwnBackingStore):
+ * rendering/RenderLayerCompositor.h:
+ * rendering/RenderMultiColumnSet.cpp:
+ (WebCore::RenderMultiColumnSet::adjustRegionBoundsFromFlowThreadPortionRect):
+ * rendering/RenderMultiColumnSet.h:
+ * rendering/RenderRegion.cpp:
+ (WebCore::RenderRegion::adjustRegionBoundsFromFlowThreadPortionRect):
+ * rendering/RenderRegion.h:
+
+2014-02-19 Zalan Bujtas <zalan@apple.com>
+
</ins><span class="cx"> Subpixel rendering: Make GraphicsLayer::paintGraphicsLayerContents()'s cliprect FloatRect based.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=128911
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (164414 => 164415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2014-02-20 04:18:23 UTC (rev 164414)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2014-02-20 05:02:37 UTC (rev 164415)
</span><span class="lines">@@ -296,7 +296,7 @@
</span><span class="cx"> m_replicaLayer = layer;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsLayer::setOffsetFromRenderer(const IntSize& offset, ShouldSetNeedsDisplay shouldSetNeedsDisplay)
</del><ins>+void GraphicsLayer::setOffsetFromRenderer(const FloatSize& offset, ShouldSetNeedsDisplay shouldSetNeedsDisplay)
</ins><span class="cx"> {
</span><span class="cx"> if (offset == m_offsetFromRenderer)
</span><span class="cx"> return;
</span><span class="lines">@@ -327,7 +327,7 @@
</span><span class="cx"> void GraphicsLayer::paintGraphicsLayerContents(GraphicsContext& context, const FloatRect& clip)
</span><span class="cx"> {
</span><span class="cx"> if (m_client) {
</span><del>- IntSize offset = offsetFromRenderer();
</del><ins>+ FloatSize offset = offsetFromRenderer();
</ins><span class="cx"> context.translate(-offset);
</span><span class="cx">
</span><span class="cx"> FloatRect clipRect(clip);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (164414 => 164415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2014-02-20 04:18:23 UTC (rev 164414)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2014-02-20 05:02:37 UTC (rev 164415)
</span><span class="lines">@@ -279,9 +279,9 @@
</span><span class="cx"> SetNeedsDisplay
</span><span class="cx"> };
</span><span class="cx">
</span><del>- // Offset is origin of the renderer minus origin of the graphics layer (so either zero or negative).
- IntSize offsetFromRenderer() const { return m_offsetFromRenderer; }
- void setOffsetFromRenderer(const IntSize&, ShouldSetNeedsDisplay = SetNeedsDisplay);
</del><ins>+ // Offset is origin of the renderer minus origin of the graphics layer.
+ FloatSize offsetFromRenderer() const { return m_offsetFromRenderer; }
+ void setOffsetFromRenderer(const FloatSize&, ShouldSetNeedsDisplay = SetNeedsDisplay);
</ins><span class="cx">
</span><span class="cx"> // The position of the layer (the location of its top-left corner in its parent)
</span><span class="cx"> const FloatPoint& position() const { return m_position; }
</span><span class="lines">@@ -555,7 +555,7 @@
</span><span class="cx"> String m_name;
</span><span class="cx">
</span><span class="cx"> // Offset from the owning renderer
</span><del>- IntSize m_offsetFromRenderer;
</del><ins>+ FloatSize m_offsetFromRenderer;
</ins><span class="cx">
</span><span class="cx"> // Position is relative to the parent GraphicsLayer
</span><span class="cx"> FloatPoint m_position;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (164414 => 164415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-02-20 04:18:23 UTC (rev 164414)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-02-20 05:02:37 UTC (rev 164415)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><span class="cx"> static bool hasBoxDecorationsOrBackgroundImage(const RenderStyle*);
</span><del>-static IntRect clipBox(RenderBox& renderer);
</del><ins>+static LayoutRect clipBox(RenderBox& renderer);
</ins><span class="cx">
</span><span class="cx"> CanvasCompositingStrategy canvasCompositingStrategy(const RenderObject& renderer)
</span><span class="cx"> {
</span><span class="lines">@@ -633,7 +633,7 @@
</span><span class="cx"> return layerConfigChanged;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static IntRect clipBox(RenderBox& renderer)
</del><ins>+static LayoutRect clipBox(RenderBox& renderer)
</ins><span class="cx"> {
</span><span class="cx"> LayoutRect result = LayoutRect::infiniteRect();
</span><span class="cx"> if (renderer.hasOverflowClip())
</span><span class="lines">@@ -686,7 +686,7 @@
</span><span class="cx"> RenderLayer* compAncestor = m_owningLayer.ancestorCompositingLayer();
</span><span class="cx">
</span><span class="cx"> // We compute everything relative to the enclosing compositing layer.
</span><del>- IntRect ancestorCompositingBounds;
</del><ins>+ LayoutRect ancestorCompositingBounds;
</ins><span class="cx"> if (compAncestor) {
</span><span class="cx"> ASSERT(compAncestor->backing());
</span><span class="cx"> ancestorCompositingBounds = pixelSnappedIntRect(compAncestor->backing()->compositedBounds());
</span><span class="lines">@@ -700,17 +700,17 @@
</span><span class="cx"> // Move the bounds by the subpixel accumulation so that it pixel-snaps relative to absolute pixels instead of local coordinates.
</span><span class="cx"> localRawCompositingBounds.move(m_subpixelAccumulation);
</span><span class="cx">
</span><del>- IntRect localCompositingBounds = pixelSnappedIntRect(localRawCompositingBounds);
- IntRect relativeCompositingBounds(localCompositingBounds);
</del><ins>+ LayoutRect localCompositingBounds = pixelSnappedIntRect(localRawCompositingBounds);
+ LayoutRect relativeCompositingBounds(localCompositingBounds);
</ins><span class="cx"> relativeCompositingBounds.moveBy(delta);
</span><span class="cx">
</span><span class="cx"> adjustAncestorCompositingBoundsForFlowThread(ancestorCompositingBounds, compAncestor);
</span><span class="cx">
</span><del>- IntPoint graphicsLayerParentLocation;
</del><ins>+ LayoutPoint graphicsLayerParentLocation;
</ins><span class="cx"> if (compAncestor && compAncestor->backing()->hasClippingLayer()) {
</span><span class="cx"> // If the compositing ancestor has a layer to clip children, we parent in that, and therefore
</span><span class="cx"> // position relative to it.
</span><del>- IntRect clippingBox = clipBox(toRenderBox(compAncestor->renderer()));
</del><ins>+ LayoutRect clippingBox = clipBox(toRenderBox(compAncestor->renderer()));
</ins><span class="cx"> graphicsLayerParentLocation = clippingBox.location();
</span><span class="cx"> } else if (compAncestor)
</span><span class="cx"> graphicsLayerParentLocation = ancestorCompositingBounds.location();
</span><span class="lines">@@ -720,19 +720,19 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (compAncestor && compAncestor->hasAcceleratedTouchScrolling()) {
</span><span class="cx"> RenderBox* renderBox = toRenderBox(&compAncestor->renderer());
</span><del>- IntRect paddingBox(renderBox->borderLeft(), renderBox->borderTop(),
</del><ins>+ LayoutRect paddingBox(renderBox->borderLeft(), renderBox->borderTop(),
</ins><span class="cx"> renderBox->width() - renderBox->borderLeft() - renderBox->borderRight(),
</span><span class="cx"> renderBox->height() - renderBox->borderTop() - renderBox->borderBottom());
</span><span class="cx">
</span><del>- IntSize scrollOffset = compAncestor->scrolledContentOffset();
</del><ins>+ LayoutSize scrollOffset = compAncestor->scrolledContentOffset();
</ins><span class="cx"> graphicsLayerParentLocation = paddingBox.location() - scrollOffset;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (compAncestor && compAncestor->needsCompositedScrolling()) {
</span><span class="cx"> RenderBox& renderBox = toRenderBox(compAncestor->renderer());
</span><del>- IntSize scrollOffset = compAncestor->scrolledContentOffset();
- IntPoint scrollOrigin(renderBox.borderLeft(), renderBox.borderTop());
</del><ins>+ LayoutSize scrollOffset = compAncestor->scrolledContentOffset();
+ LayoutPoint scrollOrigin(renderBox.borderLeft(), renderBox.borderTop());
</ins><span class="cx"> graphicsLayerParentLocation = scrollOrigin - scrollOffset;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -741,8 +741,8 @@
</span><span class="cx"> // layer. Note that we call it with temporaryClipRects = true because normally when computing clip rects
</span><span class="cx"> // for a compositing layer, rootLayer is the layer itself.
</span><span class="cx"> RenderLayer::ClipRectsContext clipRectsContext(compAncestor, 0, TemporaryClipRects, IgnoreOverlayScrollbarSize, IgnoreOverflowClip);
</span><del>- IntRect parentClipRect = pixelSnappedIntRect(m_owningLayer.backgroundClipRect(clipRectsContext).rect()); // FIXME: Incorrect for CSS regions.
- ASSERT(parentClipRect != IntRect::infiniteRect());
</del><ins>+ LayoutRect parentClipRect = pixelSnappedIntRect(m_owningLayer.backgroundClipRect(clipRectsContext).rect()); // FIXME: Incorrect for CSS regions.
+ ASSERT(parentClipRect != LayoutRect::infiniteRect());
</ins><span class="cx"> m_ancestorClippingLayer->setPosition(FloatPoint(parentClipRect.location() - graphicsLayerParentLocation));
</span><span class="cx"> m_ancestorClippingLayer->setSize(parentClipRect.size());
</span><span class="cx">
</span><span class="lines">@@ -753,7 +753,7 @@
</span><span class="cx"> graphicsLayerParentLocation = parentClipRect.location();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- FloatSize contentsSize = relativeCompositingBounds.size();
</del><ins>+ LayoutSize contentsSize = relativeCompositingBounds.size();
</ins><span class="cx">
</span><span class="cx"> if (m_contentsContainmentLayer) {
</span><span class="cx"> m_contentsContainmentLayer->setPreserves3D(preserves3D);
</span><span class="lines">@@ -765,26 +765,26 @@
</span><span class="cx">
</span><span class="cx"> m_graphicsLayer->setPosition(FloatPoint(relativeCompositingBounds.location() - graphicsLayerParentLocation));
</span><span class="cx"> m_graphicsLayer->setSize(contentsSize);
</span><del>- IntSize offsetFromRenderer = toIntSize(localCompositingBounds.location());
</del><ins>+ FloatSize offsetFromRenderer = toLayoutSize(localCompositingBounds.location());
</ins><span class="cx"> if (offsetFromRenderer != m_graphicsLayer->offsetFromRenderer()) {
</span><del>- m_graphicsLayer->setOffsetFromRenderer(toIntSize(localCompositingBounds.location()));
</del><ins>+ m_graphicsLayer->setOffsetFromRenderer(offsetFromRenderer);
</ins><span class="cx"> positionOverflowControlsLayers();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_isMainFrameRenderViewLayer) {
</span><span class="cx"> // For non-root layers, background is always painted by the primary graphics layer.
</span><span class="cx"> ASSERT(!m_backgroundLayer);
</span><del>- bool hadSubpixelRounding = LayoutSize(relativeCompositingBounds.size()) != localRawCompositingBounds.size();
</del><ins>+ bool hadSubpixelRounding = relativeCompositingBounds.size() != localRawCompositingBounds.size();
</ins><span class="cx"> m_graphicsLayer->setContentsOpaque(!hadSubpixelRounding && m_owningLayer.backgroundIsKnownToBeOpaqueInRect(localCompositingBounds));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If we have a layer that clips children, position it.
</span><del>- IntRect clippingBox;
</del><ins>+ LayoutRect clippingBox;
</ins><span class="cx"> if (GraphicsLayer* clipLayer = clippingLayer()) {
</span><span class="cx"> clippingBox = clipBox(toRenderBox(renderer()));
</span><span class="cx"> clipLayer->setPosition(FloatPoint(clippingBox.location() - localCompositingBounds.location()));
</span><span class="cx"> clipLayer->setSize(clippingBox.size());
</span><del>- clipLayer->setOffsetFromRenderer(toIntSize(clippingBox.location()));
</del><ins>+ clipLayer->setOffsetFromRenderer(toFloatSize(clippingBox.location()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_maskLayer) {
</span><span class="lines">@@ -794,10 +794,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_owningLayer.hasTransform()) {
</span><del>- const IntRect borderBox = toRenderBox(renderer()).pixelSnappedBorderBoxRect();
</del><ins>+ const LayoutRect borderBox = toRenderBox(renderer()).pixelSnappedBorderBoxRect();
</ins><span class="cx">
</span><span class="cx"> // Get layout bounds in the coords of compAncestor to match relativeCompositingBounds.
</span><del>- IntRect layerBounds(delta, borderBox.size());
</del><ins>+ LayoutRect layerBounds(delta, borderBox.size());
</ins><span class="cx">
</span><span class="cx"> // Update properties that depend on layer dimensions
</span><span class="cx"> FloatPoint3D transformOrigin = computeTransformOrigin(borderBox);
</span><span class="lines">@@ -836,12 +836,12 @@
</span><span class="cx"> if (m_foregroundLayer) {
</span><span class="cx"> FloatPoint foregroundPosition;
</span><span class="cx"> FloatSize foregroundSize = contentsSize;
</span><del>- IntSize foregroundOffset = m_graphicsLayer->offsetFromRenderer();
</del><ins>+ FloatSize foregroundOffset = m_graphicsLayer->offsetFromRenderer();
</ins><span class="cx"> if (hasClippingLayer()) {
</span><span class="cx"> // If we have a clipping layer (which clips descendants), then the foreground layer is a child of it,
</span><span class="cx"> // so that it gets correctly sorted with children. In that case, position relative to the clipping layer.
</span><span class="cx"> foregroundSize = FloatSize(clippingBox.size());
</span><del>- foregroundOffset = toIntSize(clippingBox.location());
</del><ins>+ foregroundOffset = toFloatSize(clippingBox.location());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_foregroundLayer->setPosition(foregroundPosition);
</span><span class="lines">@@ -883,7 +883,7 @@
</span><span class="cx">
</span><span class="cx"> m_scrollingLayer->setSize(paddingBox.size());
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- IntSize oldScrollingLayerOffset = m_scrollingLayer->offsetFromRenderer();
</del><ins>+ FloatSize oldScrollingLayerOffset = m_scrollingLayer->offsetFromRenderer();
</ins><span class="cx"> m_scrollingLayer->setOffsetFromRenderer(IntPoint() - paddingBox.location());
</span><span class="cx"> bool paddingBoxOffsetChanged = oldScrollingLayerOffset != m_scrollingLayer->offsetFromRenderer();
</span><span class="cx">
</span><span class="lines">@@ -907,13 +907,13 @@
</span><span class="cx"> m_scrollingContentsLayer->setSize(scrollSize);
</span><span class="cx"> // Scrolling the content layer does not need to trigger a repaint. The offset will be compensated away during painting.
</span><span class="cx"> // FIXME: The paint offset and the scroll offset should really be separate concepts.
</span><del>- m_scrollingContentsLayer->setOffsetFromRenderer(paddingBox.location() - IntPoint() - scrollOffset, GraphicsLayer::DontSetNeedsDisplay);
</del><ins>+ m_scrollingContentsLayer->setOffsetFromRenderer(paddingBox.location() - FloatPoint() - scrollOffset, GraphicsLayer::DontSetNeedsDisplay);
</ins><span class="cx">
</span><span class="cx"> compositor().scrollingLayerAddedOrUpdated(&m_owningLayer);
</span><span class="cx"> #else
</span><span class="cx"> m_scrollingContentsLayer->setPosition(FloatPoint(-scrollOffset.width(), -scrollOffset.height()));
</span><span class="cx">
</span><del>- IntSize oldScrollingLayerOffset = m_scrollingLayer->offsetFromRenderer();
</del><ins>+ FloatSize oldScrollingLayerOffset = m_scrollingLayer->offsetFromRenderer();
</ins><span class="cx"> m_scrollingLayer->setOffsetFromRenderer(-toIntSize(paddingBox.location()));
</span><span class="cx">
</span><span class="cx"> bool paddingBoxOffsetChanged = oldScrollingLayerOffset != m_scrollingLayer->offsetFromRenderer();
</span><span class="lines">@@ -951,7 +951,7 @@
</span><span class="cx"> compositor().updateViewportConstraintStatus(m_owningLayer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayerBacking::adjustAncestorCompositingBoundsForFlowThread(IntRect& ancestorCompositingBounds, const RenderLayer* compositingAncestor) const
</del><ins>+void RenderLayerBacking::adjustAncestorCompositingBoundsForFlowThread(LayoutRect& ancestorCompositingBounds, const RenderLayer* compositingAncestor) const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_owningLayer.isInsideFlowThread())
</span><span class="cx"> return;
</span><span class="lines">@@ -1225,7 +1225,7 @@
</span><span class="cx">
</span><span class="cx"> const IntRect borderBox = toRenderBox(renderer()).pixelSnappedBorderBoxRect();
</span><span class="cx">
</span><del>- IntSize offsetFromRenderer = m_graphicsLayer->offsetFromRenderer();
</del><ins>+ FloatSize offsetFromRenderer = m_graphicsLayer->offsetFromRenderer();
</ins><span class="cx"> if (GraphicsLayer* layer = layerForHorizontalScrollbar()) {
</span><span class="cx"> IntRect hBarRect = m_owningLayer.rectForHorizontalScrollbar(borderBox);
</span><span class="cx"> layer->setPosition(hBarRect.location() - offsetFromRenderer);
</span><span class="lines">@@ -1905,7 +1905,7 @@
</span><span class="cx"> image->startAnimation();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FloatPoint3D RenderLayerBacking::computeTransformOrigin(const IntRect& borderBox) const
</del><ins>+FloatPoint3D RenderLayerBacking::computeTransformOrigin(const LayoutRect& borderBox) const
</ins><span class="cx"> {
</span><span class="cx"> const RenderStyle& style = renderer().style();
</span><span class="cx">
</span><span class="lines">@@ -1917,7 +1917,7 @@
</span><span class="cx"> return origin;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FloatPoint RenderLayerBacking::computePerspectiveOrigin(const IntRect& borderBox) const
</del><ins>+FloatPoint RenderLayerBacking::computePerspectiveOrigin(const LayoutRect& borderBox) const
</ins><span class="cx"> {
</span><span class="cx"> const RenderStyle& style = renderer().style();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (164414 => 164415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-02-20 04:18:23 UTC (rev 164414)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-02-20 05:02:37 UTC (rev 164415)
</span><span class="lines">@@ -241,9 +241,9 @@
</span><span class="cx">
</span><span class="cx"> LayoutSize contentOffsetInCompostingLayer() const;
</span><span class="cx"> // Result is transform origin in pixels.
</span><del>- FloatPoint3D computeTransformOrigin(const IntRect& borderBox) const;
</del><ins>+ FloatPoint3D computeTransformOrigin(const LayoutRect& borderBox) const;
</ins><span class="cx"> // Result is perspective origin in pixels.
</span><del>- FloatPoint computePerspectiveOrigin(const IntRect& borderBox) const;
</del><ins>+ FloatPoint computePerspectiveOrigin(const LayoutRect& borderBox) const;
</ins><span class="cx">
</span><span class="cx"> void updateOpacity(const RenderStyle*);
</span><span class="cx"> void updateTransform(const RenderStyle*);
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx"> void paintIntoLayer(const GraphicsLayer*, GraphicsContext*, const LayoutRect& paintDirtyRect, PaintBehavior, GraphicsLayerPaintingPhase);
</span><span class="cx">
</span><span class="cx"> // Helper function for updateGraphicsLayerGeometry.
</span><del>- void adjustAncestorCompositingBoundsForFlowThread(IntRect& ancestorCompositingBounds, const RenderLayer* compositingAncestor) const;
</del><ins>+ void adjustAncestorCompositingBoundsForFlowThread(LayoutRect& ancestorCompositingBounds, const RenderLayer* compositingAncestor) const;
</ins><span class="cx">
</span><span class="cx"> static CSSPropertyID graphicsLayerToCSSProperty(AnimatedPropertyID);
</span><span class="cx"> static AnimatedPropertyID cssToGraphicsLayerProperty(CSSPropertyID);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (164414 => 164415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-02-20 04:18:23 UTC (rev 164414)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-02-20 05:02:37 UTC (rev 164415)
</span><span class="lines">@@ -2009,7 +2009,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderLayerCompositor::requiresOwnBackingStore(const RenderLayer& layer, const RenderLayer* compositingAncestorLayer, const IntRect& layerCompositedBoundsInAncestor, const IntRect& ancestorCompositedBounds) const
</del><ins>+bool RenderLayerCompositor::requiresOwnBackingStore(const RenderLayer& layer, const RenderLayer* compositingAncestorLayer, const LayoutRect& layerCompositedBoundsInAncestor, const LayoutRect& ancestorCompositedBounds) const
</ins><span class="cx"> {
</span><span class="cx"> auto& renderer = layer.renderer();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (164414 => 164415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2014-02-20 04:18:23 UTC (rev 164414)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2014-02-20 05:02:37 UTC (rev 164415)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> void repaintCompositedLayers(const IntRect* = 0);
</span><span class="cx">
</span><span class="cx"> // Returns true if the given layer needs it own backing store.
</span><del>- bool requiresOwnBackingStore(const RenderLayer&, const RenderLayer* compositingAncestorLayer, const IntRect& layerCompositedBoundsInAncestor, const IntRect& ancestorCompositedBounds) const;
</del><ins>+ bool requiresOwnBackingStore(const RenderLayer&, const RenderLayer* compositingAncestorLayer, const LayoutRect& layerCompositedBoundsInAncestor, const LayoutRect& ancestorCompositedBounds) const;
</ins><span class="cx">
</span><span class="cx"> RenderLayer& rootRenderLayer() const;
</span><span class="cx"> GraphicsLayer* rootGraphicsLayer() const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp (164414 => 164415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2014-02-20 04:18:23 UTC (rev 164414)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2014-02-20 05:02:37 UTC (rev 164415)
</span><span class="lines">@@ -655,7 +655,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderMultiColumnSet::adjustRegionBoundsFromFlowThreadPortionRect(const IntPoint& layerOffset, IntRect& regionBounds)
</del><ins>+void RenderMultiColumnSet::adjustRegionBoundsFromFlowThreadPortionRect(const LayoutPoint& layerOffset, LayoutRect& regionBounds)
</ins><span class="cx"> {
</span><span class="cx"> LayoutUnit layerLogicalTop = isHorizontalWritingMode() ? layerOffset.y() : layerOffset.x();
</span><span class="cx"> unsigned startColumn = columnIndexAtOffset(layerLogicalTop);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSet.h (164414 => 164415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnSet.h 2014-02-20 04:18:23 UTC (rev 164414)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.h 2014-02-20 05:02:37 UTC (rev 164415)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void collectLayerFragments(LayerFragments&, const LayoutRect& layerBoundingBox, const LayoutRect& dirtyRect) override;
</span><span class="cx">
</span><del>- virtual void adjustRegionBoundsFromFlowThreadPortionRect(const IntPoint& layerOffset, IntRect& regionBounds) override;
</del><ins>+ virtual void adjustRegionBoundsFromFlowThreadPortionRect(const LayoutPoint& layerOffset, LayoutRect& regionBounds) override;
</ins><span class="cx">
</span><span class="cx"> virtual const char* renderName() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderRegioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderRegion.cpp (164414 => 164415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderRegion.cpp 2014-02-20 04:18:23 UTC (rev 164414)
+++ trunk/Source/WebCore/rendering/RenderRegion.cpp 2014-02-20 05:02:37 UTC (rev 164415)
</span><span class="lines">@@ -444,11 +444,11 @@
</span><span class="cx"> namedFlow.getRanges(rangeObjects, this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderRegion::adjustRegionBoundsFromFlowThreadPortionRect(const IntPoint& layerOffset, IntRect& regionBounds)
</del><ins>+void RenderRegion::adjustRegionBoundsFromFlowThreadPortionRect(const LayoutPoint& layerOffset, LayoutRect& regionBounds)
</ins><span class="cx"> {
</span><span class="cx"> LayoutRect flippedFlowThreadPortionRect = flowThreadPortionRect();
</span><span class="cx"> flowThread()->flipForWritingMode(flippedFlowThreadPortionRect);
</span><del>- regionBounds.moveBy(roundedIntPoint(flippedFlowThreadPortionRect.location()));
</del><ins>+ regionBounds.moveBy(flippedFlowThreadPortionRect.location());
</ins><span class="cx">
</span><span class="cx"> UNUSED_PARAM(layerOffset);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderRegionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderRegion.h (164414 => 164415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderRegion.h 2014-02-20 04:18:23 UTC (rev 164414)
+++ trunk/Source/WebCore/rendering/RenderRegion.h 2014-02-20 05:02:37 UTC (rev 164415)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void collectLayerFragments(LayerFragments&, const LayoutRect&, const LayoutRect&) { }
</span><span class="cx">
</span><del>- virtual void adjustRegionBoundsFromFlowThreadPortionRect(const IntPoint& layerOffset, IntRect& regionBounds); // layerOffset is needed for multi-column.
</del><ins>+ virtual void adjustRegionBoundsFromFlowThreadPortionRect(const LayoutPoint& layerOffset, LayoutRect& regionBounds); // layerOffset is needed for multi-column.
</ins><span class="cx">
</span><span class="cx"> void addLayoutOverflowForBox(const RenderBox*, const LayoutRect&);
</span><span class="cx"> void addVisualOverflowForBox(const RenderBox*, const LayoutRect&);
</span></span></pre>
</div>
</div>
</body>
</html>