diff options
Diffstat (limited to 'Source/WebCore/platform/chromium/ScrollbarThemeChromiumWin.cpp')
| -rw-r--r-- | Source/WebCore/platform/chromium/ScrollbarThemeChromiumWin.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Source/WebCore/platform/chromium/ScrollbarThemeChromiumWin.cpp b/Source/WebCore/platform/chromium/ScrollbarThemeChromiumWin.cpp index 29e8b44..7229c51 100644 --- a/Source/WebCore/platform/chromium/ScrollbarThemeChromiumWin.cpp +++ b/Source/WebCore/platform/chromium/ScrollbarThemeChromiumWin.cpp @@ -35,7 +35,7 @@ #include "PlatformContextSkia.h" #include "PlatformMouseEvent.h" #include "Scrollbar.h" -#include "WindowsVersion.h" +#include "SystemInfo.h" namespace WebCore { @@ -70,7 +70,7 @@ int ScrollbarThemeChromiumWin::scrollbarThickness(ScrollbarControlSize controlSi bool ScrollbarThemeChromiumWin::invalidateOnMouseEnterExit() { - return isVistaOrNewer(); + return windowsVersion() >= WindowsVista; } bool ScrollbarThemeChromiumWin::shouldSnapBackToDragOrigin(Scrollbar* scrollbar, const PlatformMouseEvent& evt) @@ -160,12 +160,12 @@ int ScrollbarThemeChromiumWin::getThemeState(Scrollbar* scrollbar, ScrollbarPart if (scrollbar->pressedPart() == ThumbPart) { if (part == ThumbPart) return SCRBS_PRESSED; - return isVistaOrNewer() ? SCRBS_HOVER : SCRBS_NORMAL; + return (windowsVersion() < WindowsVista) ? SCRBS_NORMAL : SCRBS_HOVER; } if (!scrollbar->enabled()) return SCRBS_DISABLED; if (scrollbar->hoveredPart() != part || part == BackTrackPart || part == ForwardTrackPart) - return (scrollbar->hoveredPart() == NoPart || !isVistaOrNewer()) ? SCRBS_NORMAL : SCRBS_HOVER; + return (scrollbar->hoveredPart() == NoPart || (windowsVersion() < WindowsVista)) ? SCRBS_NORMAL : SCRBS_HOVER; if (scrollbar->pressedPart() == NoPart) return SCRBS_HOT; return (scrollbar->pressedPart() == part) ? SCRBS_PRESSED : SCRBS_NORMAL; @@ -179,43 +179,43 @@ int ScrollbarThemeChromiumWin::getThemeArrowState(Scrollbar* scrollbar, Scrollba if (part == BackButtonStartPart || part == ForwardButtonStartPart) { if (scrollbar->orientation() == HorizontalScrollbar) { if (scrollbar->pressedPart() == ThumbPart) - return !isVistaOrNewer() ? ABS_LEFTNORMAL : ABS_LEFTHOVER; + return (windowsVersion() < WindowsVista) ? ABS_LEFTNORMAL : ABS_LEFTHOVER; if (!scrollbar->enabled()) return ABS_LEFTDISABLED; if (scrollbar->hoveredPart() != part) - return ((scrollbar->hoveredPart() == NoPart) || !isVistaOrNewer()) ? ABS_LEFTNORMAL : ABS_LEFTHOVER; + return ((scrollbar->hoveredPart() == NoPart) || (windowsVersion() < WindowsVista)) ? ABS_LEFTNORMAL : ABS_LEFTHOVER; if (scrollbar->pressedPart() == NoPart) return ABS_LEFTHOT; return (scrollbar->pressedPart() == part) ? ABS_LEFTPRESSED : ABS_LEFTNORMAL; } if (scrollbar->pressedPart() == ThumbPart) - return !isVistaOrNewer() ? ABS_UPNORMAL : ABS_UPHOVER; + return (windowsVersion() < WindowsVista) ? ABS_UPNORMAL : ABS_UPHOVER; if (!scrollbar->enabled()) return ABS_UPDISABLED; if (scrollbar->hoveredPart() != part) - return ((scrollbar->hoveredPart() == NoPart) || !isVistaOrNewer()) ? ABS_UPNORMAL : ABS_UPHOVER; + return ((scrollbar->hoveredPart() == NoPart) || (windowsVersion() < WindowsVista)) ? ABS_UPNORMAL : ABS_UPHOVER; if (scrollbar->pressedPart() == NoPart) return ABS_UPHOT; return (scrollbar->pressedPart() == part) ? ABS_UPPRESSED : ABS_UPNORMAL; } if (scrollbar->orientation() == HorizontalScrollbar) { if (scrollbar->pressedPart() == ThumbPart) - return !isVistaOrNewer() ? ABS_RIGHTNORMAL : ABS_RIGHTHOVER; + return (windowsVersion() < WindowsVista) ? ABS_RIGHTNORMAL : ABS_RIGHTHOVER; if (!scrollbar->enabled()) return ABS_RIGHTDISABLED; if (scrollbar->hoveredPart() != part) - return ((scrollbar->hoveredPart() == NoPart) || !isVistaOrNewer()) ? ABS_RIGHTNORMAL : ABS_RIGHTHOVER; + return ((scrollbar->hoveredPart() == NoPart) || (windowsVersion() < WindowsVista)) ? ABS_RIGHTNORMAL : ABS_RIGHTHOVER; if (scrollbar->pressedPart() == NoPart) return ABS_RIGHTHOT; return (scrollbar->pressedPart() == part) ? ABS_RIGHTPRESSED : ABS_RIGHTNORMAL; } if (scrollbar->pressedPart() == ThumbPart) - return !isVistaOrNewer() ? ABS_DOWNNORMAL : ABS_DOWNHOVER; + return (windowsVersion() < WindowsVista) ? ABS_DOWNNORMAL : ABS_DOWNHOVER; if (!scrollbar->enabled()) return ABS_DOWNDISABLED; if (scrollbar->hoveredPart() != part) - return ((scrollbar->hoveredPart() == NoPart) || !isVistaOrNewer()) ? ABS_DOWNNORMAL : ABS_DOWNHOVER; + return ((scrollbar->hoveredPart() == NoPart) || (windowsVersion() < WindowsVista)) ? ABS_DOWNNORMAL : ABS_DOWNHOVER; if (scrollbar->pressedPart() == NoPart) return ABS_DOWNHOT; return (scrollbar->pressedPart() == part) ? ABS_DOWNPRESSED : ABS_DOWNNORMAL; |