[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[agl at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit cdd45deee5044ebbdfba27242e219c144262c692
Author: agl at chromium.org <agl at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 8 21:58:50 2009 +0000

    2009-12-08  Adam Langley  <agl at google.com>
    
            Reviewed by Dimitri Glazkov.
    
            Chromium Linux: set default scrollbar colours.
    
            This is so that layout tests have sane defaults for the scrollbar
            colours, even if the API user doesn't set any.
    
            This is a fix due to r51827.
    
            https://bugs.webkit.org/show_bug.cgi?id=32287
    
            This is very well covered by existing layout tests.
    
            * rendering/RenderThemeChromiumLinux.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51872 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dfa51a9..f193742 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2009-12-08  Adam Langley  <agl at google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        Chromium Linux: set default scrollbar colours.
+
+        This is so that layout tests have sane defaults for the scrollbar
+        colours, even if the API user doesn't set any.
+
+        This is a fix due to r51827.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32287
+
+        This is very well covered by existing layout tests.
+
+        * rendering/RenderThemeChromiumLinux.cpp:
+
 2009-12-08  Beth Dakin  <bdakin at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/rendering/RenderThemeChromiumLinux.cpp b/WebCore/rendering/RenderThemeChromiumLinux.cpp
index 2cdea7a..4b09174 100644
--- a/WebCore/rendering/RenderThemeChromiumLinux.cpp
+++ b/WebCore/rendering/RenderThemeChromiumLinux.cpp
@@ -32,9 +32,9 @@
 
 namespace WebCore {
 
-unsigned RenderThemeChromiumLinux::m_thumbInactiveColor = 0;
-unsigned RenderThemeChromiumLinux::m_thumbActiveColor = 0;
-unsigned RenderThemeChromiumLinux::m_trackColor = 0;
+unsigned RenderThemeChromiumLinux::m_thumbInactiveColor = 0xf0ebe5;
+unsigned RenderThemeChromiumLinux::m_thumbActiveColor = 0xfaf8f5;
+unsigned RenderThemeChromiumLinux::m_trackColor = 0xe3ddd8;
 
 PassRefPtr<RenderTheme> RenderThemeChromiumLinux::create()
 {

-- 
WebKit Debian packaging