Title: [144642] trunk/Source/WebCore
- Revision
- 144642
- Author
- [email protected]
- Date
- 2013-03-04 10:23:18 -0800 (Mon, 04 Mar 2013)
Log Message
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 <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (144641 => 144642)
--- trunk/Source/WebCore/ChangeLog 2013-03-04 17:46:51 UTC (rev 144641)
+++ trunk/Source/WebCore/ChangeLog 2013-03-04 18:23:18 UTC (rev 144642)
@@ -1,3 +1,17 @@
+2013-03-04 Min Qin <[email protected]>
+
+ Don't apply page scale to clipRect if applyPageScaleFactorInCompositor is set to true
+ https://bugs.webkit.org/show_bug.cgi?id=111229
+
+ 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):
+
2013-03-04 Ian Vollick <[email protected]>
ASSERTION FAILED: m_clipRectsCache->m_respectingOverflowClip[clipRectsType] == (clipRectsContext.respectOverflowClip == RespectOverflowClip) in RenderLayer.
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (144641 => 144642)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2013-03-04 17:46:51 UTC (rev 144641)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2013-03-04 18:23:18 UTC (rev 144642)
@@ -782,7 +782,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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
