Get rid of CompositingState.

sky/engine/core/rendering/RenderObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1198 matching lines @@
 {
     if (!isRooted())
         return 0;
 
     return adjustCompositedContainerForSpecialAncestors(enclosingCompositedContainer());
 }
 
 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;
 }
 
 const RenderLayerModelObject* RenderObject::adjustCompositedContainerForSpecialAncestors(const RenderLayerModelObject* paintInvalidationContainer) const
 {
     if (paintInvalidationContainer)
         return paintInvalidationContainer;
 
@@ skipping 180 matching lines @@
     fullyInvalidatePaint(paintInvalidationContainer, invalidationReason, oldBounds, newBounds);
     return invalidationReason;
 }
 
 InvalidationReason RenderObject::getPaintInvalidationReason(const RenderLayerModelObject& paintInvalidationContainer,
     const LayoutRect& oldBounds, const LayoutPoint& oldLocation, const LayoutRect& newBounds, const LayoutPoint& newLocation)
 {
     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
     // can match, so we can early out since we will not need to do any
     // invalidation.
     if (oldBounds == newBounds)
         return InvalidationNone;
 
     // If we shifted, we don't know the exact reason so we are conservative and trigger a full invalidation. Shifting could
     // be caused by some layout property (left / top) or some in-flow renderer inserted / removed before us in the tree.
@@ skipping 798 matching lines @@
             maskBoxImage->removeClient(this);
     }
     delete this;
 }
 
 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;
 }
 
 bool RenderObject::hitTest(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestFilter hitTestFilter)
 {
     bool inside = false;
     if (hitTestFilter != HitTestSelf) {
         // First test the foreground layer (lines and inlines).
@@ skipping 341 matching lines @@
 {
     if (object1) {
         const blink::RenderObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
     }
 }
 
 #endif