Revert r154797: "Move isValid/isCurrentColor from Color to StyleColor"

Source/core/rendering/RenderTheme.cpp

 /**
  * This file is part of the theme implementation for form controls in WebCore.
  *
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc.
  *
  * 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.
  *
@@ skipping 51 matching lines @@
 #if ENABLE(INPUT_SPEECH)
 #include "core/rendering/RenderInputSpeech.h"
 #endif
 
 // The methods in this file are shared by all themes on every platform.
 
 namespace WebCore {
 
 using namespace HTMLNames;
 
-static StyleColor& customFocusRingColor()
+static Color& customFocusRingColor()
 {
-    DEFINE_STATIC_LOCAL(StyleColor, color, ());
+    DEFINE_STATIC_LOCAL(Color, color, ());
     return color;
 }
 
 static WebKit::WebFallbackThemeEngine::State getWebFallbackThemeState(const RenderTheme* theme, const RenderObject* o)
 {
     if (!theme->isEnabled(o))
         return WebKit::WebFallbackThemeEngine::StateDisabled;
     if (theme->isPressed(o))
         return WebKit::WebFallbackThemeEngine::StatePressed;
     if (theme->isHovered(o))
         return WebKit::WebFallbackThemeEngine::StateHover;
 
     return WebKit::WebFallbackThemeEngine::StateNormal;
 }
 
 RenderTheme::RenderTheme()
 #if USE(NEW_THEME)
     : m_platformTheme(platformTheme())
 #endif
 {
-    m_selectionColorsValid = 0;
 }
 
 void RenderTheme::adjustStyle(RenderStyle* style, Element* e, const CachedUAStyle& uaStyle)
 {
     // Force inline and table display styles to be inline-block (except for table- which is block)
     ControlPart part = style->appearance();
     if (style->display() == INLINE || style->display() == INLINE_TABLE || style->display() == TABLE_ROW_GROUP
         || style->display() == TABLE_HEADER_GROUP || style->display() == TABLE_FOOTER_GROUP
         || style->display() == TABLE_ROW || style->display() == TABLE_COLUMN_GROUP || style->display() == TABLE_COLUMN
         || style->display() == TABLE_CELL || style->display() == TABLE_CAPTION)
@@ skipping 414 matching lines @@
     }
 
     return String::format("%s%02d:%02d", (time < 0 ? "-" : ""), minutes, seconds);
 }
 
 String RenderTheme::formatMediaControlsCurrentTime(float currentTime, float /*duration*/) const
 {
     return formatMediaControlsTime(currentTime);
 }
 
-namespace SelectionColors {
-enum {
-    ActiveBackground = 1,
-    InactiveBackground = 2,
-    ActiveForeground = 4,
-    InactiveForeground = 8,
-    ActiveListBoxBackground = 16,
-    InactiveListBoxBackground = 32,
-    ActiveListBoxForeground = 64,
-    InactiveListBoxForeground = 128
-};
-};
-
 Color RenderTheme::activeSelectionBackgroundColor() const
 {
-    if (!(m_selectionColorsValid & SelectionColors::ActiveBackground)) {
+    if (!m_activeSelectionBackgroundColor.isValid())
         m_activeSelectionBackgroundColor = platformActiveSelectionBackgroundColor().blendWithWhite();
-        m_selectionColorsValid |= SelectionColors::ActiveBackground;
-    }
     return m_activeSelectionBackgroundColor;
 }
 
 Color RenderTheme::inactiveSelectionBackgroundColor() const
 {
-    if (!(m_selectionColorsValid & SelectionColors::InactiveBackground)) {
+    if (!m_inactiveSelectionBackgroundColor.isValid())
         m_inactiveSelectionBackgroundColor = platformInactiveSelectionBackgroundColor().blendWithWhite();
-        m_selectionColorsValid |= SelectionColors::InactiveBackground;
-    }
     return m_inactiveSelectionBackgroundColor;
 }
 
 Color RenderTheme::activeSelectionForegroundColor() const
 {
-    if (!(m_selectionColorsValid & SelectionColors::ActiveForeground) && supportsSelectionForegroundColors()) {
+    if (!m_activeSelectionForegroundColor.isValid() && supportsSelectionForegroundColors())
         m_activeSelectionForegroundColor = platformActiveSelectionForegroundColor();
-        m_selectionColorsValid |= SelectionColors::ActiveForeground;
-    }
     return m_activeSelectionForegroundColor;
 }
 
 Color RenderTheme::inactiveSelectionForegroundColor() const
 {
-    if (!(m_selectionColorsValid & SelectionColors::InactiveForeground) && supportsSelectionForegroundColors()) {
+    if (!m_inactiveSelectionForegroundColor.isValid() && supportsSelectionForegroundColors())
         m_inactiveSelectionForegroundColor = platformInactiveSelectionForegroundColor();
-        m_selectionColorsValid |= SelectionColors::InactiveForeground;
-    }
     return m_inactiveSelectionForegroundColor;
 }
 
 Color RenderTheme::activeListBoxSelectionBackgroundColor() const
 {
-    if (!(m_selectionColorsValid & SelectionColors::ActiveListBoxBackground)) {
+    if (!m_activeListBoxSelectionBackgroundColor.isValid())
         m_activeListBoxSelectionBackgroundColor = platformActiveListBoxSelectionBackgroundColor();
-        m_selectionColorsValid |= SelectionColors::ActiveListBoxBackground;
-    }
     return m_activeListBoxSelectionBackgroundColor;
 }
 
 Color RenderTheme::inactiveListBoxSelectionBackgroundColor() const
 {
-    if (!(m_selectionColorsValid & SelectionColors::InactiveListBoxBackground)) {
+    if (!m_inactiveListBoxSelectionBackgroundColor.isValid())
         m_inactiveListBoxSelectionBackgroundColor = platformInactiveListBoxSelectionBackgroundColor();
-        m_selectionColorsValid |= SelectionColors::InactiveListBoxBackground;
-    }
     return m_inactiveListBoxSelectionBackgroundColor;
 }
 
 Color RenderTheme::activeListBoxSelectionForegroundColor() const
 {
-    if (!(m_selectionColorsValid & SelectionColors::ActiveListBoxForeground) && supportsListBoxSelectionForegroundColors()) {
+    if (!m_activeListBoxSelectionForegroundColor.isValid() && supportsListBoxSelectionForegroundColors())
         m_activeListBoxSelectionForegroundColor = platformActiveListBoxSelectionForegroundColor();
-        m_selectionColorsValid |= SelectionColors::ActiveListBoxForeground;
-    }
     return m_activeListBoxSelectionForegroundColor;
 }
 
 Color RenderTheme::inactiveListBoxSelectionForegroundColor() const
 {
-    if (!(m_selectionColorsValid & SelectionColors::InactiveListBoxForeground) && supportsListBoxSelectionForegroundColors()) {
+    if (!m_inactiveListBoxSelectionForegroundColor.isValid() && supportsListBoxSelectionForegroundColors())
         m_inactiveListBoxSelectionForegroundColor = platformInactiveListBoxSelectionForegroundColor();
-        m_selectionColorsValid |= SelectionColors::InactiveListBoxForeground;
-    }
     return m_inactiveListBoxSelectionForegroundColor;
 }
 
 Color RenderTheme::platformActiveSelectionBackgroundColor() const
 {
     // Use a blue color by default if the platform theme doesn't define anything.
     return Color(0, 0, 255);
 }
 
 Color RenderTheme::platformActiveSelectionForegroundColor() const
