| 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 30248269a3015d9b7e3a06664c132f5c7bc6a361..88f11ae377e6cf0076039e42c8d00853df9e72e0 100644
|
| --- a/third_party/WebKit/Source/core/css/StyleColor.h
|
| +++ b/third_party/WebKit/Source/core/css/StyleColor.h
|
| @@ -31,46 +31,11 @@
|
| #ifndef StyleColor_h
|
| #define StyleColor_h
|
|
|
| -#include "core/CSSValueKeywords.h"
|
| #include "platform/graphics/Color.h"
|
| -#include "wtf/Allocator.h"
|
| +#include "wtf/Assertions.h"
|
|
|
| namespace blink {
|
|
|
| -class StyleColor {
|
| - DISALLOW_NEW();
|
| -public:
|
| - StyleColor() : m_currentColor(true) { }
|
| - StyleColor(Color color) : m_color(color), m_currentColor(false) { }
|
| - static StyleColor currentColor() { return StyleColor(); }
|
| -
|
| - bool isCurrentColor() const { return m_currentColor; }
|
| - Color getColor() const { ASSERT(!isCurrentColor()); return m_color; }
|
| -
|
| - Color resolve(Color currentColor) const { return m_currentColor ? currentColor : m_color; }
|
| -
|
| - static Color colorFromKeyword(CSSValueID);
|
| - static bool isColorKeyword(CSSValueID);
|
| - static bool isSystemColor(CSSValueID);
|
| -
|
| -private:
|
| - Color m_color;
|
| - bool m_currentColor;
|
| -};
|
| -
|
| -inline bool operator==(const StyleColor& a, const StyleColor& b)
|
| -{
|
| - if (a.isCurrentColor() || b.isCurrentColor())
|
| - return a.isCurrentColor() && b.isCurrentColor();
|
| - return a.getColor() == b.getColor();
|
| -}
|
| -
|
| -inline bool operator!=(const StyleColor& a, const StyleColor& b)
|
| -{
|
| - return !(a == b);
|
| -}
|
| -
|
| -
|
| } // namespace blink
|
|
|
| #endif // StyleColor_h
|
|
|