Make compositingState explicit

Source/core/rendering/RenderBoxModelObject.cpp

Index: Source/core/rendering/RenderBoxModelObject.cpp
diff --git a/Source/core/rendering/RenderBoxModelObject.cpp b/Source/core/rendering/RenderBoxModelObject.cpp
index 932db84e2a01905a1926066b8f1bb04e49f1d64a..489ee84989ce848b4c8b07e814c597dccde73e2f 100644
--- a/Source/core/rendering/RenderBoxModelObject.cpp
+++ b/Source/core/rendering/RenderBoxModelObject.cpp
@@ -102,49 +102,49 @@ bool RenderBoxModelObject::hasAcceleratedCompositing() const
 bool RenderBoxModelObject::startTransition(double timeOffset, CSSPropertyID propertyId, const RenderStyle* fromStyle, const RenderStyle* toStyle)
 {
     ASSERT(hasLayer());
-    ASSERT(isComposited());
+    ASSERT(compositingState() == PaintsIntoOwnBacking);
     return layer()->backing()->startTransition(timeOffset, propertyId, fromStyle, toStyle);
 }
 
 void RenderBoxModelObject::transitionPaused(double timeOffset, CSSPropertyID propertyId)
 {
     ASSERT(hasLayer());
-    ASSERT(isComposited());
+    ASSERT(compositingState() == PaintsIntoOwnBacking);
     layer()->backing()->transitionPaused(timeOffset, propertyId);
 }
 
 void RenderBoxModelObject::transitionFinished(CSSPropertyID propertyId)
 {
     ASSERT(hasLayer());
-    ASSERT(isComposited());
+    ASSERT(compositingState() == PaintsIntoOwnBacking);
     layer()->backing()->transitionFinished(propertyId);
 }
 
 bool RenderBoxModelObject::startAnimation(double timeOffset, const CSSAnimationData* animation, const KeyframeList& keyframes)
 {
     ASSERT(hasLayer());
-    ASSERT(isComposited());
+    ASSERT(compositingState() == PaintsIntoOwnBacking);
     return layer()->backing()->startAnimation(timeOffset, animation, keyframes);
 }
 
 void RenderBoxModelObject::animationPaused(double timeOffset, const String& name)
 {
     ASSERT(hasLayer());
-    ASSERT(isComposited());
+    ASSERT(compositingState() == PaintsIntoOwnBacking);
     layer()->backing()->animationPaused(timeOffset, name);
 }
 
 void RenderBoxModelObject::animationFinished(const String& name)
 {
     ASSERT(hasLayer());
-    ASSERT(isComposited());
+    ASSERT(compositingState() == PaintsIntoOwnBacking);
     layer()->backing()->animationFinished(name);
 }
 
 void RenderBoxModelObject::suspendAnimations(double time)
 {
     ASSERT(hasLayer());
-    ASSERT(isComposited());
+    ASSERT(compositingState() == PaintsIntoOwnBacking);
     layer()->backing()->suspendAnimations(time);
 }
 
@@ -983,7 +983,7 @@ bool RenderBoxModelObject::fixedBackgroundPaintsInLocalCoordinates() const
         return false;
 
     RenderLayer* rootLayer = view()->layer();
-    if (!rootLayer || !rootLayer->isComposited())
+    if (!rootLayer || !rootLayer->backing())

[Ian Vollick, 2013/10/01 19:46:22]

I think that checking backing is fine here, but you could do
paints-into-own-backing since this is the renderView.

[shawnsingh, 2013/10/03 03:04:04]

Done - except, it makes more sense to check if the root layer is NotComposited,
in my opinion, rather than !PaintsIntoOwnBacking. Such conditions used to be
equivalent when compositingState was binary, but now that's not true and
NotComposited is "more correct" to do here.

         return false;
 
     return rootLayer->backing()->backgroundLayerPaintsFixedRootBackground();