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

Unified Diff: Source/core/rendering/compositing/RenderLayerCompositor.cpp

Issue 329423002: Delete RenderLayerCompositor::requiresOverhangLayers (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | « Source/core/rendering/compositing/RenderLayerCompositor.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/compositing/RenderLayerCompositor.cpp
diff --git a/Source/core/rendering/compositing/RenderLayerCompositor.cpp b/Source/core/rendering/compositing/RenderLayerCompositor.cpp
index d4fab7723c1051b906d53c92c08299e1c91fdc01..c1660f6cc01400134739e7a064cf1c5c1d30aefd 100644
--- a/Source/core/rendering/compositing/RenderLayerCompositor.cpp
+++ b/Source/core/rendering/compositing/RenderLayerCompositor.cpp
@@ -956,26 +956,10 @@ bool RenderLayerCompositor::requiresScrollCornerLayer() const
return shouldCompositeOverflowControls(view) && view->isScrollCornerVisible();
}
-#if USE(RUBBER_BANDING)
-bool RenderLayerCompositor::requiresOverhangLayers() const
-{
- // We don't want a layer if this is a subframe.
- if (!m_renderView.frame()->isMainFrame())
- return false;
-
- // We do want a layer if we have a scrolling coordinator and can scroll.
- if (scrollingCoordinator() && m_renderView.frameView()->hasOpaqueBackground())
- return true;
-
- // Chromium always wants a layer.
- return true;
-}
-#endif
-
void RenderLayerCompositor::updateOverflowControlsLayers()
{
#if USE(RUBBER_BANDING)
- if (requiresOverhangLayers()) {
+ if (m_renderView.frame()->isMainFrame()) {
if (!m_layerForOverhangShadow) {
m_layerForOverhangShadow = GraphicsLayer::create(graphicsLayerFactory(), this);
OverscrollTheme::theme()->setUpOverhangShadowLayer(m_layerForOverhangShadow.get());
@@ -983,10 +967,7 @@ void RenderLayerCompositor::updateOverflowControlsLayers()
m_scrollLayer->addChild(m_layerForOverhangShadow.get());
}
} else {
- if (m_layerForOverhangShadow) {
- m_layerForOverhangShadow->removeFromParent();
- m_layerForOverhangShadow = nullptr;
- }
+ ASSERT(!m_layerForOverhangShadow);
}
#endif
GraphicsLayer* controlsParent = m_rootTransformLayer.get() ? m_rootTransformLayer.get() : m_overflowControlsHostLayer.get();
« no previous file with comments | « Source/core/rendering/compositing/RenderLayerCompositor.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698