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

Source/core/inspector/InspectorLayerTreeAgent.cpp

 /*
  * Copyright (C) 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 186 matching lines @@
         return;
     }
     RenderLayer* enclosingLayer = renderer->enclosingLayer();
     GraphicsLayer* enclosingGraphicsLayer = enclosingLayer->enclosingCompositingLayer()->compositedLayerMapping()->childForSuperlayers();
     buildLayerIdToNodeIdMap(errorString, enclosingLayer, layerIdToNodeIdMap);
     gatherGraphicsLayers(enclosingGraphicsLayer, layerIdToNodeIdMap, layers);
 }
 
 void InspectorLayerTreeAgent::buildLayerIdToNodeIdMap(ErrorString* errorString, RenderLayer* root, LayerIdToNodeIdMap& layerIdToNodeIdMap)
 {
-    if (root->compositedLayerMapping()) {
+    if (root->isComposited()) {
         if (Node* node = root->renderer()->generatingNode()) {
             GraphicsLayer* graphicsLayer = root->compositedLayerMapping()->childForSuperlayers();
             layerIdToNodeIdMap.set(graphicsLayer->platformLayer()->id(), idForNode(errorString, node));
         }
     }
     for (RenderLayer* child = root->firstChild(); child; child = child->nextSibling())
         buildLayerIdToNodeIdMap(errorString, child, layerIdToNodeIdMap);
     if (!root->renderer()->isRenderIFrame())
         return;
     FrameView* childFrameView = toFrameView(toRenderWidget(root->renderer())->widget());
@@ skipping 106 matching lines @@
             continue;
         reasonStrings->addItem(compositingReasonNames[i].protocolName);
 #ifndef _NDEBUG
         reasonsBitmask &= ~compositingReasonNames[i].mask;
 #endif
     }
     ASSERT(!reasonsBitmask);
 }
 
 } // namespace WebCore