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

Unified Diff: Source/WebCore/rendering/RenderLayerBacking.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/RenderLayerBacking.h ('k') | Source/WebCore/rendering/RenderLayerCompositor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderLayerBacking.cpp
diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp
index c0b59d1c1cf7da6bd0c713faa7b7a5fb5a844048..5f4d0fc54cbec816e7b781e00685235ed106ec58 100644
--- a/Source/WebCore/rendering/RenderLayerBacking.cpp
+++ b/Source/WebCore/rendering/RenderLayerBacking.cpp
@@ -53,7 +53,6 @@
#include "ScrollingCoordinator.h"
#include "Settings.h"
#include "StyleResolver.h"
-#include "TiledBacking.h"
#include "WebCoreMemoryInstrumentation.h"
#include <wtf/CurrentTime.h>
#include <wtf/text/StringBuilder.h>
@@ -99,7 +98,6 @@ RenderLayerBacking::RenderLayerBacking(RenderLayer* layer)
, m_artificiallyInflatedBounds(false)
, m_boundsConstrainedByClipping(false)
, m_isMainFrameRenderViewLayer(false)
- , m_usingTiledCacheLayer(false)
, m_requiresOwnBackingStore(true)
#if ENABLE(CSS_FILTERS)
, m_canCompositeFilters(false)
@@ -111,12 +109,6 @@ RenderLayerBacking::RenderLayerBacking(RenderLayer* layer)
Page* page = frame ? frame->page() : 0;
if (page && frame && page->mainFrame() == frame) {
m_isMainFrameRenderViewLayer = true;
-
-#if PLATFORM(MAC)
- // FIXME: It's a little weird that we base this decision on whether there's a scrolling coordinator or not.
- if (page->scrollingCoordinator())
- m_usingTiledCacheLayer = true;
-#endif
}
}
@@ -205,9 +197,6 @@ void RenderLayerBacking::createPrimaryGraphicsLayer()
m_graphicsLayer = createGraphicsLayer(layerName);
- if (m_usingTiledCacheLayer)
- m_childContainmentLayer = createGraphicsLayer("TiledBacking Flattening Layer");
-
if (m_isMainFrameRenderViewLayer) {
m_graphicsLayer->setContentsOpaque(true);
m_graphicsLayer->setAppliesPageScale();
@@ -312,9 +301,6 @@ bool RenderLayerBacking::shouldClipCompositedBounds() const
if (layerForHorizontalScrollbar() || layerForVerticalScrollbar())
return false;
- if (m_usingTiledCacheLayer)
- return false;
-
if (!compositor()->compositingConsultsOverlap())
return false;
@@ -439,11 +425,6 @@ bool RenderLayerBacking::updateGraphicsLayerConfiguration()
if (layerConfigChanged)
updateInternalHierarchy();
- if (GraphicsLayer* flatteningLayer = tileCacheFlatteningLayer()) {
- flatteningLayer->removeFromParent();
- m_graphicsLayer->addChild(flatteningLayer);
- }
-
if (updateMaskLayer(renderer->hasMask()))
m_graphicsLayer->setMaskLayer(m_maskLayer.get());
@@ -889,7 +870,7 @@ bool RenderLayerBacking::updateClippingLayers(bool needsAncestorClip, bool needs
}
if (needsDescendantClip) {
- if (!m_childContainmentLayer && !m_usingTiledCacheLayer) {
+ if (!m_childContainmentLayer) {
m_childContainmentLayer = createGraphicsLayer("Child clipping Layer");
m_childContainmentLayer->setMasksToBounds(true);
layersChanged = true;
@@ -1207,22 +1188,6 @@ void RenderLayerBacking::updateBackgroundColor(bool isSimpleContainer)
void RenderLayerBacking::updateRootLayerConfiguration()
{
- if (!m_usingTiledCacheLayer)
- return;
-
- Color backgroundColor;
- bool viewIsTransparent = compositor()->viewHasTransparentBackground(&backgroundColor);
-
- if (m_backgroundLayerPaintsFixedRootBackground && m_backgroundLayer) {
- m_backgroundLayer->setBackgroundColor(backgroundColor);
- m_backgroundLayer->setContentsOpaque(!viewIsTransparent);
-
- m_graphicsLayer->setBackgroundColor(Color());
- m_graphicsLayer->setContentsOpaque(false);
- } else {
- m_graphicsLayer->setBackgroundColor(backgroundColor);
- m_graphicsLayer->setContentsOpaque(!viewIsTransparent);
- }
}
static bool supportsDirectBoxDecorationsComposition(const RenderObject* renderer)
@@ -1566,9 +1531,6 @@ GraphicsLayer* RenderLayerBacking::childForSuperlayers() const
bool RenderLayerBacking::paintsIntoWindow() const
{
- if (m_usingTiledCacheLayer)
- return false;
-
if (m_owningLayer->isRootLayer()) {
return compositor()->rootLayerAttachment() != RenderLayerCompositor::RootLayerAttachedViaEnclosingFrame;
}
@@ -1729,9 +1691,6 @@ void RenderLayerBacking::paintContents(const GraphicsLayer* graphicsLayer, Graph
// We have to use the same root as for hit testing, because both methods can compute and cache clipRects.
paintIntoLayer(graphicsLayer, &context, dirtyRect, PaintBehaviorNormal, paintingPhase);
- if (m_usingTiledCacheLayer)
- renderer()->frame()->view()->setLastPaintTime(currentTime());
-
InspectorInstrumentation::didPaint(renderer(), &context, clip);
} else if (graphicsLayer == layerForHorizontalScrollbar()) {
paintScrollbar(m_owningLayer->horizontalScrollbar(), context, clip);
« no previous file with comments | « Source/WebCore/rendering/RenderLayerBacking.h ('k') | Source/WebCore/rendering/RenderLayerCompositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698