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

Source/core/rendering/RenderView.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 421 matching lines @@
 
     ANNOTATE_GRAPHICS_CONTEXT(paintInfo, this);
 
     // This avoids painting garbage between columns if there is a column gap.
     if (m_frameView && m_frameView->pagination().mode != Pagination::Unpaginated)
         paintInfo.context->fillRect(paintInfo.rect, m_frameView->baseBackgroundColor());
 
     paintObject(paintInfo, paintOffset);
 }
 
+static inline bool isComposited(RenderObject* object)
+{
+    return object->hasLayer() && toRenderLayerModelObject(object)->layer()->isComposited();
+}
+
 static inline bool rendererObscuresBackground(RenderObject* rootObject)
 {
     if (!rootObject)
         return false;
 
     RenderStyle* style = rootObject->style();
     if (style->visibility() != VISIBLE
         || style->opacity() != 1
         || style->hasTransform())
         return false;
 
-    if (rootObject->compositingState() == PaintsIntoOwnBacking)
+    if (isComposited(rootObject))
         return false;
 
     const RenderObject* rootRenderer = rootObject->rendererForRootBackground();
     if (rootRenderer->style()->backgroundClip() == TextFillBox)
         return false;
 
     return true;
 }
 
 void RenderView::paintBoxDecorations(PaintInfo& paintInfo, const LayoutPoint&)
@@ skipping 762 matching lines @@
 #endif
 
     if (layoutState)
         layoutState->m_isPaginated = m_fragmenting;
 
     if (m_flowThreadState != RenderObject::NotInsideFlowThread)
         m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState);
 }
 
 } // namespace WebCore