skia/ext/skia_utils_mac.mm - Issue 22796028: Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: skia/ext/skia_utils_mac.mm

Issue 22796028: Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Minor cleanup Created 7 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: skia/ext/skia_utils_mac.mm

diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm

index 213bb00e49846fc350be6dd2eb570435b06afb11..50217d00599a0b65f9f47520b9ce8e0b8debb208 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;

« skia/ext/platform_device.h ('K') | « skia/ext/platform_device_mac.cc ('k') | skia/ext/vector_canvas.h » ('j') | skia/ext/vector_platform_device_emf_win.h » ('J')