[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 9a3e0d9019b84501186386644769726e098e8496
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 14 03:52:04 2009 +0000

    2009-10-13  Evan Martin  <evan at chromium.org>
    
            Reviewed by David Levin.
    
            Make grippy lines vertical on horizontal scrollbars in Linux Chrome.
            While we're rebaselining scrollbars, fix an off by one in the vertical
            scrollbar rendering too.
    
            https://bugs.webkit.org/show_bug.cgi?id=30319
    
            Tests: this is covered by every pixel test involving scrollbars.
    
            * platform/chromium/ScrollbarThemeChromiumLinux.cpp:
            (WebCore::ScrollbarThemeChromiumLinux::paintThumb):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49553 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dd60865..7a389d7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2009-10-13  Evan Martin  <evan at chromium.org>
+
+        Reviewed by David Levin.
+
+        Make grippy lines vertical on horizontal scrollbars in Linux Chrome.
+        While we're rebaselining scrollbars, fix an off by one in the vertical
+        scrollbar rendering too.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30319
+
+        Tests: this is covered by every pixel test involving scrollbars.
+
+        * platform/chromium/ScrollbarThemeChromiumLinux.cpp:
+        (WebCore::ScrollbarThemeChromiumLinux::paintThumb):
+
 2009-10-13  Sam Weinig  <sam at webkit.org>
 
         Reviewed by David Hyatt.
diff --git a/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp b/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp
index ed8bf36..64f58c4 100644
--- a/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp
+++ b/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp
@@ -140,9 +140,17 @@ void ScrollbarThemeChromiumLinux::paintThumb(GraphicsContext* gc, Scrollbar* scr
 
     if (rect.height() > 10 && rect.width() > 10) {
         paint.setARGB(0xff, 0x9d, 0x96, 0x8e);
-        drawHorizLine(canvas, midx - 1, midx + 3, midy, paint);
-        drawHorizLine(canvas, midx - 1, midx + 3, midy - 3, paint);
-        drawHorizLine(canvas, midx - 1, midx + 3, midy + 3, paint);
+        const int grippyHalfWidth = 2;
+        const int interGrippyOffset = 3;
+        if (vertical) {
+            drawHorizLine(canvas, midx - grippyHalfWidth, midx + grippyHalfWidth, midy - interGrippyOffset, paint);
+            drawHorizLine(canvas, midx - grippyHalfWidth, midx + grippyHalfWidth, midy,                     paint);
+            drawHorizLine(canvas, midx - grippyHalfWidth, midx + grippyHalfWidth, midy + interGrippyOffset, paint);
+        } else {
+            drawVertLine(canvas, midx - interGrippyOffset, midy - grippyHalfWidth, midy + grippyHalfWidth, paint);
+            drawVertLine(canvas, midx,                     midy - grippyHalfWidth, midy + grippyHalfWidth, paint);
+            drawVertLine(canvas, midx + interGrippyOffset, midy - grippyHalfWidth, midy + grippyHalfWidth, paint);
+        }
     }
 }
 

-- 
WebKit Debian packaging