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

Source/web/LinkHighlight.cpp

 /*
  * Copyright (C) 2012 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 105 matching lines @@
     do {
         repaintContainer = renderer->containerForRepaint();
         if (!repaintContainer) {
             renderer = renderer->frame()->ownerRenderer();
             if (!renderer)
                 return 0;
         }
     } while (!repaintContainer);
     RenderLayer* renderLayer = repaintContainer->layer();
 
-    if (!renderLayer || renderLayer->compositingState() == NotComposited)
+    if (!renderLayer || !renderLayer->isComposited())
         return 0;
 
     GraphicsLayer* newGraphicsLayer = renderLayer->compositedLayerMapping()->mainGraphicsLayer();
     m_clipLayer->setSublayerTransform(SkMatrix44());
 
     if (!newGraphicsLayer->drawsContent()) {
         if (renderLayer->usesCompositedScrolling()) {
             ASSERT(renderLayer->compositedLayerMapping() && renderLayer->compositedLayerMapping()->scrollingContentsLayer());
             newGraphicsLayer = renderLayer->compositedLayerMapping()->scrollingContentsLayer();
         } else
@@ skipping 197 matching lines @@
     // Make sure we update geometry on the next callback from WebViewImpl::layout().
     m_geometryNeedsUpdate = true;
 }
 
 WebLayer* LinkHighlight::layer()
 {
     return clipLayer();
 }
 
 } // namespace WeKit