summaryrefslogtreecommitdiffstats
path: root/gfx
diff options
context:
space:
mode:
authordavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-11 22:40:40 +0000
committerdavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-11 22:40:40 +0000
commitd90617b6b1278a6bdcc239c61bf4d58c1b822704 (patch)
tree9c9df72e3961c72fe7e835c79ed6cc390136eeb4 /gfx
parent965c7661846b63bc5cbe329b689ef406fd341a86 (diff)
downloadchromium_src-d90617b6b1278a6bdcc239c61bf4d58c1b822704.zip
chromium_src-d90617b6b1278a6bdcc239c61bf4d58c1b822704.tar.gz
chromium_src-d90617b6b1278a6bdcc239c61bf4d58c1b822704.tar.bz2
Make drawing consistent with webkit wrt default colors and effects
We weren't drawing the new chromium scrollbars exactly the same as webkit had, causing layout test failures. BUG=NONE TEST=NONE Review URL: http://codereview.chromium.org/3697003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62200 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gfx')
-rw-r--r--gfx/native_theme_linux.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/gfx/native_theme_linux.cc b/gfx/native_theme_linux.cc
index d23cac4c..4768f19 100644
--- a/gfx/native_theme_linux.cc
+++ b/gfx/native_theme_linux.cc
@@ -12,9 +12,9 @@ namespace gfx {
unsigned int NativeThemeLinux::button_length_ = 14;
unsigned int NativeThemeLinux::scrollbar_width_ = 15;
-unsigned int NativeThemeLinux::thumb_inactive_color_ = 0xf0ebe5;
-unsigned int NativeThemeLinux::thumb_active_color_ = 0xfaf8f5;
-unsigned int NativeThemeLinux::track_color_ = 0xe3ddd8;
+unsigned int NativeThemeLinux::thumb_inactive_color_ = 0xeaeaea;
+unsigned int NativeThemeLinux::thumb_active_color_ = 0xf4f4f4;
+unsigned int NativeThemeLinux::track_color_ = 0xd3d3d3;
#if !defined(OS_CHROMEOS)
// Chromeos has a different look.
@@ -379,7 +379,7 @@ SkColor NativeThemeLinux::OutlineColor(SkScalar* hsv1, SkScalar* hsv2) const {
//
// The following code has been tested to look OK with all of the
// default GTK themes.
- SkScalar min_diff = Clamp((hsv1[1] + hsv2[1]) * 1.2, 0.2, 0.5);
+ SkScalar min_diff = Clamp((hsv1[1] + hsv2[1]) * 1.2, 0.28, 0.5);
SkScalar diff = Clamp(fabs(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5);
if (hsv1[2] + hsv2[2] > 1.0)