| 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>
|
|
|