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

Unified Diff: Source/WebCore/rendering/RenderLayerCompositor.cpp

Issue 13818029: Remove TiledBacking / TileCache code (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebased Created 7 years, 8 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/WebCore/rendering/RenderLayerCompositor.h ('k') | Source/WebCore/testing/Internals.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderLayerCompositor.cpp
diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp
index a78d0ef138c919e9f53d46e6a1801c5c9a247b88..9bf9b905cb1a2b9af7ba8c6aaa15d848a746ace2 100644
--- a/Source/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp
@@ -2030,15 +2030,6 @@ bool RenderLayerCompositor::needsContentsCompositingLayer(const RenderLayer* lay
return layer->hasNegativeZOrderList();
}
-bool RenderLayerCompositor::requiresScrollLayer(RootLayerAttachment attachment) const
-{
- // This applies when the application UI handles scrolling, in which case RenderLayerCompositor doesn't need to manage it.
- if (m_renderView->frameView()->delegatesScrolling())
- return false;
-
- return true;
-}
-
static void paintScrollbar(Scrollbar* scrollbar, GraphicsContext& context, const IntRect& clip)
{
if (!scrollbar)
@@ -2466,45 +2457,37 @@ void RenderLayerCompositor::ensureRootLayer()
m_rootContentLayer->setMasksToBounds(true);
}
- if (requiresScrollLayer(expectedAttachment)) {
- if (!m_overflowControlsHostLayer) {
- ASSERT(!m_scrollLayer);
- ASSERT(!m_clipLayer);
+ if (!m_overflowControlsHostLayer) {
+ ASSERT(!m_scrollLayer);
+ ASSERT(!m_clipLayer);
- // Create a layer to host the clipping layer and the overflow controls layers.
- m_overflowControlsHostLayer = GraphicsLayer::create(graphicsLayerFactory(), this);
+ // Create a layer to host the clipping layer and the overflow controls layers.
+ m_overflowControlsHostLayer = GraphicsLayer::create(graphicsLayerFactory(), this);
#ifndef NDEBUG
- m_overflowControlsHostLayer->setName("overflow controls host");
+ m_overflowControlsHostLayer->setName("overflow controls host");
#endif
- // Create a clipping layer if this is an iframe
- m_clipLayer = GraphicsLayer::create(graphicsLayerFactory(), this);
+ // Create a clipping layer if this is an iframe
+ m_clipLayer = GraphicsLayer::create(graphicsLayerFactory(), this);
#ifndef NDEBUG
- m_clipLayer->setName("frame clipping");
+ m_clipLayer->setName("frame clipping");
#endif
- m_clipLayer->setMasksToBounds(true);
-
- m_scrollLayer = GraphicsLayer::create(graphicsLayerFactory(), this);
+ m_clipLayer->setMasksToBounds(true);
+
+ m_scrollLayer = GraphicsLayer::create(graphicsLayerFactory(), this);
#ifndef NDEBUG
- m_scrollLayer->setName("frame scrolling");
+ m_scrollLayer->setName("frame scrolling");
#endif
- if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
- scrollingCoordinator->setLayerIsContainerForFixedPositionLayers(m_scrollLayer.get(), true);
+ if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
+ scrollingCoordinator->setLayerIsContainerForFixedPositionLayers(m_scrollLayer.get(), true);
- // Hook them up
- m_overflowControlsHostLayer->addChild(m_clipLayer.get());
- m_clipLayer->addChild(m_scrollLayer.get());
- m_scrollLayer->addChild(m_rootContentLayer.get());
+ // Hook them up
+ m_overflowControlsHostLayer->addChild(m_clipLayer.get());
+ m_clipLayer->addChild(m_scrollLayer.get());
+ m_scrollLayer->addChild(m_rootContentLayer.get());
- frameViewDidChangeSize();
- frameViewDidScroll();
- }
- } else {
- if (m_overflowControlsHostLayer) {
- m_overflowControlsHostLayer = nullptr;
- m_clipLayer = nullptr;
- m_scrollLayer = nullptr;
- }
+ frameViewDidChangeSize();
+ frameViewDidScroll();
}
// Check to see if we have to change the attachment
« no previous file with comments | « Source/WebCore/rendering/RenderLayerCompositor.h ('k') | Source/WebCore/testing/Internals.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698