| Index: sky/engine/core/rendering/RenderObject.cpp
|
| diff --git a/sky/engine/core/rendering/RenderObject.cpp b/sky/engine/core/rendering/RenderObject.cpp
|
| index 97c7478bf0e6fc532dbca6c9a01213c8bdda19bc..8aed3d1adfaf65d8adc7a8d7c3eca4177f5d4533 100644
|
| --- a/sky/engine/core/rendering/RenderObject.cpp
|
| +++ b/sky/engine/core/rendering/RenderObject.cpp
|
| @@ -1216,9 +1216,6 @@ const RenderLayerModelObject* RenderObject::containerForPaintInvalidation() cons
|
| const RenderLayerModelObject* RenderObject::enclosingCompositedContainer() const
|
| {
|
| RenderLayerModelObject* container = 0;
|
| - // FIXME: CompositingState is not necessarily up to date for many callers of this function.
|
| - DisableCompositingQueryAsserts disabler;
|
| -
|
| if (RenderLayer* compositingLayer = enclosingLayer()->enclosingLayerForPaintInvalidationCrossingFrameBoundaries())
|
| container = compositingLayer->renderer();
|
| return container;
|
| @@ -1419,7 +1416,7 @@ InvalidationReason RenderObject::getPaintInvalidationReason(const RenderLayerMod
|
| if (shouldDoFullPaintInvalidation())
|
| return InvalidationFull;
|
|
|
| - if (compositingState() != PaintsIntoOwnBacking && newLocation != oldLocation)
|
| + if (newLocation != oldLocation)
|
| return InvalidationLocationChange;
|
|
|
| // If the bounds are the same then we know that none of the statements below
|
| @@ -2238,11 +2235,6 @@ PositionWithAffinity RenderObject::positionForPoint(const LayoutPoint&)
|
| return createPositionWithAffinity(caretMinOffset(), DOWNSTREAM);
|
| }
|
|
|
| -CompositingState RenderObject::compositingState() const
|
| -{
|
| - return hasLayer() ? toRenderLayerModelObject(this)->layer()->compositingState() : NotComposited;
|
| -}
|
| -
|
| CompositingReasons RenderObject::additionalCompositingReasons() const
|
| {
|
| return CompositingReasonNone;
|
|
|