Index: webkit/glue/webthemeengine_impl_mac.cc |
diff --git a/webkit/glue/webthemeengine_impl_mac.cc b/webkit/glue/webthemeengine_impl_mac.cc |
index 4ffb6b455ee211d5a680fa11ab7949964cff182d..cab83213c345e1c9d669763f56975190483b92de 100644 |
--- a/webkit/glue/webthemeengine_impl_mac.cc |
+++ b/webkit/glue/webthemeengine_impl_mac.cc |
@@ -6,13 +6,10 @@ |
#include <Carbon/Carbon.h> |
+#include "skia/ext/skia_utils_mac.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCanvas.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" |
-#if WEBKIT_USING_SKIA |
-#include "skia/ext/skia_utils_mac.h" |
-#endif |
- |
using WebKit::WebCanvas; |
using WebKit::WebRect; |
using WebKit::WebThemeEngine; |
@@ -56,12 +53,8 @@ void WebThemeEngineImpl::paintScrollbarThumb( |
trackInfo.trackInfo.scrollbar.pressState = |
state == WebThemeEngine::StatePressed ? kThemeThumbPressed : 0; |
trackInfo.attributes |= (kThemeTrackShowThumb | kThemeTrackHideTrack); |
-#if WEBKIT_USING_SKIA |
gfx::SkiaBitLocker bitLocker(canvas); |
CGContextRef cgContext = bitLocker.cgContext(); |
-#else |
- CGContextRef cgContext = canvas; |
-#endif |
HIThemeDrawTrack(&trackInfo, 0, cgContext, kHIThemeOrientationNormal); |
} |