diff options
| -rw-r--r-- | WebCore/platform/graphics/Color.h | 10 | ||||
| -rw-r--r-- | WebCore/rendering/style/RenderStyle.h | 8 | ||||
| -rw-r--r-- | WebKit/android/nav/SelectText.cpp | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/WebCore/platform/graphics/Color.h b/WebCore/platform/graphics/Color.h index 276e69f..ac5b62f 100644 --- a/WebCore/platform/graphics/Color.h +++ b/WebCore/platform/graphics/Color.h @@ -152,11 +152,11 @@ public: static const RGBA32 transparent = 0x00000000; #ifdef ANDROID_CSS_RING - static const RGBA32 ringFill = 0x80FFC64B; - static const RGBA32 ringPressedInner = 0xFFFEBD3A; - static const RGBA32 ringPressedOuter = 0xFFAD5C0A; - static const RGBA32 ringSelectedInner = 0xFFFE9230; - static const RGBA32 ringSelectedOuter = 0xFFB33F08; + static const RGBA32 ringFill = 0x666699FF; + static const RGBA32 ringPressedInner = 0x006699FF; + static const RGBA32 ringPressedOuter = 0x336699FF; + static const RGBA32 ringSelectedInner = 0xAA6699FF; + static const RGBA32 ringSelectedOuter = 0x336699FF; #endif #ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR static const RGBA32 tap = 0x4D1A1A1A; 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; } diff --git a/WebKit/android/nav/SelectText.cpp b/WebKit/android/nav/SelectText.cpp index ff69ddd..a07fa8c 100644 --- a/WebKit/android/nav/SelectText.cpp +++ b/WebKit/android/nav/SelectText.cpp @@ -1351,8 +1351,8 @@ static WTF::String text(const SkPicture& picture, const SkIRect& area, #define DROP_HEIGHT 4 #define STROKE_COLOR 0x90000000 -#define FILL_GRADIENT_TOP 0xD0F8DFA0 -#define FILL_GRADIENT_BOTTOM 0xD0FFEFEF +#define FILL_GRADIENT_TOP 0xD0AFD835 +#define FILL_GRADIENT_BOTTOM 0xD0CAD284 #define DROP_GRADIENT_TOP 0x50000000 #define DROP_GRADIENT_BOTTOM 0x00000000 @@ -1539,7 +1539,7 @@ void SelectText::drawSelectionRegion(SkCanvas* canvas, IntRect* inval) SkPaint paint; paint.setAntiAlias(true); - paint.setColor(SkColorSetARGB(0x80, 0xFF, 0xA8, 0x00)); + paint.setColor(SkColorSetARGB(0x80, 0x83, 0xCC, 0x39)); canvas->drawPath(path, paint); // experiment to draw touchable controls that resize the selection canvas->save(); |