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

Source/core/rendering/style/CollapsedBorderValue.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * 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 16 matching lines @@
 
 #include "core/rendering/style/BorderValue.h"
 
 namespace WebCore {
 
 class CollapsedBorderValue {
 public:
     CollapsedBorderValue()
         : m_color(0)
         , m_colorIsValid(false)
-        , m_currentColor(false)
         , m_width(0)
         , m_style(BNONE)
         , m_precedence(BOFF)
         , m_transparent(false)
     {
     }
 
-    CollapsedBorderValue(const BorderValue& border, const StyleColor& color, EBorderPrecedence precedence)
-        : m_color(color.color())
+    CollapsedBorderValue(const BorderValue& border, const Color& color, EBorderPrecedence precedence)
+        : m_color(color.rgb())
         , m_colorIsValid(color.isValid())
-        , m_currentColor(color.isCurrentColor())
         , m_width(border.nonZero() ? border.width() : 0)
         , m_style(border.style())
         , m_precedence(precedence)
         , m_transparent(border.isTransparent())
     {
     }
 
     unsigned width() const { return m_style > BHIDDEN ? m_width : 0; }
     EBorderStyle style() const { return static_cast<EBorderStyle>(m_style); }
     bool exists() const { return m_precedence != BOFF; }
-    StyleColor color() const { return StyleColor(m_color, m_colorIsValid, m_currentColor); }
+    Color color() const { return Color(m_color, m_colorIsValid); }
     bool isTransparent() const { return m_transparent; }
     EBorderPrecedence precedence() const { return static_cast<EBorderPrecedence>(m_precedence); }
 
     bool isSameIgnoringColor(const CollapsedBorderValue& o) const
     {
         return width() == o.width() && style() == o.style() && precedence() == o.precedence();
     }
 
 private:
-    Color m_color;
+    RGBA32 m_color;
     unsigned m_colorIsValid : 1;
-    unsigned m_currentColor : 1;
-    unsigned m_width : 22;
+    unsigned m_width : 23;
     unsigned m_style : 4; // EBorderStyle
     unsigned m_precedence : 3; // EBorderPrecedence
     unsigned m_transparent : 1;
 };
 
 } // namespace WebCore
 
 #endif // CollapsedBorderValue_h