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

[weinig at apple.com]

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

    Fix chromium mac build.
    
    * platform/chromium/ScrollbarThemeChromiumMac.mm:
    (WebCore::scrollbarStateToThemeState):
    (WebCore::ScrollbarThemeChromiumMac::paint):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76387 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 8a1f569..80c3f6a 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,13 @@
 2011-01-21  Sam Weinig  <sam at webkit.org>
 
+        Fix chromium mac build.
+
+        * platform/chromium/ScrollbarThemeChromiumMac.mm:
+        (WebCore::scrollbarStateToThemeState):
+        (WebCore::ScrollbarThemeChromiumMac::paint):
+
+2011-01-21  Sam Weinig  <sam at webkit.org>
+
         Fix the windows build.
 
         * platform/ScrollbarThemeComposite.cpp:
diff --git a/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm b/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm
index 0f49297..fe1a422 100644
--- a/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm
+++ b/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm
@@ -373,7 +373,7 @@ static int scrollbarPartToHIPressedState(ScrollbarPart part)
 static PlatformBridge::ThemePaintState scrollbarStateToThemeState(Scrollbar* scrollbar) {
     if (!scrollbar->enabled())
         return PlatformBridge::StateDisabled;
-    if (!scrollbar->client()->isActive())
+    if (!scrollbar->scrollableArea()->isActive())
         return PlatformBridge::StateInactive;
     if (scrollbar->pressedPart() == ThumbPart)
         return PlatformBridge::StatePressed;
@@ -398,7 +398,7 @@ bool ScrollbarThemeChromiumMac::paint(Scrollbar* scrollbar, GraphicsContext* con
     if (!scrollbar->enabled())
         trackInfo.enableState = kThemeTrackDisabled;
     else
-        trackInfo.enableState = scrollbar->client()->isActive() ? kThemeTrackActive : kThemeTrackInactive;
+        trackInfo.enableState = scrollbar->scrollableArea()->isActive() ? kThemeTrackActive : kThemeTrackInactive;
 
     if (!hasButtons(scrollbar))
         trackInfo.enableState = kThemeTrackNothingToScroll;
@@ -428,7 +428,7 @@ bool ScrollbarThemeChromiumMac::paint(Scrollbar* scrollbar, GraphicsContext* con
     HIThemeDrawTrack(&trackInfo, 0, drawingContext->platformContext(), kHIThemeOrientationNormal);
 
     Vector<IntRect> tickmarks;
-    scrollbar->client()->getTickmarks(tickmarks);
+    scrollbar->scrollableArea()->getTickmarks(tickmarks);
     if (scrollbar->orientation() == VerticalScrollbar && tickmarks.size()) {
         drawingContext->save();
         drawingContext->setShouldAntialias(false);

-- 
WebKit Debian packaging