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

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

Issue 279643002: Remove dead RenderLayerCompositor::setCompositingParent (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 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 71e559e809cd88b8fddc7cc0969992ce8dd231f2..b18e586402731e5733b6c5e9ea0317ccfad6d5d5 100644
--- a/Source/core/rendering/compositing/RenderLayerCompositor.cpp
+++ b/Source/core/rendering/compositing/RenderLayerCompositor.cpp
@@ -664,31 +664,9 @@ void RenderLayerCompositor::layerWillBeRemoved(RenderLayer* parent, RenderLayer*
repaintInCompositedAncestor(child, child->compositedLayerMapping()->compositedBounds());
}
- setCompositingParent(child, 0);
setCompositingLayersNeedRebuild();
}
-void RenderLayerCompositor::setCompositingParent(RenderLayer* childLayer, RenderLayer* parentLayer)
-{
- ASSERT(!parentLayer || childLayer->ancestorCompositingLayer() == parentLayer);
- ASSERT(childLayer->hasCompositedLayerMapping());
-
- // It's possible to be called with a parent that isn't yet composited when we're doing
- // partial updates as required by painting or hit testing. Just bail in that case;
- // we'll do a full layer update soon.
- if (!parentLayer || !parentLayer->hasCompositedLayerMapping())
- return;
-
- if (parentLayer) {
- GraphicsLayer* hostingLayer = parentLayer->compositedLayerMapping()->parentForSublayers();
- GraphicsLayer* hostedLayer = childLayer->compositedLayerMapping()->childForSuperlayers();
abarth-chromium 2014/05/09 03:02:36 Do parentForSublayers and childForSuperlayers stil
-
- hostingLayer->addChild(hostedLayer);
- } else {
- childLayer->compositedLayerMapping()->childForSuperlayers()->removeFromParent();
- }
-}
-
void RenderLayerCompositor::frameViewDidChangeLocation(const IntPoint& contentsOffset)
{
if (m_overflowControlsHostLayer)
« 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