Get rid of CompositingState.

sky/engine/core/rendering/RenderLayerRepainter.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 48 matching lines @@
 {
     // FIXME: boundsRectForPaintInvalidation() has to walk up the parent chain
     // for every layer to compute the rects. We should make this more efficient.
     // FIXME: it's wrong to call this when layout is not up-to-date, which we do.
     m_renderer.setPreviousPaintInvalidationRect(m_renderer.boundsRectForPaintInvalidation(m_renderer.containerForPaintInvalidation()));
     // FIXME: We are only updating the paint invalidation bounds but not
     // the positionFromPaintInvalidationContainer. This means that we may
     // forcing a full invaliation of the new position. Is this really correct?
 
     for (RenderLayer* layer = m_renderer.layer()->firstChild(); layer; layer = layer->nextSibling()) {
-        if (layer->compositingState() != PaintsIntoOwnBacking && layer->compositingState() != PaintsIntoGroupedBacking)
-            layer->paintInvalidator().computePaintInvalidationRectsIncludingNonCompositingDescendants();
+        layer->paintInvalidator().computePaintInvalidationRectsIncludingNonCompositingDescendants();
     }
 }
 
 // Since we're only painting non-composited layers, we know that they all share the same paintInvalidationContainer.
 void RenderLayerRepainter::paintInvalidationIncludingNonCompositingDescendants()
 {
     paintInvalidationIncludingNonCompositingDescendantsInternal(m_renderer.containerForPaintInvalidation());
 }
 
 void RenderLayerRepainter::paintInvalidationIncludingNonCompositingDescendantsInternal(const RenderLayerModelObject* paintInvalidationContainer)
 {
     m_renderer.invalidatePaintUsingContainer(paintInvalidationContainer, m_renderer.previousPaintInvalidationRect(), InvalidationLayer);
 
-    // Disable for reading compositingState() below.
-    DisableCompositingQueryAsserts disabler;
-
     for (RenderLayer* curr = m_renderer.layer()->firstChild(); curr; curr = curr->nextSibling()) {
-        if (curr->compositingState() != PaintsIntoOwnBacking && curr->compositingState() != PaintsIntoGroupedBacking)
-            curr->paintInvalidator().paintInvalidationIncludingNonCompositingDescendantsInternal(paintInvalidationContainer);
+        curr->paintInvalidator().paintInvalidationIncludingNonCompositingDescendantsInternal(paintInvalidationContainer);
     }
 }
 
 LayoutRect RenderLayerRepainter::paintInvalidationRectIncludingNonCompositingDescendants() const
 {
     LayoutRect paintInvalidationRect = m_renderer.previousPaintInvalidationRect();
 
     for (RenderLayer* child = m_renderer.layer()->firstChild(); child; child = child->nextSibling()) {
-        // Don't include paint invalidation rects for composited child layers; they will paint themselves and have a different origin.
-        if (child->compositingState() == PaintsIntoOwnBacking || child->compositingState() == PaintsIntoGroupedBacking)
-            continue;
-
         paintInvalidationRect.unite(child->paintInvalidator().paintInvalidationRectIncludingNonCompositingDescendants());
     }
     return paintInvalidationRect;
 }
 
 void RenderLayerRepainter::setBackingNeedsPaintInvalidationInRect(const LayoutRect& r)
 {
     // FIXME(sky): Remove.
     ASSERT_NOT_REACHED();
 }
@@ skipping 24 matching lines @@
         view->invalidatePaintForRectangle(parentLayerRect);
         return;
     }
 
     ASSERT_NOT_REACHED();
 }
 
 RenderLayer* RenderLayerRepainter::enclosingFilterPaintInvalidationLayer() const
 {
     for (const RenderLayer* curr = m_renderer.layer(); curr; curr = curr->parent()) {
-        if ((curr != m_renderer.layer() && curr->requiresFullLayerImageForFilters()) || curr->compositingState() == PaintsIntoOwnBacking || curr->isRootLayer())
+        if ((curr != m_renderer.layer() && curr->requiresFullLayerImageForFilters()) || curr->isRootLayer())
             return const_cast<RenderLayer*>(curr);
     }
     return 0;
 }
 
 } // namespace blink