Separate backgroundObscurationStatus and hasBoxDecorationBackground

third_party/WebKit/Source/core/layout/LayoutBox.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, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. 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 1324 matching lines @@
     BoxPainter(*this).paint(paintInfo, paintOffset);
 }
 
 void LayoutBox::paintBoxDecorationBackground(const PaintInfo& paintInfo, const LayoutPoint& paintOffset) const
 {
     BoxPainter(*this).paintBoxDecorationBackground(paintInfo, paintOffset);
 }
 
 bool LayoutBox::getBackgroundPaintedExtent(LayoutRect& paintedExtent) const
 {
-    ASSERT(hasBackground());
+    DCHECK(styleRef().hasBackground());
 
     // LayoutView is special in the sense that it expands to the whole canvas,
     // thus can't be handled by this function.
-    ASSERT(!isLayoutView());
+    DCHECK(!isLayoutView());
 
     LayoutRect backgroundRect(borderBoxRect());
 
     Color backgroundColor = resolveColor(CSSPropertyBackgroundColor);
     if (backgroundColor.alpha()) {
         paintedExtent = backgroundRect;
         return true;
     }
 
     if (!style()->backgroundLayers().image() || style()->backgroundLayers().next()) {
@@ skipping 92 matching lines @@
             return true;
     }
     return false;
 }
 
 bool LayoutBox::computeBackgroundIsKnownToBeObscured() const
 {
     if (scrollsOverflow())
         return false;
     // Test to see if the children trivially obscure the background.
-    // FIXME: This test can be much more comprehensive.
-    if (!hasBackground())
+    if (!styleRef().hasBackground())
         return false;
     // Root background painting is special.
     if (isLayoutView())
         return false;
     // FIXME: box-shadow is painted while background painting.
     if (style()->boxShadow())
         return false;
     LayoutRect backgroundRect;
     if (!getBackgroundPaintedExtent(backgroundRect))
         return false;
@@ skipping 3514 matching lines @@
         m_rareData->m_snapAreas->remove(&snapArea);
     }
 }
 
 SnapAreaSet* LayoutBox::snapAreas() const
 {
     return m_rareData ? m_rareData->m_snapAreas.get() : nullptr;
 }
 
 } // namespace blink