Remove base/ dependencies from ScrollbarThemeChromiumWin.

webkit/port/platform/chromium/ScrollbarThemeChromiumWin.cpp

Index: webkit/port/platform/chromium/ScrollbarThemeChromiumWin.cpp
===================================================================
--- webkit/port/platform/chromium/ScrollbarThemeChromiumWin.cpp	(revision 6035)
+++ webkit/port/platform/chromium/ScrollbarThemeChromiumWin.cpp	(working copy)
@@ -30,14 +30,9 @@
 #include <vsstyle.h>
 
 #include "ChromiumBridge.h"
-#include "GraphicsContext.h"
-#include "PlatformContextSkia.h"
 #include "PlatformMouseEvent.h"
 #include "Scrollbar.h"
 
-#include "base/gfx/native_theme.h"
-#include "base/win_util.h"
-
 namespace WebCore {
 
 // The scrollbar size in DumpRenderTree on the Mac - so we can match their
@@ -45,11 +40,6 @@
 // Metrics obtained using [NSScroller scrollerWidthForControlSize:]
 static const int kMacScrollbarSize[3] = { 15, 11, 15 };
 
-static bool runningVista()
-{
-    return win_util::GetWinVersion() >= win_util::WINVERSION_VISTA;
-}
-
 static RECT toRECT(const IntRect& input)
 {
     RECT output;
@@ -73,15 +63,14 @@
 
 bool ScrollbarThemeChromium::invalidateOnMouseEnterExit()
 {
-    return runningVista();
+    return ChromiumBridge::runningVista();
 }
 
 void ScrollbarThemeChromium::paintTrackPiece(GraphicsContext* gc, Scrollbar* scrollbar, const IntRect& rect, ScrollbarPart partType)
 {
     bool horz = scrollbar->orientation() == HorizontalScrollbar;
 
-    gfx::PlatformCanvasWin* canvas = gc->platformContext()->canvas();
-    HDC hdc = canvas->beginPlatformPaint();
+    HDC hdc = ChromiumBridge::beginPlatformCanvasPaint(gc);
 
     RECT paintRect = toRECT(rect);
 
@@ -95,24 +84,23 @@
     RECT alignRect = toRECT(trackRect(scrollbar, false));
 
     // Draw the track area before/after the thumb on the scroll bar.
-    gfx::NativeTheme::instance()->PaintScrollbarTrack(
+    ChromiumBridge::paintScrollbarTrack(
         hdc,
         partId,
         getThemeState(scrollbar, partType),
         getClassicThemeState(scrollbar, partType),
         &paintRect,
         &alignRect,
-        gc->platformContext()->canvas());
+        gc);
 
-    canvas->endPlatformPaint();
+    ChromiumBridge::endPlatformCanvasPaint(gc);
 }
 
 void ScrollbarThemeChromium::paintButton(GraphicsContext* gc, Scrollbar* scrollbar, const IntRect& rect, ScrollbarPart part)
 {
     bool horz = scrollbar->orientation() == HorizontalScrollbar;
 
-    gfx::PlatformCanvasWin* canvas = gc->platformContext()->canvas();
-    HDC hdc = canvas->beginPlatformPaint();
+    HDC hdc = ChromiumBridge::beginPlatformCanvasPaint(gc);
 
     RECT paintRect = toRECT(rect);
 
@@ -124,26 +112,25 @@
     }
 
     // Draw the thumb (the box you drag in the scroll bar to scroll).
-    gfx::NativeTheme::instance()->PaintScrollbarArrow(
+    ChromiumBridge::paintScrollbarArrow(
         hdc,
         getThemeArrowState(scrollbar, part),
         partId | getClassicThemeState(scrollbar, part),
         &paintRect);
 
-    canvas->endPlatformPaint();
+    ChromiumBridge::endPlatformCanvasPaint(gc);
 }
 
 void ScrollbarThemeChromium::paintThumb(GraphicsContext* gc, Scrollbar* scrollbar, const IntRect& rect)
 {
     bool horz = scrollbar->orientation() == HorizontalScrollbar;
 
-    gfx::PlatformCanvasWin* canvas = gc->platformContext()->canvas();
-    HDC hdc = canvas->beginPlatformPaint();
+    HDC hdc = ChromiumBridge::beginPlatformCanvasPaint(gc);
 
     RECT paintRect = toRECT(rect);
 
     // Draw the thumb (the box you drag in the scroll bar to scroll).
-    gfx::NativeTheme::instance()->PaintScrollbarThumb(
+    ChromiumBridge::paintScrollbarThumb(
         hdc,
         horz ? SBP_THUMBBTNHORZ : SBP_THUMBBTNVERT,
         getThemeState(scrollbar, ThumbPart),
@@ -151,14 +138,14 @@
         &paintRect);
 
     // Draw the gripper (the three little lines on the thumb).
-    gfx::NativeTheme::instance()->PaintScrollbarThumb(
+    ChromiumBridge::paintScrollbarThumb(
         hdc,
         horz ? SBP_GRIPPERHORZ : SBP_GRIPPERVERT,
         getThemeState(scrollbar, ThumbPart),
         getClassicThemeState(scrollbar, ThumbPart),
         &paintRect);
 
-    canvas->endPlatformPaint();
+    ChromiumBridge::endPlatformCanvasPaint(gc);
 }
 
 int ScrollbarThemeChromium::getThemeState(Scrollbar* scrollbar, ScrollbarPart part) const
@@ -169,12 +156,12 @@
     if (scrollbar->pressedPart() == ThumbPart) {
         if (part == ThumbPart)
             return SCRBS_PRESSED;
-        return runningVista() ? SCRBS_HOVER : SCRBS_NORMAL;
+        return ChromiumBridge::runningVista() ? SCRBS_HOVER : SCRBS_NORMAL;
     }
     if (!scrollbar->enabled())
         return SCRBS_DISABLED;
     if (scrollbar->hoveredPart() != part || part == BackTrackPart || part == ForwardTrackPart)
-        return (scrollbar->hoveredPart() == NoPart || !runningVista()) ? SCRBS_NORMAL : SCRBS_HOVER;
+        return (scrollbar->hoveredPart() == NoPart || !ChromiumBridge::runningVista()) ? SCRBS_NORMAL : SCRBS_HOVER;
     if (scrollbar->pressedPart() == NoPart)
         return SCRBS_HOT;
     return (scrollbar->pressedPart() == part) ? SCRBS_PRESSED : SCRBS_NORMAL;
@@ -188,43 +175,43 @@
     if (part == BackButtonStartPart || part == ForwardButtonStartPart) {
         if (scrollbar->orientation() == HorizontalScrollbar) {
             if (scrollbar->pressedPart() == ThumbPart)
-                return !runningVista() ? ABS_LEFTNORMAL : ABS_LEFTHOVER;
+                return !ChromiumBridge::runningVista() ? ABS_LEFTNORMAL : ABS_LEFTHOVER;
             if (!scrollbar->enabled())
                 return ABS_LEFTDISABLED;
             if (scrollbar->hoveredPart() != part)
-                return ((scrollbar->hoveredPart() == NoPart) || !runningVista()) ? ABS_LEFTNORMAL : ABS_LEFTHOVER;
+                return ((scrollbar->hoveredPart() == NoPart) || !ChromiumBridge::runningVista()) ? ABS_LEFTNORMAL : ABS_LEFTHOVER;
             if (scrollbar->pressedPart() == NoPart)
                 return ABS_LEFTHOT;
             return (scrollbar->pressedPart() == part) ?
                 ABS_LEFTPRESSED : ABS_LEFTNORMAL;
         }
         if (scrollbar->pressedPart() == ThumbPart)
-            return !runningVista() ? ABS_UPNORMAL : ABS_UPHOVER;
+            return !ChromiumBridge::runningVista() ? ABS_UPNORMAL : ABS_UPHOVER;
         if (!scrollbar->enabled())
             return ABS_UPDISABLED;
         if (scrollbar->hoveredPart() != part)
-            return ((scrollbar->hoveredPart() == NoPart) || !runningVista()) ? ABS_UPNORMAL : ABS_UPHOVER;
+            return ((scrollbar->hoveredPart() == NoPart) || !ChromiumBridge::runningVista()) ? 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 !runningVista() ? ABS_RIGHTNORMAL : ABS_RIGHTHOVER;
+            return !ChromiumBridge::runningVista() ? ABS_RIGHTNORMAL : ABS_RIGHTHOVER;
         if (!scrollbar->enabled())
             return ABS_RIGHTDISABLED;
         if (scrollbar->hoveredPart() != part)
-            return ((scrollbar->hoveredPart() == NoPart) || !runningVista()) ? ABS_RIGHTNORMAL : ABS_RIGHTHOVER;
+            return ((scrollbar->hoveredPart() == NoPart) || !ChromiumBridge::runningVista()) ? ABS_RIGHTNORMAL : ABS_RIGHTHOVER;
         if (scrollbar->pressedPart() == NoPart)
             return ABS_RIGHTHOT;
         return (scrollbar->pressedPart() == part) ? ABS_RIGHTPRESSED : ABS_RIGHTNORMAL;
     }
     if (scrollbar->pressedPart() == ThumbPart)
-        return !runningVista() ? ABS_DOWNNORMAL : ABS_DOWNHOVER;
+        return !ChromiumBridge::runningVista() ? ABS_DOWNNORMAL : ABS_DOWNHOVER;
     if (!scrollbar->enabled())
         return ABS_DOWNDISABLED;
     if (scrollbar->hoveredPart() != part)
-        return ((scrollbar->hoveredPart() == NoPart) || !runningVista()) ? ABS_DOWNNORMAL : ABS_DOWNHOVER;
+        return ((scrollbar->hoveredPart() == NoPart) || !ChromiumBridge::runningVista()) ? ABS_DOWNNORMAL : ABS_DOWNHOVER;
     if (scrollbar->pressedPart() == NoPart)
         return ABS_DOWNHOT;
     return (scrollbar->pressedPart() == part) ? ABS_DOWNPRESSED : ABS_DOWNNORMAL;