Revert "Make compositingState explicit (re-land #2 with bogus ASSERT removed)"

Source/core/rendering/RenderBoxModelObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 84 matching lines @@
 }
 
 bool RenderBoxModelObject::hasAcceleratedCompositing() const
 {
     return view()->compositor()->hasAcceleratedCompositing();
 }
 
 bool RenderBoxModelObject::startTransition(double timeOffset, CSSPropertyID propertyId, const RenderStyle* fromStyle, const RenderStyle* toStyle)
 {
     ASSERT(hasLayer());
-    ASSERT(compositingState() == PaintsIntoOwnBacking);
+    ASSERT(isComposited());
     return layer()->compositedLayerMapping()->startTransition(timeOffset, propertyId, fromStyle, toStyle);
 }
 
 void RenderBoxModelObject::transitionPaused(double timeOffset, CSSPropertyID propertyId)
 {
     ASSERT(hasLayer());
-    ASSERT(compositingState() == PaintsIntoOwnBacking);
+    ASSERT(isComposited());
     layer()->compositedLayerMapping()->transitionPaused(timeOffset, propertyId);
 }
 
 void RenderBoxModelObject::transitionFinished(CSSPropertyID propertyId)
 {
     ASSERT(hasLayer());
-    ASSERT(compositingState() == PaintsIntoOwnBacking);
+    ASSERT(isComposited());
     layer()->compositedLayerMapping()->transitionFinished(propertyId);
 }
 
 bool RenderBoxModelObject::startAnimation(double timeOffset, const CSSAnimationData* animation, const KeyframeList& keyframes)
 {
     ASSERT(hasLayer());
-    ASSERT(compositingState() == PaintsIntoOwnBacking);
+    ASSERT(isComposited());
     return layer()->compositedLayerMapping()->startAnimation(timeOffset, animation, keyframes);
 }
 
 void RenderBoxModelObject::animationPaused(double timeOffset, const String& name)
 {
     ASSERT(hasLayer());
-    ASSERT(compositingState() == PaintsIntoOwnBacking);
+    ASSERT(isComposited());
     layer()->compositedLayerMapping()->animationPaused(timeOffset, name);
 }
 
 void RenderBoxModelObject::animationFinished(const String& name)
 {
     ASSERT(hasLayer());
-    ASSERT(compositingState() == PaintsIntoOwnBacking);
+    ASSERT(isComposited());
     layer()->compositedLayerMapping()->animationFinished(name);
 }
 
 void RenderBoxModelObject::suspendAnimations(double time)
 {
     ASSERT(hasLayer());
-    ASSERT(compositingState() == PaintsIntoOwnBacking);
+    ASSERT(isComposited());
     layer()->compositedLayerMapping()->suspendAnimations(time);
 }
 
 bool RenderBoxModelObject::shouldPaintAtLowQuality(GraphicsContext* context, Image* image, const void* layer, const LayoutSize& size)
 {
     return ImageQualityController::imageQualityController()->shouldPaintAtLowQuality(context, this, image, layer, size);
 }
 
 RenderBoxModelObject::RenderBoxModelObject(ContainerNode* node)
     : RenderLayerModelObject(node)
@@ skipping 819 matching lines @@
 
 bool RenderBoxModelObject::fixedBackgroundPaintsInLocalCoordinates() const
 {
     if (!isRoot())
         return false;
 
     if (view()->frameView() && view()->frameView()->paintBehavior() & PaintBehaviorFlattenCompositingLayers)
         return false;
 
     RenderLayer* rootLayer = view()->layer();
-    if (!rootLayer || rootLayer->compositingState() == NotComposited)
+    if (!rootLayer || !rootLayer->isComposited())
         return false;
 
     return rootLayer->compositedLayerMapping()->backgroundLayerPaintsFixedRootBackground();
 }
 
 static inline int getSpace(int areaSize, int tileSize)
 {
     int numberOfTiles = areaSize / tileSize;
     int space = -1;
 
@@ skipping 1830 matching lines @@
     ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent());
     for (RenderObject* child = startChild; child && child != endChild; ) {
         // Save our next sibling as moveChildTo will clear it.
         RenderObject* nextSibling = child->nextSibling();
         moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert);
         child = nextSibling;
     }
 }
 
 } // namespace WebCore