diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-16 16:25:10 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:14 +0100 |
| commit | ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb (patch) | |
| tree | db769fadd053248f85db67434a5b275224defef7 /Source/WebCore/platform/win/ScrollbarThemeSafari.cpp | |
| parent | 52e2557aeb8477967e97fd24f20f8f407a10fa15 (diff) | |
| download | external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.zip external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.gz external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.bz2 | |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Diffstat (limited to 'Source/WebCore/platform/win/ScrollbarThemeSafari.cpp')
| -rw-r--r-- | Source/WebCore/platform/win/ScrollbarThemeSafari.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/platform/win/ScrollbarThemeSafari.cpp b/Source/WebCore/platform/win/ScrollbarThemeSafari.cpp index 4e979f2..343bbb2 100644 --- a/Source/WebCore/platform/win/ScrollbarThemeSafari.cpp +++ b/Source/WebCore/platform/win/ScrollbarThemeSafari.cpp @@ -32,8 +32,8 @@ #include "IntRect.h" #include "Page.h" #include "PlatformMouseEvent.h" +#include "ScrollableArea.h" #include "Scrollbar.h" -#include "ScrollbarClient.h" #include "ScrollbarThemeWin.h" #include "Settings.h" #include "SoftLinking.h" @@ -209,7 +209,7 @@ void ScrollbarThemeSafari::paintTrackBackground(GraphicsContext* graphicsContext return; NSControlSize size = scrollbar->controlSize() == SmallScrollbar ? NSSmallControlSize : NSRegularControlSize; ThemeControlState state = 0; - if (scrollbar->client()->isActive()) + if (scrollbar->scrollableArea()->isActive()) state |= ActiveState; if (hasButtons(scrollbar)) state |= EnabledState; @@ -222,7 +222,7 @@ void ScrollbarThemeSafari::paintButton(GraphicsContext* graphicsContext, Scrollb return; NSControlSize size = scrollbar->controlSize() == SmallScrollbar ? NSSmallControlSize : NSRegularControlSize; ThemeControlState state = 0; - if (scrollbar->client()->isActive()) + if (scrollbar->scrollableArea()->isActive()) state |= ActiveState; if (hasButtons(scrollbar)) state |= EnabledState; @@ -242,7 +242,7 @@ void ScrollbarThemeSafari::paintThumb(GraphicsContext* graphicsContext, Scrollba return; NSControlSize size = scrollbar->controlSize() == SmallScrollbar ? NSSmallControlSize : NSRegularControlSize; ThemeControlState state = 0; - if (scrollbar->client()->isActive()) + if (scrollbar->scrollableArea()->isActive()) state |= ActiveState; if (hasThumb(scrollbar)) state |= EnabledState; |