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

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

Issue 10342008: Revert 114283 - Avoid using backing store for compositing layers that just need to clip (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1123/
Patch Set: Created 8 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
===================================================================
--- Source/WebCore/rendering/RenderLayerBacking.cpp (revision 115913)
+++ Source/WebCore/rendering/RenderLayerBacking.cpp (working copy)
@@ -92,7 +92,6 @@
, m_artificiallyInflatedBounds(false)
, m_isMainFrameRenderViewLayer(false)
, m_usingTiledCacheLayer(false)
- , m_requiresOwnBackingStore(true)
#if ENABLE(CSS_FILTERS)
, m_canCompositeFilters(false)
#endif
@@ -566,10 +565,6 @@
}
m_graphicsLayer->setContentsRect(contentsBox());
-
- // If this layer was created just for clipping or to apply perspective, it doesn't need its own backing store.
- setRequiresOwnBackingStore(compositor()->requiresOwnBackingStore(m_owningLayer, compAncestor));
-
updateDrawsContent();
updateAfterWidgetResize();
}
@@ -949,7 +944,7 @@
bool RenderLayerBacking::containsPaintedContent() const
{
- if (isSimpleContainerCompositingLayer() || paintsIntoWindow() || paintsIntoCompositedAncestor() || m_artificiallyInflatedBounds || m_owningLayer->isReflection())
+ if (isSimpleContainerCompositingLayer() || paintsIntoWindow() || m_artificiallyInflatedBounds || m_owningLayer->isReflection())
return false;
if (isDirectlyCompositedImage())
@@ -1107,8 +1102,6 @@
void RenderLayerBacking::setContentsNeedDisplay()
{
- ASSERT(!paintsIntoCompositedAncestor());
-
if (m_graphicsLayer && m_graphicsLayer->drawsContent())
m_graphicsLayer->setNeedsDisplay();
@@ -1122,8 +1115,6 @@
// r is in the coordinate space of the layer's render object
void RenderLayerBacking::setContentsNeedDisplayInRect(const IntRect& r)
{
- ASSERT(!paintsIntoCompositedAncestor());
-
if (m_graphicsLayer && m_graphicsLayer->drawsContent()) {
IntRect layerDirtyRect = r;
layerDirtyRect.move(-m_graphicsLayer->offsetFromRenderer());
@@ -1148,7 +1139,7 @@
PaintBehavior paintBehavior, GraphicsLayerPaintingPhase paintingPhase,
RenderObject* paintingRoot)
{
- if (paintsIntoWindow() || paintsIntoCompositedAncestor()) {
+ if (paintsIntoWindow()) {
ASSERT_NOT_REACHED();
return;
}
« 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