From 4f783f8ada809a5a4146545fedb23bf0a362208b Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Wed, 5 Apr 2017 17:17:16 -0400 Subject: [PATCH] restore old api for android to unblock roll Bug: skia: Change-Id: Ib115666503784b928f44f04878ed06a5aa844e6e NOTRY=True Reviewed-on: https://skia-review.googlesource.com/11420 Commit-Queue: Mike Reed Reviewed-by: Mike Reed --- include/core/SkBitmap.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h index 8487d411b1..5a1036cc56 100644 --- a/include/core/SkBitmap.h +++ b/include/core/SkBitmap.h @@ -291,6 +291,11 @@ public: this->allocPixels(info); } + // TEMPORARY -- remove after updating Android BitmapTests.cpp:35 + void allocPixels(const SkImageInfo& info, std::nullptr_t, SkColorTable* ctable) { + this->allocPixels(info, sk_ref_sp(ctable)); + } + /** * Install a pixelref that wraps the specified pixels and rowBytes, and * optional ReleaseProc and context. When the pixels are no longer