@@ skipping 61 matching lines @@
     // Code below excludes the background-repeat from comparison by resetting it
     FillLayer backgroundCopy = uaStyle.backgroundLayers;
     FillLayer backgroundLayersCopy = *style.backgroundLayers();
     backgroundCopy.setRepeatX(NoRepeatFill);
     backgroundCopy.setRepeatY(NoRepeatFill);
     backgroundLayersCopy.setRepeatX(NoRepeatFill);
     backgroundLayersCopy.setRepeatY(NoRepeatFill);
     // Test the style to see if the UA border and background match.
     return style.border() != uaStyle.border
         || backgroundLayersCopy != backgroundCopy
-        || style.visitedDependentColor(CSSPropertyBackgroundColor).color() != uaStyle.backgroundColor;
+        || style.visitedDependentColor(CSSPropertyBackgroundColor) != uaStyle.backgroundColor;
 }
 
 bool RenderTheme::isControlStyled(const RenderStyle* style, const CachedUAStyle& uaStyle) const
 {
     switch (style->appearance()) {
     case PushButtonPart:
     case SquareButtonPart:
     case ButtonPart:
     case ProgressBarPart:
     case MeterPart:
@@ skipping 408 matching lines @@
 void RenderTheme::adjustSearchFieldDecorationStyle(RenderStyle*, Element*) const
 {
 }
 
 void RenderTheme::adjustSearchFieldResultsDecorationStyle(RenderStyle*, Element*) const
 {
 }
 
 void RenderTheme::platformColorsDidChange()
 {
-    m_selectionColorsValid = 0;
+    m_activeSelectionForegroundColor = Color();
+    m_inactiveSelectionForegroundColor = Color();
+    m_activeSelectionBackgroundColor = Color();
+    m_inactiveSelectionBackgroundColor = Color();
+
+    m_activeListBoxSelectionForegroundColor = Color();
+    m_inactiveListBoxSelectionForegroundColor = Color();
+    m_activeListBoxSelectionBackgroundColor = Color();
+    m_inactiveListBoxSelectionForegroundColor = Color();
+
     Page::scheduleForcedStyleRecalcForAllPages();
 }
 
 Color RenderTheme::systemColor(CSSValueID cssValueId) const
 {
     switch (cssValueId) {
     case CSSValueActiveborder:
         return 0xFFFFFFFF;
     case CSSValueActivecaption:
         return 0xFFCCCCCC;
@@ skipping 84 matching lines @@
     return theme().platformTapHighlightColor();
 }
 
 void RenderTheme::setCustomFocusRingColor(const Color& c)
 {
     customFocusRingColor() = c;
 }
 
 Color RenderTheme::focusRingColor()
 {
-    return customFocusRingColor().isValid() ? customFocusRingColor().color() : theme().platformFocusRingColor();
+    return customFocusRingColor().isValid() ? customFocusRingColor() : theme().platformFocusRingColor();
 }
 
 String RenderTheme::fileListDefaultLabel(bool multipleFilesAllowed) const
 {
     if (multipleFilesAllowed)
         return fileButtonNoFilesSelectedLabel();
     return fileButtonNoFileSelectedLabel();
 }
 
 String RenderTheme::fileListNameForWidth(const FileList* fileList, const Font& font, int width, bool multipleFilesAllowed) const
@@ skipping 161 matching lines @@
 
     // padding - not honored by WinIE, needs to be removed.
     style->resetPadding();
 
     // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme)
     // for now, we will not honor it.
     style->resetBorder();
 }
 
 } // namespace WebCore