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

Unified Diff: third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp

Issue 2092303002: Never destroy the root content layer unless leaving compositing mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2743
Patch Set: Created 4 years, 6 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 | « no previous file | 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/layout/compositing/PaintLayerCompositor.cpp
diff --git a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp
index 8a5e5b8a42de264d2a1ea828b8ffe88c97fd6920..d222a3e50888812fe4eb33f19c654f271017d0d5 100644
--- a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp
+++ b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp
@@ -435,10 +435,10 @@ void PaintLayerCompositor::updateIfNeeded()
GraphicsLayerTreeBuilder().rebuild(*updateRoot, ancestorInfo);
}
- if (childList.isEmpty())
- destroyRootLayer();
- else if (m_rootContentLayer)
+ if (!childList.isEmpty()) {
+ CHECK(m_rootContentLayer && m_compositing);
m_rootContentLayer->setChildren(childList);
+ }
applyOverlayFullscreenVideoAdjustmentIfNeeded();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698