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/webcursor_mac.mm | |
| 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/webcursor_mac.mm')
| -rw-r--r-- | webkit/glue/webcursor_mac.mm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/glue/webcursor_mac.mm b/webkit/glue/webcursor_mac.mm index da80efa..d3a6a20 100644 --- a/webkit/glue/webcursor_mac.mm +++ b/webkit/glue/webcursor_mac.mm @@ -334,6 +334,7 @@ void WebCursor::InitFromNSCursor(NSCursor* cursor) { InitFromCursorInfo(cursor_info); } +#if !WEBKIT_USING_SKIA void WebCursor::SetCustomData(const WebImage& image) { if (image.isNull()) return; @@ -374,6 +375,7 @@ void WebCursor::ImageFromCustomData(WebImage* image) const { CreateCGImageFromCustomData(custom_data_, custom_size_)); *image = cg_image.get(); } +#endif void WebCursor::InitPlatformData() { return; |