diff options
| author | caryclark@chromium.org <caryclark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-20 21:54:07 +0000 |
|---|---|---|
| committer | caryclark@chromium.org <caryclark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-20 21:54:07 +0000 |
| commit | fbdbca3dd3f13c72fdf6482eff48dc24aaff5fe8 (patch) | |
| tree | 0d901e4633defe66f33527ff987e64513f16d4e6 /webkit/glue/webkit_glue.cc | |
| parent | ea64557971bc55d314f935b026fa7017622167b9 (diff) | |
| download | chromium_src-fbdbca3dd3f13c72fdf6482eff48dc24aaff5fe8.zip chromium_src-fbdbca3dd3f13c72fdf6482eff48dc24aaff5fe8.tar.gz chromium_src-fbdbca3dd3f13c72fdf6482eff48dc24aaff5fe8.tar.bz2 | |
Map webkit glue when Mac build uses Skia.
In webkit_glue::DecodeImage(), the WebImage
is of type SkBitmap instead of CGImage, so
take the general case if USE_SKIA is defined.
The generic version of WebCursor defines
SetCustomData and ImageFromCustomData only if
WEBKIT_USING_SKIA is enabled, so disable the
corresponding routines in the Mac version.
In webkit_glue::WebThemeEngineImpl::paintScrollbarThumb(),
map the WebCanvas (i.e. SkCanvas) to a CGContext
to paint the scrollbar thumb, using the SkiaBitLocker
utility class.
SkiaBitLocker is described in
http://codereview.chromium.org/7031006/
These changes make no functional change to any
existing port, so have no new tests.
BUG=79463
TEST=none
Review URL: http://codereview.chromium.org/6840057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86151 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkit_glue.cc')
| -rw-r--r-- | webkit/glue/webkit_glue.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index 2749a46..1593c35 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -271,7 +271,7 @@ bool DecodeImage(const std::string& image_data, SkBitmap* image) { if (web_image.isNull()) return false; -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) && !defined(USE_SKIA) *image = gfx::CGImageToSkBitmap(web_image.getCGImageRef()); #else *image = web_image.getSkBitmap(); |