[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[bdakin at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 95928e5d63bec0aebe264549fd42e7dd947c893a
Author: bdakin at apple.com <bdakin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 21 01:59:14 2011 +0000

    Follow-on for <rdar://problem/8890255>
    
    Reviewed by Anders Carlsson.
    
    This fixes a painting error with ScrollbarPainter scrollers
    and the new drawing area code path.
    * platform/mac/ScrollbarThemeMac.mm:
    (WebCore::updateArrowPlacement):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76318 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 8bebc1c..c34984c 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-20  Beth Dakin  <bdakin at apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        Follow-on for <rdar://problem/8890255>
+
+        This fixes a painting error with ScrollbarPainter scrollers
+        and the new drawing area code path.
+        * platform/mac/ScrollbarThemeMac.mm:
+        (WebCore::updateArrowPlacement):
+
 2011-01-20  Levi Weintraub  <leviw at chromium.org>
 
         Unreviewed.
diff --git a/Source/WebCore/platform/mac/ScrollbarThemeMac.mm b/Source/WebCore/platform/mac/ScrollbarThemeMac.mm
index d27a3c6..ee1f5ed 100644
--- a/Source/WebCore/platform/mac/ScrollbarThemeMac.mm
+++ b/Source/WebCore/platform/mac/ScrollbarThemeMac.mm
@@ -135,6 +135,9 @@ static ScrollbarButtonsPlacement gButtonPlacement = ScrollbarButtonsDoubleEnd;
 
 static void updateArrowPlacement()
 {
+#if defined(USE_WK_SCROLLBAR_PAINTER)
+    gButtonPlacement = ScrollbarButtonsNone;
+#else
     NSString *buttonPlacement = [[NSUserDefaults standardUserDefaults] objectForKey:@"AppleScrollBarVariant"];
     if ([buttonPlacement isEqualToString:@"Single"])
         gButtonPlacement = ScrollbarButtonsSingle;
@@ -144,6 +147,7 @@ static void updateArrowPlacement()
         gButtonPlacement = ScrollbarButtonsDoubleBoth;
     else
         gButtonPlacement = ScrollbarButtonsDoubleEnd; // The default is ScrollbarButtonsDoubleEnd.
+#endif
 }
 
 void ScrollbarThemeMac::registerScrollbar(Scrollbar* scrollbar)

-- 
WebKit Debian packaging