Separate backgroundObscurationStatus and hasBoxDecorationBackground

third_party/WebKit/Source/core/paint/ThemePainterDefault.cpp

 /*
  * Copyright (C) 2007 Apple Inc.
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Collabora Ltd.
  * Copyright (C) 2008, 2009 Google Inc.
  * Copyright (C) 2009 Kenneth Rohde Christiansen
  *
  * 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
@@ skipping 159 matching lines @@
     Platform::current()->themeEngine()->paint(canvas, WebThemeEngine::PartRadio, getWebThemeState(o), WebRect(rect), &extraParams);
     return false;
 }
 
 bool ThemePainterDefault::paintButton(const LayoutObject& o, const PaintInfo& i, const IntRect& rect)
 {
     WebThemeEngine::ExtraParams extraParams;
     WebCanvas* canvas = i.context.canvas();
     extraParams.button.hasBorder = true;
     extraParams.button.backgroundColor = useMockTheme() ? 0xffc0c0c0 : defaultButtonBackgroundColor;
-    if (o.hasBackground())
+    if (o.styleRef().hasBackground())
         extraParams.button.backgroundColor = o.resolveColor(CSSPropertyBackgroundColor).rgb();
 
     Platform::current()->themeEngine()->paint(canvas, WebThemeEngine::PartButton, getWebThemeState(o), WebRect(rect), &extraParams);
     return false;
 }
 
 bool ThemePainterDefault::paintTextField(const LayoutObject& o, const PaintInfo& i, const IntRect& rect)
 {
     // WebThemeEngine does not handle border rounded corner and background image
     // so return true to draw CSS border and background.
@@ skipping 20 matching lines @@
     if (!o.isBox())
         return false;
 
     WebThemeEngine::ExtraParams extraParams;
     const LayoutBox& box = toLayoutBox(o);
     // Match Chromium Win behaviour of showing all borders if any are shown.
     extraParams.menuList.hasBorder = box.borderRight() || box.borderLeft() || box.borderTop() || box.borderBottom();
     extraParams.menuList.hasBorderRadius = o.styleRef().hasBorderRadius();
     // Fallback to transparent if the specified color object is invalid.
     Color backgroundColor(Color::transparent);
-    if (o.hasBackground())
+    if (o.styleRef().hasBackground())
         backgroundColor = o.resolveColor(CSSPropertyBackgroundColor);
     extraParams.menuList.backgroundColor = backgroundColor.rgb();
 
     // If we have a background image, don't fill the content area to expose the
     // parent's background. Also, we shouldn't fill the content area if the
     // alpha of the color is 0. The API of Windows GDI ignores the alpha.
     // FIXME: the normal Aura theme doesn't care about this, so we should
     // investigate if we really need fillContentArea.
     extraParams.menuList.fillContentArea = !o.styleRef().hasBackgroundImage() && backgroundColor.alpha();
 
@@ skipping 160 matching lines @@
         cancelButtonSize, cancelButtonSize);
     IntRect paintingRect = convertToPaintingRect(inputLayoutBox, cancelButtonObject, cancelButtonRect, r);
 
     DEFINE_STATIC_REF(Image, cancelImage, (Image::loadPlatformResource("searchCancel")));
     DEFINE_STATIC_REF(Image, cancelPressedImage, (Image::loadPlatformResource("searchCancelPressed")));
     paintInfo.context.drawImage(LayoutTheme::isPressed(cancelButtonObject) ? cancelPressedImage : cancelImage, paintingRect);
     return false;
 }
 
 } // namespace blink