Title: [146648] branches/chromium/1410/Source/WebCore/rendering/RenderLayerCompositor.cpp
- Revision
- 146648
- Author
- wangxian...@chromium.org
- Date
- 2013-03-22 13:28:29 -0700 (Fri, 22 Mar 2013)
Log Message
Merge 144642 "Don't apply page scale to clipRect if applyPageSca..."
> Don't apply page scale to clipRect if applyPageScaleFactorInCompositor is set to true
> https://bugs.webkit.org/show_bug.cgi?id=111229
>
> Patch by Min Qin <qin...@chromium.org> on 2013-03-04
> Reviewed by Simon Fraser.
>
> If applyPageScaleFactorInCompositor is set to true, webcore should use css coordinates.
> As a result, we shouldn't apply page scale to clipRect in RenderLayerCompositor.
> Layout tests set the flag to false, so we don't have anything to test against.
>
> * rendering/RenderLayerCompositor.cpp:
> (WebCore::RenderLayerCompositor::addToOverlapMap):
TBR=commit-qu...@webkit.org
Review URL: https://codereview.chromium.org/12797016
Modified Paths
Diff
Modified: branches/chromium/1410/Source/WebCore/rendering/RenderLayerCompositor.cpp (146647 => 146648)
--- branches/chromium/1410/Source/WebCore/rendering/RenderLayerCompositor.cpp 2013-03-22 20:24:35 UTC (rev 146647)
+++ branches/chromium/1410/Source/WebCore/rendering/RenderLayerCompositor.cpp 2013-03-22 20:28:29 UTC (rev 146648)
@@ -768,7 +768,9 @@
}
IntRect clipRect = pixelSnappedIntRect(layer->backgroundClipRect(RenderLayer::ClipRectsContext(rootRenderLayer(), 0, AbsoluteClipRects)).rect()); // FIXME: Incorrect for CSS regions.
- clipRect.scale(pageScaleFactor());
+ if (Settings* settings = m_renderView->document()->settings())
+ if (!settings->applyPageScaleFactorInCompositor())
+ clipRect.scale(pageScaleFactor());
clipRect.intersect(layerBounds);
overlapMap.add(layer, clipRect);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
