summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/android/RenderThemeAndroid.cpp
diff options
context:
space:
mode:
authorCary Clark <cary@android.com>2011-02-16 07:57:03 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-02-16 07:57:03 -0800
commit0b435a609307d4acb1ad303b67070dff99cb5927 (patch)
tree07392f3b58679130f5a7c5629716ce0fa66fcf78 /WebCore/platform/android/RenderThemeAndroid.cpp
parentab420739ed8c917b526cbe0823415288df13baf8 (diff)
parentf3a90aec9c4763a497ef64d704da10e9625e0da0 (diff)
downloadexternal_webkit-0b435a609307d4acb1ad303b67070dff99cb5927.zip
external_webkit-0b435a609307d4acb1ad303b67070dff99cb5927.tar.gz
external_webkit-0b435a609307d4acb1ad303b67070dff99cb5927.tar.bz2
Merge "match UI text selection background color"
Diffstat (limited to 'WebCore/platform/android/RenderThemeAndroid.cpp')
-rw-r--r--WebCore/platform/android/RenderThemeAndroid.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/WebCore/platform/android/RenderThemeAndroid.cpp b/WebCore/platform/android/RenderThemeAndroid.cpp
index b43e0e6..66f034d 100644
--- a/WebCore/platform/android/RenderThemeAndroid.cpp
+++ b/WebCore/platform/android/RenderThemeAndroid.cpp
@@ -52,9 +52,15 @@ namespace WebCore {
// dropdowns, we want a much smaller height, which encompasses the text.
const int listboxPadding = 5;
-// This is the color of selection in a textfield. It was obtained by checking
-// the color of selection in TextViews in the system.
-const RGBA32 selectionColor = makeRGB(255, 146, 0);
+// This is the color of selection in a textfield. It was computed from
+// frameworks/base/core/res/res/values/colors.xml, which uses #9983CC39
+// (decimal a = 153, r = 131, g = 204, b = 57)
+// for all four highlighted text values. Blending this with white yields:
+// R = (131 * 153 + 255 * (255 - 153)) / 255 -> 180.6
+// G = (204 * 153 + 255 * (255 - 153)) / 255 -> 224.4
+// B = ( 57 * 153 + 255 * (255 - 153)) / 255 -> 136.2
+
+const RGBA32 selectionColor = makeRGB(181, 224, 136);
static SkCanvas* getCanvasFromInfo(const PaintInfo& info)
{