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

weinig at apple.com weinig at apple.com
Sun Feb 20 23:34:52 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 514d09c72401ccc2678cabc249d2d782b63ee7dc
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 21 21:08:45 2011 +0000

    Fix the windows build.
    
    * platform/ScrollbarThemeComposite.cpp:
    (WebCore::ScrollbarThemeComposite::paint):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76385 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 7687c3e..8a1f569 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-21  Sam Weinig  <sam at webkit.org>
+
+        Fix the windows build.
+
+        * platform/ScrollbarThemeComposite.cpp:
+        (WebCore::ScrollbarThemeComposite::paint):
+
 2011-01-21  Chris Rogers  <crogers at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/Source/WebCore/platform/ScrollbarThemeComposite.cpp b/Source/WebCore/platform/ScrollbarThemeComposite.cpp
index ec5f308..7bc266f 100644
--- a/Source/WebCore/platform/ScrollbarThemeComposite.cpp
+++ b/Source/WebCore/platform/ScrollbarThemeComposite.cpp
@@ -104,7 +104,7 @@ bool ScrollbarThemeComposite::paint(Scrollbar* scrollbar, GraphicsContext* graph
             float proportion = static_cast<float>(scrollbar->visibleSize()) / scrollbar->totalSize();
             float value = scrollbar->currentPos() / static_cast<float>(scrollbar->maximum());
             ScrollbarControlState s = 0;
-            if (scrollbar->client()->isActive())
+            if (scrollbar->scrollableArea()->isActive())
                 s |= ActiveScrollbarState;
             if (scrollbar->enabled())
                 s |= EnabledScrollbarState;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list