Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1571)

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

Issue 131543013: Update scroll parent correctly for squashing layers. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: . Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/RenderLayer.cpp
diff --git a/Source/core/rendering/RenderLayer.cpp b/Source/core/rendering/RenderLayer.cpp
index 9ff127f6f537d2f806cc3a4ce0bf1d84141bd25f..989a568f410da300be2684e4b843a737e68e0267 100644
--- a/Source/core/rendering/RenderLayer.cpp
+++ b/Source/core/rendering/RenderLayer.cpp
@@ -195,6 +195,10 @@ RenderLayerCompositor* RenderLayer::compositor() const
void RenderLayer::contentChanged(ContentChangeType changeType)
{
+ // updateLayerCompositingState will query compositingReasons for accelerated overflow scrolling.
+ // This is tripped by LayoutTests/compositing/content-changed-chicken-egg.html
+ DisableCompositingQueryAsserts disabler;
+
// This can get called when video becomes accelerated, so the layers may change.
if (changeType == CanvasChanged || changeType == VideoChanged || changeType == FullScreenChanged)
compositor()->updateLayerCompositingState(this);

Powered by Google App Engine
This is Rietveld 408576698