Revert "Add CSS cursor ring definitions"

This reverts commit 0ed6485271097ecf1b4cf4e790f9cfdbb57d921c.

3 files changed, 0 insertions, 83 deletions

diff --git a/WebCore/rendering/style/RenderStyle.h b/WebCore/rendering/style/RenderStyle.h
index 8c8a8f9..58af7cf 100644
--- a/WebCore/rendering/style/RenderStyle.h
+++ b/WebCore/rendering/style/RenderStyle.h
@@ -715,19 +715,6 @@ public:
     bool textSizeAdjust() const { return rareInheritedData->textSizeAdjust; }
     ETextSecurity textSecurity() const { return static_cast<ETextSecurity>(rareInheritedData->textSecurity); }
 
-#ifdef ANDROID_CSS_RING
-    // called when building nav cache to determine if the ring data is unchanged
-    const void* ringData() const { return reinterpret_cast<const void*>(rareInheritedData.get()); }
-    Color ringFillColor() const { return rareInheritedData->ringFillColor; }
-    Length ringInnerWidth() const { return rareInheritedData->ringInnerWidth; }
-    Length ringOuterWidth() const { return rareInheritedData->ringOuterWidth; }
-    Length ringOutset() const { return rareInheritedData->ringOutset; }
-    Color ringPressedInnerColor() const { return rareInheritedData->ringPressedInnerColor; }
-    Color ringPressedOuterColor() const { return rareInheritedData->ringPressedOuterColor; }
-    Length ringRadius() const { return rareInheritedData->ringRadius; }
-    Color ringSelectedInnerColor() const { return rareInheritedData->ringSelectedInnerColor; }
-    Color ringSelectedOuterColor() const { return rareInheritedData->ringSelectedOuterColor; }
-#endif
 #ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR
     Color tapHighlightColor() const { return rareInheritedData->tapHighlightColor; }
 #endif
@@ -1064,21 +1051,6 @@ public:
     void setTextSizeAdjust(bool b) { SET_VAR(rareInheritedData, textSizeAdjust, b); }
     void setTextSecurity(ETextSecurity aTextSecurity) { SET_VAR(rareInheritedData, textSecurity, aTextSecurity); }
 
-#ifdef ANDROID_CSS_RING
-    void setRingFillColor(const Color& v) { SET_VAR(rareInheritedData, ringFillColor, v); }
-    void setRingInnerWidth(Length v) { SET_VAR(rareInheritedData, ringInnerWidth, v); }
-    void setRingOuterWidth(Length v) { SET_VAR(rareInheritedData, ringOuterWidth, v); }
-    void setRingOutset(Length v) { SET_VAR(rareInheritedData, ringOutset, v); }
-    void setRingPressedInnerColor(const Color& v) {
-        SET_VAR(rareInheritedData, ringPressedInnerColor, v); }
-    void setRingPressedOuterColor(const Color& v) {
-        SET_VAR(rareInheritedData, ringPressedOuterColor, v); }
-    void setRingRadius(Length v) { SET_VAR(rareInheritedData, ringRadius, v); }
-    void setRingSelectedInnerColor(const Color& v) {
-        SET_VAR(rareInheritedData, ringSelectedInnerColor, v); }
-    void setRingSelectedOuterColor(const Color& v) {
-        SET_VAR(rareInheritedData, ringSelectedOuterColor, v); }
-#endif
 #ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR
     void setTapHighlightColor(const Color& v) { SET_VAR(rareInheritedData, tapHighlightColor, v); }
 #endif
@@ -1262,17 +1234,6 @@ public:
     static const Vector<StyleDashboardRegion>& noneDashboardRegions();
 #endif
 
-#ifdef ANDROID_CSS_RING
-    static Color initialRingFillColor() { return Color::ringFill; }
-    static Length initialRingInnerWidth() { return Length(24, Fixed); } // 1.5
-    static Length initialRingOuterWidth() { return Length(52, Fixed); } // 3.25
-    static Length initialRingOutset() { return Length(2, Fixed); }
-    static Color initialRingSelectedInnerColor() { return Color::ringSelectedInner; }
-    static Color initialRingSelectedOuterColor() { return Color::ringSelectedOuter; }
-    static Color initialRingPressedInnerColor() { return Color::ringPressedInner; }
-    static Color initialRingPressedOuterColor() { return Color::ringPressedOuter; }
-    static Length initialRingRadius() { return Length(5, Fixed); }
-#endif
 #ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR
     static Color initialTapHighlightColor() { return Color::tap; }
 #endif
