blink: Rename enums and functions to not collide with chromium style.

third_party/WebKit/Source/core/css/StyleColor.h

Index: third_party/WebKit/Source/core/css/StyleColor.h
diff --git a/third_party/WebKit/Source/core/css/StyleColor.h b/third_party/WebKit/Source/core/css/StyleColor.h
index c3cb0bca8e728064b7c82610b32c92948b4d8ddb..0bd696d1cbc8c2960d9fbe3a0af780a854888df6 100644
--- a/third_party/WebKit/Source/core/css/StyleColor.h
+++ b/third_party/WebKit/Source/core/css/StyleColor.h
@@ -45,7 +45,7 @@ public:
     static StyleColor currentColor() { return StyleColor(); }
 
     bool isCurrentColor() const { return m_currentColor; }
-    Color color() const { ASSERT(!isCurrentColor()); return m_color; }
+    Color getColor() const { ASSERT(!isCurrentColor()); return m_color; }
 
     Color resolve(Color currentColor) const { return m_currentColor ? currentColor : m_color; }
 
@@ -60,7 +60,7 @@ inline bool operator==(const StyleColor& a, const StyleColor& b)
 {
     if (a.isCurrentColor() || b.isCurrentColor())
         return a.isCurrentColor() && b.isCurrentColor();
-    return a.color() == b.color();
+    return a.getColor() == b.getColor();
 }
 
 inline bool operator!=(const StyleColor& a, const StyleColor& b)