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

Source/core/rendering/style/StyleRareInheritedData.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
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #ifndef StyleRareInheritedData_h
 #define StyleRareInheritedData_h
 
-#include "core/css/StyleColor.h"
 #include "core/platform/Length.h"
+#include "core/platform/graphics/Color.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/text/AtomicString.h"
 
 #include "core/rendering/style/DataRef.h"
 #include "core/rendering/style/StyleVariableData.h"
 
 namespace WebCore {
 
 class CursorList;
@@ skipping 12 matching lines @@
 
     bool operator==(const StyleRareInheritedData& o) const;
     bool operator!=(const StyleRareInheritedData& o) const
     {
         return !(*this == o);
     }
     bool shadowDataEquivalent(const StyleRareInheritedData&) const;
 
     RefPtr<StyleImage> listStyleImage;
 
-    StyleColor textStrokeColor;
+    Color textStrokeColor;
     float textStrokeWidth;
-    StyleColor textFillColor;
-    StyleColor textEmphasisColor;
+    Color textFillColor;
+    Color textEmphasisColor;
 
-    StyleColor visitedLinkTextStrokeColor;
-    StyleColor visitedLinkTextFillColor;
-    StyleColor visitedLinkTextEmphasisColor;
+    Color visitedLinkTextStrokeColor;
+    Color visitedLinkTextFillColor;
+    Color visitedLinkTextEmphasisColor;
 
     OwnPtr<ShadowData> textShadow; // Our text shadow information for shadowed text drawing.
     AtomicString highlight; // Apple-specific extension for custom highlight rendering.
 
     RefPtr<CursorList> cursorData;
     Length indent;
     float m_effectiveZoom;
 
     // Paged media properties.
     short widows;
@@ skipping 32 matching lines @@
     short hyphenationLimitLines;
 
     AtomicString locale;
 
     AtomicString textEmphasisCustomMark;
     RefPtr<QuotesData> quotes;
 
     AtomicString m_lineGrid;
     unsigned m_tabSize;
 
-    StyleColor tapHighlightColor;
+    Color tapHighlightColor;
 
     DataRef<StyleVariableData> m_variables;
 
 private:
     StyleRareInheritedData();
     StyleRareInheritedData(const StyleRareInheritedData&);
 };
 
 } // namespace WebCore
 
 #endif // StyleRareInheritedData_h