<!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>[163973] 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/163973">163973</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-02-12 12:34:57 -0800 (Wed, 12 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel layout: Clean up LayoutPoint class.
https://bugs.webkit.org/show_bug.cgi?id=128515
Reviewed by Simon Fraser.
Remove redundant functions (keep the more explicit ones).
No change in functionality.
* page/FrameView.cpp:
(WebCore::FrameView::viewportConstrainedVisibleContentRect):
* platform/graphics/LayoutPoint.h:
(WebCore::toLayoutPoint):
(WebCore::toLayoutSize):
(WebCore::roundedIntPoint):
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::updateContentsRects):
* rendering/LayoutState.cpp:
(WebCore::LayoutState::LayoutState):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::addFocusRingRects):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::offsetFromContainer):
* rendering/RenderInline.cpp:
(WebCore::RenderInline::addFocusRingRects):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::updateLayerPosition):
(WebCore::accumulateOffsetTowardsAncestor):
(WebCore::RenderLayer::paintBackgroundForFragments):
(WebCore::RenderLayer::paintForegroundForFragmentsWithPhase):
(WebCore::RenderLayer::paintOutlineForFragments):
(WebCore::RenderLayer::paintMaskForFragments):
(WebCore::RenderLayer::paintOverflowControlsForFragments):
* rendering/RenderScrollbarPart.cpp:
(WebCore::RenderScrollbarPart::paintIntoRect):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsLayoutPointh">trunk/Source/WebCore/platform/graphics/LayoutPoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingLayoutStatecpp">trunk/Source/WebCore/rendering/LayoutState.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderInlinecpp">trunk/Source/WebCore/rendering/RenderInline.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderScrollbarPartcpp">trunk/Source/WebCore/rendering/RenderScrollbarPart.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163972 => 163973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-12 20:32:46 UTC (rev 163972)
+++ trunk/Source/WebCore/ChangeLog 2014-02-12 20:34:57 UTC (rev 163973)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2014-02-12 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel layout: Clean up LayoutPoint class.
+ https://bugs.webkit.org/show_bug.cgi?id=128515
+
+ Reviewed by Simon Fraser.
+
+ Remove redundant functions (keep the more explicit ones).
+
+ No change in functionality.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::viewportConstrainedVisibleContentRect):
+ * platform/graphics/LayoutPoint.h:
+ (WebCore::toLayoutPoint):
+ (WebCore::toLayoutSize):
+ (WebCore::roundedIntPoint):
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::updateContentsRects):
+ * rendering/LayoutState.cpp:
+ (WebCore::LayoutState::LayoutState):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::addFocusRingRects):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::offsetFromContainer):
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::addFocusRingRects):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::updateLayerPosition):
+ (WebCore::accumulateOffsetTowardsAncestor):
+ (WebCore::RenderLayer::paintBackgroundForFragments):
+ (WebCore::RenderLayer::paintForegroundForFragmentsWithPhase):
+ (WebCore::RenderLayer::paintOutlineForFragments):
+ (WebCore::RenderLayer::paintMaskForFragments):
+ (WebCore::RenderLayer::paintOverflowControlsForFragments):
+ * rendering/RenderScrollbarPart.cpp:
+ (WebCore::RenderScrollbarPart::paintIntoRect):
+
</ins><span class="cx"> 2014-02-12 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CoordinatedGraphics] Move CoordinatedGraphicsScene, CoordinatedLayerTreeHostProxy to std::function
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (163972 => 163973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-02-12 20:32:46 UTC (rev 163972)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-02-12 20:34:57 UTC (rev 163973)
</span><span class="lines">@@ -1538,7 +1538,7 @@
</span><span class="cx"> return customFixedPositionLayoutRect();
</span><span class="cx"> #endif
</span><span class="cx"> LayoutRect viewportRect = visibleContentRect();
</span><del>- viewportRect.setLocation(toPoint(scrollOffsetForFixedPosition()));
</del><ins>+ viewportRect.setLocation(toLayoutPoint(scrollOffsetForFixedPosition()));
</ins><span class="cx"> return viewportRect;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsLayoutPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/LayoutPoint.h (163972 => 163973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/LayoutPoint.h 2014-02-12 20:32:46 UTC (rev 163972)
+++ trunk/Source/WebCore/platform/graphics/LayoutPoint.h 2014-02-12 20:34:57 UTC (rev 163973)
</span><span class="lines">@@ -140,21 +140,16 @@
</span><span class="cx"> return a.x() != b.x() || a.y() != b.y();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline LayoutPoint toPoint(const LayoutSize& size)
</del><ins>+inline LayoutPoint toLayoutPoint(const LayoutSize& size)
</ins><span class="cx"> {
</span><span class="cx"> return LayoutPoint(size.width(), size.height());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline LayoutPoint toLayoutPoint(const LayoutSize& p)
</del><ins>+inline LayoutSize toLayoutSize(const LayoutPoint& point)
</ins><span class="cx"> {
</span><del>- return LayoutPoint(p.width(), p.height());
</del><ins>+ return LayoutSize(point.x(), point.y());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline LayoutSize toSize(const LayoutPoint& a)
-{
- return LayoutSize(a.x(), a.y());
-}
-
</del><span class="cx"> inline IntPoint flooredIntPoint(const LayoutPoint& point)
</span><span class="cx"> {
</span><span class="cx"> return IntPoint(point.x().floor(), point.y().floor());
</span><span class="lines">@@ -167,7 +162,7 @@
</span><span class="cx">
</span><span class="cx"> inline IntPoint roundedIntPoint(const LayoutSize& size)
</span><span class="cx"> {
</span><del>- return IntPoint(size.width().round(), size.height().round());
</del><ins>+ return roundedIntPoint(toLayoutPoint(size));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline IntPoint ceiledIntPoint(const LayoutPoint& point)
</span><span class="lines">@@ -199,17 +194,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline LayoutSize toLayoutSize(const LayoutPoint& p)
-{
- return LayoutSize(p.x(), p.y());
-}
-
-inline LayoutPoint flooredLayoutPoint(const FloatSize& s)
-{
- return flooredLayoutPoint(FloatPoint(s));
-}
-
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // LayoutPoint_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (163972 => 163973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-02-12 20:32:46 UTC (rev 163972)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-02-12 20:34:57 UTC (rev 163973)
</span><span class="lines">@@ -2038,7 +2038,7 @@
</span><span class="cx"> clippingOrigin = m_contentsClippingRect.location();
</span><span class="cx"> clippingBounds.setSize(m_contentsClippingRect.size());
</span><span class="cx">
</span><del>- contentOrigin = toPoint(m_contentsRect.location() - m_contentsClippingRect.location());
</del><ins>+ contentOrigin = toLayoutPoint(m_contentsRect.location() - m_contentsClippingRect.location());
</ins><span class="cx">
</span><span class="cx"> m_contentsClippingLayer->setPosition(clippingOrigin);
</span><span class="cx"> m_contentsClippingLayer->setBounds(clippingBounds);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingLayoutStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/LayoutState.cpp (163972 => 163973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/LayoutState.cpp 2014-02-12 20:32:46 UTC (rev 163972)
+++ trunk/Source/WebCore/rendering/LayoutState.cpp 2014-02-12 20:34:57 UTC (rev 163973)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> m_clipRect = m_next->m_clipRect;
</span><span class="cx">
</span><span class="cx"> if (renderer->hasOverflowClip()) {
</span><del>- LayoutRect clipRect(toPoint(m_paintOffset) + renderer->view().layoutDelta(), renderer->cachedSizeForOverflowClip());
</del><ins>+ LayoutRect clipRect(toLayoutPoint(m_paintOffset) + renderer->view().layoutDelta(), renderer->cachedSizeForOverflowClip());
</ins><span class="cx"> if (m_clipped)
</span><span class="cx"> m_clipRect.intersect(clipRect);
</span><span class="cx"> else {
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> if (container->hasOverflowClip()) {
</span><span class="cx"> m_clipped = true;
</span><span class="cx"> RenderBox* containerBox = toRenderBox(container);
</span><del>- m_clipRect = LayoutRect(toPoint(m_paintOffset), containerBox->cachedSizeForOverflowClip());
</del><ins>+ m_clipRect = LayoutRect(toLayoutPoint(m_paintOffset), containerBox->cachedSizeForOverflowClip());
</ins><span class="cx"> m_paintOffset -= containerBox->scrolledContentOffset();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (163972 => 163973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-02-12 20:32:46 UTC (rev 163972)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-02-12 20:34:57 UTC (rev 163973)
</span><span class="lines">@@ -5001,7 +5001,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (inlineElementContinuation())
</span><del>- inlineElementContinuation()->addFocusRingRects(rects, flooredLayoutPoint(additionalOffset + inlineElementContinuation()->containingBlock()->location() - location()), paintContainer);
</del><ins>+ inlineElementContinuation()->addFocusRingRects(rects, flooredLayoutPoint(LayoutPoint(additionalOffset + inlineElementContinuation()->containingBlock()->location() - location())), paintContainer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderBox* RenderBlock::createAnonymousBoxWithSameTypeAs(const RenderObject* parent) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (163972 => 163973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-02-12 20:32:46 UTC (rev 163972)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-02-12 20:34:57 UTC (rev 163973)
</span><span class="lines">@@ -1942,7 +1942,7 @@
</span><span class="cx"> RenderBlock* block = toRenderBlock(o);
</span><span class="cx"> LayoutRect columnRect(frameRect());
</span><span class="cx"> block->adjustStartEdgeForWritingModeIncludingColumns(columnRect);
</span><del>- offset += toSize(columnRect.location());
</del><ins>+ offset += toLayoutSize(columnRect.location());
</ins><span class="cx"> LayoutPoint columnPoint = block->flipForWritingModeIncludingColumns(point + offset);
</span><span class="cx"> offset = toLayoutSize(block->flipForWritingModeIncludingColumns(toLayoutPoint(offset)));
</span><span class="cx"> o->adjustForColumns(offset, columnPoint);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (163972 => 163973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderInline.cpp 2014-02-12 20:32:46 UTC (rev 163972)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2014-02-12 20:34:57 UTC (rev 163973)
</span><span class="lines">@@ -1485,9 +1485,9 @@
</span><span class="cx">
</span><span class="cx"> if (RenderBoxModelObject* continuation = this->continuation()) {
</span><span class="cx"> if (continuation->isInline())
</span><del>- continuation->addFocusRingRects(rects, flooredLayoutPoint(additionalOffset + continuation->containingBlock()->location() - containingBlock()->location()), paintContainer);
</del><ins>+ continuation->addFocusRingRects(rects, flooredLayoutPoint(LayoutPoint(additionalOffset + continuation->containingBlock()->location() - containingBlock()->location())), paintContainer);
</ins><span class="cx"> else
</span><del>- continuation->addFocusRingRects(rects, flooredLayoutPoint(additionalOffset + toRenderBox(continuation)->location() - containingBlock()->location()), paintContainer);
</del><ins>+ continuation->addFocusRingRects(rects, flooredLayoutPoint(LayoutPoint(additionalOffset + toRenderBox(continuation)->location() - containingBlock()->location())), paintContainer);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (163972 => 163973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-02-12 20:32:46 UTC (rev 163972)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-02-12 20:34:57 UTC (rev 163973)
</span><span class="lines">@@ -1198,7 +1198,7 @@
</span><span class="cx"> RenderInline& inlineFlow = toRenderInline(renderer());
</span><span class="cx"> IntRect lineBox = inlineFlow.linesBoundingBox();
</span><span class="cx"> setSize(lineBox.size());
</span><del>- inlineBoundingBoxOffset = toSize(lineBox.location());
</del><ins>+ inlineBoundingBoxOffset = toLayoutSize(lineBox.location());
</ins><span class="cx"> localPoint += inlineBoundingBoxOffset;
</span><span class="cx"> } else if (RenderBox* box = renderBox()) {
</span><span class="cx"> // FIXME: Is snapping the size really needed here for the RenderBox case?
</span><span class="lines">@@ -1930,13 +1930,13 @@
</span><span class="cx"> if (position == FixedPosition && fixedFlowThreadContainer) {
</span><span class="cx"> ASSERT(ancestorLayer);
</span><span class="cx"> if (ancestorLayer->isOutOfFlowRenderFlowThread()) {
</span><del>- location += toSize(layer->location());
</del><ins>+ location += toLayoutSize(layer->location());
</ins><span class="cx"> return ancestorLayer;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (ancestorLayer == renderer.view().layer()) {
</span><span class="cx"> // Add location in flow thread coordinates.
</span><del>- location += toSize(layer->location());
</del><ins>+ location += toLayoutSize(layer->location());
</ins><span class="cx">
</span><span class="cx"> // Add flow thread offset in view coordinates since the view may be scrolled.
</span><span class="cx"> FloatPoint absPos = renderer.view().localToAbsolute(FloatPoint(), IsFixed);
</span><span class="lines">@@ -1990,7 +1990,7 @@
</span><span class="cx"> if (!parentLayer)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- location += toSize(layer->location());
</del><ins>+ location += toLayoutSize(layer->location());
</ins><span class="cx">
</span><span class="cx"> if (adjustForColumns == RenderLayer::AdjustForColumns) {
</span><span class="cx"> if (RenderLayer* parentLayer = layer->parent()) {
</span><span class="lines">@@ -4321,7 +4321,7 @@
</span><span class="cx"> // Paint the background.
</span><span class="cx"> // FIXME: Eventually we will collect the region from the fragment itself instead of just from the paint info.
</span><span class="cx"> PaintInfo paintInfo(context, pixelSnappedIntRect(fragment.backgroundRect.rect()), PaintPhaseBlockBackground, paintBehavior, subtreePaintRootForRenderer, localPaintingInfo.region, 0, 0, &localPaintingInfo.rootLayer->renderer());
</span><del>- renderer().paint(paintInfo, toPoint(fragment.layerBounds.location() - renderBoxLocation() + localPaintingInfo.subPixelAccumulation));
</del><ins>+ renderer().paint(paintInfo, toLayoutPoint(fragment.layerBounds.location() - renderBoxLocation() + localPaintingInfo.subPixelAccumulation));
</ins><span class="cx">
</span><span class="cx"> if (localPaintingInfo.clipToDirtyRect)
</span><span class="cx"> restoreClip(context, localPaintingInfo.paintDirtyRect, fragment.backgroundRect);
</span><span class="lines">@@ -4396,7 +4396,7 @@
</span><span class="cx"> PaintInfo paintInfo(context, pixelSnappedIntRect(fragment.foregroundRect.rect()), phase, paintBehavior, subtreePaintRootForRenderer, localPaintingInfo.region, 0, 0, &localPaintingInfo.rootLayer->renderer());
</span><span class="cx"> if (phase == PaintPhaseForeground)
</span><span class="cx"> paintInfo.overlapTestRequests = localPaintingInfo.overlapTestRequests;
</span><del>- renderer().paint(paintInfo, toPoint(fragment.layerBounds.location() - renderBoxLocation() + localPaintingInfo.subPixelAccumulation));
</del><ins>+ renderer().paint(paintInfo, toLayoutPoint(fragment.layerBounds.location() - renderBoxLocation() + localPaintingInfo.subPixelAccumulation));
</ins><span class="cx">
</span><span class="cx"> if (shouldClip)
</span><span class="cx"> restoreClip(context, localPaintingInfo.paintDirtyRect, fragment.foregroundRect);
</span><span class="lines">@@ -4414,7 +4414,7 @@
</span><span class="cx"> // Paint our own outline
</span><span class="cx"> PaintInfo paintInfo(context, pixelSnappedIntRect(fragment.outlineRect.rect()), PaintPhaseSelfOutline, paintBehavior, subtreePaintRootForRenderer, localPaintingInfo.region, 0, 0, &localPaintingInfo.rootLayer->renderer());
</span><span class="cx"> clipToRect(localPaintingInfo.rootLayer, context, localPaintingInfo.paintDirtyRect, fragment.outlineRect, DoNotIncludeSelfForBorderRadius);
</span><del>- renderer().paint(paintInfo, toPoint(fragment.layerBounds.location() - renderBoxLocation() + localPaintingInfo.subPixelAccumulation));
</del><ins>+ renderer().paint(paintInfo, toLayoutPoint(fragment.layerBounds.location() - renderBoxLocation() + localPaintingInfo.subPixelAccumulation));
</ins><span class="cx"> restoreClip(context, localPaintingInfo.paintDirtyRect, fragment.outlineRect);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -4433,7 +4433,7 @@
</span><span class="cx"> // Paint the mask.
</span><span class="cx"> // FIXME: Eventually we will collect the region from the fragment itself instead of just from the paint info.
</span><span class="cx"> PaintInfo paintInfo(context, pixelSnappedIntRect(fragment.backgroundRect.rect()), PaintPhaseMask, PaintBehaviorNormal, subtreePaintRootForRenderer, localPaintingInfo.region, 0, 0, &localPaintingInfo.rootLayer->renderer());
</span><del>- renderer().paint(paintInfo, toPoint(fragment.layerBounds.location() - renderBoxLocation() + localPaintingInfo.subPixelAccumulation));
</del><ins>+ renderer().paint(paintInfo, toLayoutPoint(fragment.layerBounds.location() - renderBoxLocation() + localPaintingInfo.subPixelAccumulation));
</ins><span class="cx">
</span><span class="cx"> if (localPaintingInfo.clipToDirtyRect)
</span><span class="cx"> restoreClip(context, localPaintingInfo.paintDirtyRect, fragment.backgroundRect);
</span><span class="lines">@@ -4445,7 +4445,7 @@
</span><span class="cx"> for (size_t i = 0; i < layerFragments.size(); ++i) {
</span><span class="cx"> const LayerFragment& fragment = layerFragments.at(i);
</span><span class="cx"> clipToRect(localPaintingInfo.rootLayer, context, localPaintingInfo.paintDirtyRect, fragment.backgroundRect);
</span><del>- paintOverflowControls(context, roundedIntPoint(toPoint(fragment.layerBounds.location() - renderBoxLocation() + localPaintingInfo.subPixelAccumulation)),
</del><ins>+ paintOverflowControls(context, roundedIntPoint(toLayoutPoint(fragment.layerBounds.location() - renderBoxLocation() + localPaintingInfo.subPixelAccumulation)),
</ins><span class="cx"> pixelSnappedIntRect(fragment.backgroundRect.rect()), true);
</span><span class="cx"> restoreClip(context, localPaintingInfo.paintDirtyRect, fragment.backgroundRect);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderScrollbarPartcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderScrollbarPart.cpp (163972 => 163973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderScrollbarPart.cpp 2014-02-12 20:32:46 UTC (rev 163972)
+++ trunk/Source/WebCore/rendering/RenderScrollbarPart.cpp 2014-02-12 20:34:57 UTC (rev 163973)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> void RenderScrollbarPart::paintIntoRect(GraphicsContext* graphicsContext, const LayoutPoint& paintOffset, const LayoutRect& rect)
</span><span class="cx"> {
</span><span class="cx"> // Make sure our dimensions match the rect.
</span><del>- setLocation(rect.location() - toSize(paintOffset));
</del><ins>+ setLocation(rect.location() - toLayoutSize(paintOffset));
</ins><span class="cx"> setWidth(rect.width());
</span><span class="cx"> setHeight(rect.height());
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>