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

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit ecac695cf2020d2ba4bdcc0808aef4774e96de82
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 2 20:15:45 2010 +0000

    Fill the scroll corner with white when shouldPaintCustomScrollbars is false
    
    Previously we were only filling with white when
    shouldPaintCustomScrollbars was true but the ChromeClient didn't paint
    any custom scrollbars.
    
    Reviewed by Sam Weinig.
    
    * platform/ScrollbarThemeComposite.cpp:
    (WebCore::ScrollbarThemeComposite::paintScrollCorner):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66683 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 560feff..1f514c1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-02  Adam Roben  <aroben at apple.com>
+
+        Fill the scroll corner with white when shouldPaintCustomScrollbars is
+        false
+
+        Previously we were only filling with white when
+        shouldPaintCustomScrollbars was true but the ChromeClient didn't paint
+        any custom scrollbars.
+
+        Reviewed by Sam Weinig.
+
+        * platform/ScrollbarThemeComposite.cpp:
+        (WebCore::ScrollbarThemeComposite::paintScrollCorner):
+
 2010-09-02  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r66671.
diff --git a/WebCore/platform/ScrollbarThemeComposite.cpp b/WebCore/platform/ScrollbarThemeComposite.cpp
index d28e1c3..fdac14d 100644
--- a/WebCore/platform/ScrollbarThemeComposite.cpp
+++ b/WebCore/platform/ScrollbarThemeComposite.cpp
@@ -296,10 +296,9 @@ void ScrollbarThemeComposite::paintScrollCorner(ScrollView* view, GraphicsContex
 {
     FrameView* frameView = static_cast<FrameView*>(view);
     Page* page = frameView->frame() ? frameView->frame()->page() : 0;
-    if (page && page->settings()->shouldPaintCustomScrollbars()) {
-        if (!page->chrome()->client()->paintCustomScrollCorner(context, cornerRect))
-            context->fillRect(cornerRect, Color::white, DeviceColorSpace);
-    }
+    if (page && page->settings()->shouldPaintCustomScrollbars() && page->chrome()->client()->paintCustomScrollCorner(context, cornerRect))
+        return;
+    context->fillRect(cornerRect, Color::white, DeviceColorSpace);
 }
 
 }

-- 
WebKit Debian packaging