Separate backgroundObscurationStatus and hasBoxDecorationBackground

third_party/WebKit/Source/core/layout/LayoutBoxModelObject.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 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google 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
@@ skipping 470 matching lines @@
         // line boxes, so descendants don't need to add line boxes again. For example, if the parent
         // is a LayoutBlock, it adds rects for its RootOutlineBoxes which cover the line boxes of
         // this LayoutInline. So the LayoutInline needs to add rects for children and continuations only.
         toLayoutInline(descendant).addOutlineRectsForChildrenAndContinuations(rects, additionalOffset, includeBlockOverflows);
         return;
     }
 
     descendant.addOutlineRects(rects, additionalOffset, includeBlockOverflows);
 }
 
-bool LayoutBoxModelObject::calculateHasBoxDecorations() const
-{
-    const ComputedStyle& styleToUse = styleRef();
-    return hasBackground() || styleToUse.hasBorderDecoration() || styleToUse.hasAppearance() || styleToUse.boxShadow();
-}
-
 bool LayoutBoxModelObject::hasNonEmptyLayoutSize() const
 {
     for (const LayoutBoxModelObject* root = this; root; root = root->continuation()) {
         for (const LayoutObject* object = root; object; object = object->nextInPreOrder(object)) {
             if (object->isBox()) {
                 const LayoutBox& box = toLayoutBox(*object);
                 if (box.logicalHeight() && box.logicalWidth())
                     return true;
             } else if (object->isLayoutInline()) {
                 const LayoutInline& layoutInline = toLayoutInline(*object);
                 if (!layoutInline.linesBoundingBox().isEmpty())
                     return true;
             } else {
                 ASSERT(object->isText());
             }
         }
     }
     return false;
 }
 
 void LayoutBoxModelObject::updateFromStyle()
 {
     const ComputedStyle& styleToUse = styleRef();
-    setHasBoxDecorationBackground(calculateHasBoxDecorations());
+    setHasBoxDecorationBackground(styleToUse.hasBoxDecorationBackground());
     setInline(styleToUse.isDisplayInlineType());
     setPositionState(styleToUse.position());
     setHorizontalWritingMode(styleToUse.isHorizontalWritingMode());
 }
 
 LayoutBlock* LayoutBoxModelObject::containingBlockForAutoHeightDetection(Length logicalHeight) const
 {
     // For percentage heights: The percentage is calculated with respect to the height of the generated box's
     // containing block. If the height of the containing block is not specified explicitly (i.e., it depends
     // on content height), and this element is not absolutely positioned,  the used height is calculated
@@ skipping 604 matching lines @@
     if (rootElementStyle->hasBackground())
         return false;
 
     if (node() != document().firstBodyElement())
         return false;
 
     return true;
 }
 
 } // namespace blink