Change rendering code to use RenderObject::resolveColor

Source/core/rendering/RenderThemeChromiumDefault.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 254 matching lines @@
     setSizeIfAuto(style, size);
 }
 
 bool RenderThemeChromiumDefault::paintButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
 {
     WebKit::WebThemeEngine::ExtraParams extraParams;
     WebKit::WebCanvas* canvas = i.context->canvas();
     extraParams.button.hasBorder = true;
     extraParams.button.backgroundColor = defaultButtonBackgroundColor;
     if (o->hasBackground())
-        extraParams.button.backgroundColor = o->style()->visitedDependentColor(CSSPropertyBackgroundColor).rgb();
+        extraParams.button.backgroundColor = o->resolveColor(CSSPropertyBackgroundColor).rgb();
 
     WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartButton, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams);
     return false;
 }
 
 bool RenderThemeChromiumDefault::paintTextField(RenderObject* 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.
     if (o->style()->hasBorderRadius() || o->style()->hasBackgroundImage())
         return true;
 
     ControlPart part = o->style()->appearance();
 
     WebKit::WebThemeEngine::ExtraParams extraParams;
     extraParams.textField.isTextArea = part == TextAreaPart;
     extraParams.textField.isListbox = part == ListboxPart;
 
     WebKit::WebCanvas* canvas = i.context->canvas();
 
     // Fallback to white if the specified color object is invalid.
-    Color backgroundColor(Color::white);
-    if (o->style()->visitedDependentColor(CSSPropertyBackgroundColor).isValid())
-        backgroundColor = o->style()->visitedDependentColor(CSSPropertyBackgroundColor);
+    Color backgroundColor = o->resolveColor(CSSPropertyBackgroundColor, Color::white);
     extraParams.textField.backgroundColor = backgroundColor.rgb();
 
     WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartTextField, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams);
     return false;
 }
 
 bool RenderThemeChromiumDefault::paintMenuList(RenderObject* o, const PaintInfo& i, const IntRect& rect)
 {
     if (!o->isBox())
         return false;
 
     const int right = rect.x() + rect.width();
     const int middle = rect.y() + rect.height() / 2;
 
     WebKit::WebThemeEngine::ExtraParams extraParams;
     extraParams.menuList.arrowX = (o->style()->direction() == RTL) ? rect.x() + 7 : right - 13;
     extraParams.menuList.arrowY = middle;
     const RenderBox* box = toRenderBox(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->style()->hasBorderRadius();
     // Fallback to transparent if the specified color object is invalid.
     extraParams.menuList.backgroundColor = Color::transparent;
     if (o->hasBackground())
-        extraParams.menuList.backgroundColor = o->style()->visitedDependentColor(CSSPropertyBackgroundColor).rgb();
+        extraParams.menuList.backgroundColor = o->resolveColor(CSSPropertyBackgroundColor).rgb();
 
     WebKit::WebCanvas* canvas = i.context->canvas();
 
     WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartMenuList, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams);
     return false;
 }
 
 bool RenderThemeChromiumDefault::paintSliderTrack(RenderObject* o, const PaintInfo& i, const IntRect& rect)
 {
     WebKit::WebThemeEngine::ExtraParams extraParams;
@@ skipping 79 matching lines @@
     WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartProgressBar, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams);
     return false;
 }
 
 bool RenderThemeChromiumDefault::shouldOpenPickerWithF4Key() const
 {
     return true;
 }
 
 } // namespace WebCore