Chromium Code Reviews

Unified Diff: Source/core/rendering/RenderLayerScrollableArea.cpp

Issue 506553004: Make the compositing assert disabler for paint invalidation more targeted. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
« no previous file with comments | « Source/core/rendering/RenderLayer.cpp ('k') | Source/core/rendering/RenderObject.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderLayerScrollableArea.cpp
diff --git a/Source/core/rendering/RenderLayerScrollableArea.cpp b/Source/core/rendering/RenderLayerScrollableArea.cpp
index 20df23b7ae2f22478e4727bd197767d7039116d9..d1caf1c5b142e0f294191bb5b73165c4550aae8f 100644
--- a/Source/core/rendering/RenderLayerScrollableArea.cpp
+++ b/Source/core/rendering/RenderLayerScrollableArea.cpp
@@ -403,6 +403,9 @@ void RenderLayerScrollableArea::setScrollOffset(const IntPoint& newScrollOffset)
// Just schedule a full paint invalidation of our object.
if (requiresPaintInvalidation) {
+ // For querying RenderLayer::compositingState()
+ // This code appears correct, since scrolling outside of layout happens during activities that do not dirty compositing state.
+ DisableCompositingQueryAsserts disabler;
if (box().frameView()->isInPerformLayout())
box().setShouldDoFullPaintInvalidation(true);
else
« no previous file with comments | « Source/core/rendering/RenderLayer.cpp ('k') | Source/core/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine