summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-01-26 19:00:23 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-26 19:00:23 -0800
commit00e7bdac2cb1be80a07ab5f78d2fa4b7210e8026 (patch)
treebab620eed6d637d3d520c1f124607ee00550933a /WebCore/rendering
parentaf1d8497b809bbb7ec0ccd9dec17a091f4d86617 (diff)
parentebcc274d0c5d21345665179b42a632204fbb3db1 (diff)
downloadexternal_webkit-00e7bdac2cb1be80a07ab5f78d2fa4b7210e8026.zip
external_webkit-00e7bdac2cb1be80a07ab5f78d2fa4b7210e8026.tar.gz
external_webkit-00e7bdac2cb1be80a07ab5f78d2fa4b7210e8026.tar.bz2
Merge "Fix bug 3299946 - Holo-fy focus and selection color scheme." into honeycomb
Diffstat (limited to 'WebCore/rendering')
-rw-r--r--WebCore/rendering/style/RenderStyle.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/rendering/style/RenderStyle.h b/WebCore/rendering/style/RenderStyle.h
index c206acd..e86d595 100644
--- a/WebCore/rendering/style/RenderStyle.h
+++ b/WebCore/rendering/style/RenderStyle.h
@@ -1323,14 +1323,14 @@ public:
#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 Length initialRingInnerWidth() { return Length(16, Fixed); } // 1.0
+ static Length initialRingOuterWidth() { return Length(40, Fixed); } // 2.5
+ static Length initialRingOutset() { return Length(3, 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); }
+ static Length initialRingRadius() { return Length(1, Fixed); }
#endif
#ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR
static Color initialTapHighlightColor() { return Color::tap; }