diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-26 18:37:29 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-26 18:37:29 +0000 |
| commit | 598e4f866fb1540d4d5e4351694bb3c9b0a20a1b (patch) | |
| tree | df1a98aa62ccff7ffacacfa4c961d2ee74e6bf2f /skia/ext/skia_utils_mac.mm | |
| parent | 93773d08322990032231aa26c4eba4f02014de99 (diff) | |
| download | chromium_src-598e4f866fb1540d4d5e4351694bb3c9b0a20a1b.zip chromium_src-598e4f866fb1540d4d5e4351694bb3c9b0a20a1b.tar.gz chromium_src-598e4f866fb1540d4d5e4351694bb3c9b0a20a1b.tar.bz2 | |
Skia is going to Split the SkDevice class into SkBaseDevice and SkBitmapDevice. Right now Skia has typedefs redirecting SkBaseDevice and SkBitmapDevice to SkDevice. This CL begins the Chromium-side renaming process in preparation for the real change (https://codereview.chromium.org/22978012/)
BUG=278148
Review URL: https://chromiumcodereview.appspot.com/22796028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219568 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext/skia_utils_mac.mm')
| -rw-r--r-- | skia/ext/skia_utils_mac.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm index 213bb00..50217d0 100644 --- a/skia/ext/skia_utils_mac.mm +++ b/skia/ext/skia_utils_mac.mm @@ -192,7 +192,7 @@ SkBitmap CGImageToSkBitmap(CGImageRef image) { int width = CGImageGetWidth(image); int height = CGImageGetHeight(image); - scoped_ptr<SkDevice> device( + scoped_ptr<SkBaseDevice> device( skia::BitmapPlatformDevice::Create(NULL, width, height, false)); CGContextRef context = skia::GetBitmapContext(device.get()); @@ -362,7 +362,7 @@ foundRight: } CGContextRef SkiaBitLocker::cgContext() { - SkDevice* device = canvas_->getTopDevice(); + SkBaseDevice* device = canvas_->getTopDevice(); DCHECK(device); if (!device) return 0; |