diff --git a/WebCore/rendering/style/StyleRareInheritedData.cpp b/WebCore/rendering/style/StyleRareInheritedData.cpp
index 31012a6..cb6edf3 100644
--- a/WebCore/rendering/style/StyleRareInheritedData.cpp
+++ b/WebCore/rendering/style/StyleRareInheritedData.cpp
@@ -29,17 +29,6 @@ namespace WebCore {
 
 StyleRareInheritedData::StyleRareInheritedData()
     : textStrokeWidth(RenderStyle::initialTextStrokeWidth())
-#ifdef ANDROID_CSS_RING
-    , ringFillColor(RenderStyle::initialRingFillColor())
-    , ringInnerWidth(RenderStyle::initialRingInnerWidth())
-    , ringOuterWidth(RenderStyle::initialRingOuterWidth())
-    , ringOutset(RenderStyle::initialRingOutset())
-    , ringPressedInnerColor(RenderStyle::initialRingPressedInnerColor())
-    , ringPressedOuterColor(RenderStyle::initialRingPressedOuterColor())
-    , ringRadius(RenderStyle::initialRingRadius())
-    , ringSelectedInnerColor(RenderStyle::initialRingSelectedInnerColor())
-    , ringSelectedOuterColor(RenderStyle::initialRingSelectedOuterColor())
-#endif
 #ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR
     , tapHighlightColor(RenderStyle::initialTapHighlightColor())
 #endif
@@ -67,17 +56,6 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
     , textStrokeColor(o.textStrokeColor)
     , textStrokeWidth(o.textStrokeWidth)
     , textFillColor(o.textFillColor)
-#ifdef ANDROID_CSS_RING
-    , ringFillColor(o.ringFillColor)
-    , ringInnerWidth(o.ringInnerWidth)
-    , ringOuterWidth(o.ringOuterWidth)
-    , ringOutset(o.ringOutset)
-    , ringPressedInnerColor(o.ringPressedInnerColor)
-    , ringPressedOuterColor(o.ringPressedOuterColor)
-    , ringRadius(o.ringRadius)
-    , ringSelectedInnerColor(o.ringSelectedInnerColor)
-    , ringSelectedOuterColor(o.ringSelectedOuterColor)
-#endif
 #ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR
     , tapHighlightColor(o.tapHighlightColor)
 #endif
@@ -136,17 +114,6 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
         && nbspMode == o.nbspMode
         && khtmlLineBreak == o.khtmlLineBreak
         && textSizeAdjust == o.textSizeAdjust
-#ifdef ANDROID_CSS_RING
-        && ringFillColor == o.ringFillColor
-        && ringInnerWidth == o.ringInnerWidth
-        && ringOuterWidth == o.ringOuterWidth
-        && ringOutset == o.ringOutset
-        && ringPressedInnerColor == o.ringPressedInnerColor
-        && ringPressedOuterColor == o.ringPressedOuterColor
-        && ringRadius == o.ringRadius
-        && ringSelectedInnerColor == o.ringSelectedInnerColor
-        && ringSelectedOuterColor == o.ringSelectedOuterColor
-#endif
 #ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR
         && tapHighlightColor == o.tapHighlightColor
 #endif
diff --git a/WebCore/rendering/style/StyleRareInheritedData.h b/WebCore/rendering/style/StyleRareInheritedData.h
index b32392d..f6e3bf4 100644
--- a/WebCore/rendering/style/StyleRareInheritedData.h
+++ b/WebCore/rendering/style/StyleRareInheritedData.h
@@ -55,17 +55,6 @@ public:
     Color textStrokeColor;
     float textStrokeWidth;
     Color textFillColor;
-#ifdef ANDROID_CSS_RING
-    Color ringFillColor;
-    Length ringInnerWidth;
-    Length ringOuterWidth;
-    Length ringOutset;
-    Color ringPressedInnerColor;
-    Color ringPressedOuterColor;
-    Length ringRadius;
-    Color ringSelectedInnerColor;
-    Color ringSelectedOuterColor;
-#endif
 #ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR
     Color tapHighlightColor;
 #endif