Chromium Code Reviews| Index: skia/ext/bitmap_platform_device_skia.cc |
| diff --git a/skia/ext/bitmap_platform_device_skia.cc b/skia/ext/bitmap_platform_device_skia.cc |
| index a39e5d718579c1728c2b46f23f21aa12dbaad189..f6d38ef27b767f42f677aab021c7f1346b5b4d95 100644 |
| --- a/skia/ext/bitmap_platform_device_skia.cc |
| +++ b/skia/ext/bitmap_platform_device_skia.cc |
| @@ -17,7 +17,7 @@ BitmapPlatformDevice* BitmapPlatformDevice::Create(int width, int height, |
| bitmap.eraseARGB(0, 0, 0, 0); |
| return new BitmapPlatformDevice(bitmap); |
| } |
| - return NULL; |
| + return nullptr; |
| } |
| BitmapPlatformDevice* BitmapPlatformDevice::Create(int width, int height, |
| @@ -29,7 +29,7 @@ BitmapPlatformDevice* BitmapPlatformDevice::Create(int width, int height, |
| if (data) |
| bitmap.setPixels(data); |
| else if (!bitmap.tryAllocPixels()) |
| - return NULL; |
| + return nullptr; |
| return new BitmapPlatformDevice(bitmap); |
| } |
| @@ -50,12 +50,10 @@ SkBaseDevice* BitmapPlatformDevice::onCreateDevice(const CreateInfo& info, |
| } |
| NativeDrawingContext BitmapPlatformDevice::BeginPlatformPaint( |
|
reed1
2017/01/05 16:40:33
Can we remove this method from the API entirely? I
|
| - const SkMatrix& transform, |
| - const SkIRect& clip_bounds) { |
| - // TODO(zhenghao): What should we return? The ptr to the address of the |
| - // pixels? Maybe this won't be called at all. |
| - SkPixmap pixmap; |
| - return accessPixels(&pixmap) ? pixmap.writable_addr() : nullptr; |
| + const SkMatrix&, |
| + const SkIRect&) { |
| + NOTREACHED(); |
| + return nullptr; |
| } |
| // PlatformCanvas impl |