diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 19:32:04 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 19:32:04 +0000 |
| commit | c91f49440d1251103210637f91567849e0ade62a (patch) | |
| tree | 2ccbd87b3519bdf2d08c874c448fdeb50c4a7745 /webkit/glue/webthemeengine_impl_mac.cc | |
| parent | 871da305e61696753db715bf68fedec2b071fde4 (diff) | |
| download | chromium_src-c91f49440d1251103210637f91567849e0ade62a.zip chromium_src-c91f49440d1251103210637f91567849e0ade62a.tar.gz chromium_src-c91f49440d1251103210637f91567849e0ade62a.tar.bz2 | |
remove WEBKIT_USING_SKIA
WEBKIT_USING_SKIA is always set, so having the #ifdef isn't helpful. This
just removes the guards.
BUG=none
TEST=compiles
Review URL: https://chromiumcodereview.appspot.com/10391041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136632 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webthemeengine_impl_mac.cc')
| -rw-r--r-- | webkit/glue/webthemeengine_impl_mac.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/webkit/glue/webthemeengine_impl_mac.cc b/webkit/glue/webthemeengine_impl_mac.cc index 4ffb6b4..e9b9cf3 100644 --- a/webkit/glue/webthemeengine_impl_mac.cc +++ b/webkit/glue/webthemeengine_impl_mac.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -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); } |