[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[estade at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 2be055227acac4aa496cb666f3ebea570d3059f5
Author: estade at chromium.org <estade at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 15 03:18:42 2010 +0000

    2010-07-14  Evan Stade  <estade at chromium.org>
    
            Reviewed by Kent Tamura.
    
            [chromium] Linux scrollbar steppers are "clickable" even when disabled
            https://bugs.webkit.org/show_bug.cgi?id=42231
    
            Not tested by layout tests.
    
            * platform/chromium/ScrollbarThemeChromiumLinux.cpp:
            (WebCore::ScrollbarThemeChromiumLinux::paintButton):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63397 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5007f84..f23156f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-14  Evan Stade  <estade at chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [chromium] Linux scrollbar steppers are "clickable" even when disabled
+        https://bugs.webkit.org/show_bug.cgi?id=42231
+
+        Not tested by layout tests.
+
+        * platform/chromium/ScrollbarThemeChromiumLinux.cpp:
+        (WebCore::ScrollbarThemeChromiumLinux::paintButton):
+
 2010-07-14  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r63389.
diff --git a/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp b/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp
index 289c264..19b4a54 100644
--- a/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp
+++ b/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp
@@ -118,10 +118,12 @@ void ScrollbarThemeChromiumLinux::paintButton(GraphicsContext* gc, Scrollbar* sc
         || (direction == PlatformThemeChromiumGtk::East || direction == PlatformThemeChromiumGtk::South) && scrollbar->currentPos() != scrollbar->maximum())
         states |= EnabledState;
 
-    if (part == scrollbar->pressedPart())
-        states |= PressedState;
-    else if (part == scrollbar->hoveredPart() && states & EnabledState)
-        states |= HoverState;
+    if (states & EnabledState) {
+        if (part == scrollbar->pressedPart())
+            states |= PressedState;
+        else if (part == scrollbar->hoveredPart())
+            states |= HoverState;
+    }
 
     PlatformThemeChromiumGtk::paintArrowButton(gc, rect, direction, states);
 }

-- 
WebKit Debian packaging