| Index: skia/ext/platform_canvas.h
|
| diff --git a/skia/ext/platform_canvas.h b/skia/ext/platform_canvas.h
|
| index 452a575cc86887b34edebe44662e5e1a791ee240..4909cb29f53c35b256074fd7e0871be8d17f234c 100644
|
| --- a/skia/ext/platform_canvas.h
|
| +++ b/skia/ext/platform_canvas.h
|
| @@ -25,6 +25,8 @@ class SkBaseDevice;
|
|
|
| namespace skia {
|
|
|
| +class LayerAllocator;
|
| +
|
| //
|
| // Note about error handling.
|
| //
|
| @@ -45,6 +47,7 @@ enum OnFailureType {
|
| #if defined(WIN32)
|
| // The shared_section parameter is passed to gfx::PlatformDevice::create.
|
| // See it for details.
|
| + // TODO: this should become sk_sp<SkCanvas>
|
| SK_API SkCanvas* CreatePlatformCanvas(int width,
|
| int height,
|
| bool is_opaque,
|
| @@ -61,12 +64,14 @@ enum OnFailureType {
|
| int y,
|
| const RECT* src_rect);
|
| #elif defined(__APPLE__)
|
| + // TODO: this should become sk_sp<SkCanvas>
|
| SK_API SkCanvas* CreatePlatformCanvas(CGContextRef context,
|
| int width,
|
| int height,
|
| bool is_opaque,
|
| OnFailureType failure_type);
|
|
|
| + // TODO: this should become sk_sp<SkCanvas>
|
| SK_API SkCanvas* CreatePlatformCanvas(int width,
|
| int height,
|
| bool is_opaque,
|
| @@ -78,6 +83,7 @@ enum OnFailureType {
|
|
|
| // Construct a canvas from the given memory region. The memory is not cleared
|
| // first. @data must be, at least, @height * StrideForWidth(@width) bytes.
|
| + // TODO: this should become sk_sp<SkCanvas>
|
| SK_API SkCanvas* CreatePlatformCanvas(int width,
|
| int height,
|
| bool is_opaque,
|
| @@ -91,9 +97,6 @@ static inline SkCanvas* CreatePlatformCanvas(int width,
|
| return CreatePlatformCanvas(width, height, is_opaque, 0, CRASH_ON_FAILURE);
|
| }
|
|
|
| -SK_API SkCanvas* CreateCanvas(const sk_sp<SkBaseDevice>& device,
|
| - OnFailureType failure_type);
|
| -
|
| static inline SkCanvas* CreateBitmapCanvas(int width,
|
| int height,
|
| bool is_opaque) {
|
|
|