From 6b3155c4be0476bc53541b0431c368a44e69f0a7 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Mon, 3 Apr 2017 14:41:44 -0400 Subject: Revert[4] "clean up (partially) colortable api"""" Fixes: - create temp api for android to pass nullptr - don't release and access sk_sp at the same time in parameters This reverts commit b14131c1851eea6acbd34cc42a8f860daed36b21. Bug: skia: Change-Id: Ic0e4f62520ba9f35455499ed30d306ad19d998a8 Reviewed-on: https://skia-review.googlesource.com/11129 Commit-Queue: Mike Reed Reviewed-by: Matt Sarett --- tests/WritePixelsTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/WritePixelsTest.cpp') diff --git a/tests/WritePixelsTest.cpp b/tests/WritePixelsTest.cpp index c38e4d665d..cace6b196e 100644 --- a/tests/WritePixelsTest.cpp +++ b/tests/WritePixelsTest.cpp @@ -263,7 +263,7 @@ static bool alloc_row_bytes(SkBitmap* bm, const SkImageInfo& info, size_t rowByt if (!bm->setInfo(info, rowBytes)) { return false; } - sk_sp pr(SkMallocPixelRef::NewAllocate(info, rowBytes, nullptr)); + sk_sp pr = SkMallocPixelRef::MakeAllocate(info, rowBytes, nullptr); bm->setPixelRef(std::move(pr), 0, 0); return true; } -- cgit v1.2.3