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

Unified Diff: third_party/WebKit/Source/core/paint/PaintLayer.cpp

Issue 2365673002: Fix assertions related to floats and z-order lists when compositing opaque scrollers (Closed)
Patch Set: Created 4 years, 3 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
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/paint/PaintLayer.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayer.cpp b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
index 52ad1408b3d2c41d93722417ea5935d6f6635614..e5977775a7632c0e4de6917883a52d3a08d9f2e4 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayer.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
@@ -2366,10 +2366,11 @@ GraphicsLayer* PaintLayer::graphicsLayerBackingForScrolling() const
bool PaintLayer::canPaintBackgroundOntoScrollingContentsLayer() const
{
- return !isRootLayer()
- && scrollsOverflow()
- && layoutObject()->hasLocalEquivalentBackground()
- && !stackingNode()->hasNegativeZOrderList();
+ if (isRootLayer() || !scrollsOverflow() || !layoutObject()->hasLocalEquivalentBackground())
+ return false;
+
+ m_stackingNode->updateLayerListsIfNeeded();
+ return !m_stackingNode->hasNegativeZOrderList();
}
void PaintLayer::ensureCompositedLayerMapping()
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698