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

Unified Diff: sky/engine/core/rendering/RenderObject.cpp

Issue 735033003: Remove a bunch of dead code from RenderLayer (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: cr comments Created 6 years, 1 month 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 | « sky/engine/core/rendering/RenderObject.h ('k') | sky/engine/core/rendering/RenderReplaced.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderObject.cpp
diff --git a/sky/engine/core/rendering/RenderObject.cpp b/sky/engine/core/rendering/RenderObject.cpp
index 8aed3d1adfaf65d8adc7a8d7c3eca4177f5d4533..5d3f23e502468025c7c66f96a86ebb27eb5ca426 100644
--- a/sky/engine/core/rendering/RenderObject.cpp
+++ b/sky/engine/core/rendering/RenderObject.cpp
@@ -1207,32 +1207,15 @@ void RenderObject::paint(PaintInfo&, const LayoutPoint&)
const RenderLayerModelObject* RenderObject::containerForPaintInvalidation() const
{
- if (!isRooted())
- return 0;
-
- return adjustCompositedContainerForSpecialAncestors(enclosingCompositedContainer());
-}
-
-const RenderLayerModelObject* RenderObject::enclosingCompositedContainer() const
-{
- RenderLayerModelObject* container = 0;
- if (RenderLayer* compositingLayer = enclosingLayer()->enclosingLayerForPaintInvalidationCrossingFrameBoundaries())
- container = compositingLayer->renderer();
- return container;
+ return isRooted() ? view() : 0;
}
const RenderLayerModelObject* RenderObject::adjustCompositedContainerForSpecialAncestors(const RenderLayerModelObject* paintInvalidationContainer) const
{
+ // FIXME(sky): We shouldn't have any special ancestors and we don't have composited containers
if (paintInvalidationContainer)
return paintInvalidationContainer;
-
- RenderView* renderView = view();
- return renderView;
-}
-
-bool RenderObject::isPaintInvalidationContainer() const
-{
- return hasLayer() && toRenderLayerModelObject(this)->layer()->isPaintInvalidationContainer();
+ return view();
}
template <typename T>
« no previous file with comments | « sky/engine/core/rendering/RenderObject.h ('k') | sky/engine/core/rendering/RenderReplaced.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698