commit 6b3155c4be0476bc53541b0431c368a44e69f0a7
author Mike Reed <reed@google.com> Mon Apr 03 14:41:44 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Apr 03 19:29:38 2017 +0000
tree 2de5a87716b38a587c475731df815e5c8178e133
parent 2db3232c88cbaec5585f263111f334ca7272fe10

Revert[4] "clean up (partially) colortable api""""

Fixes:
- create temp api for android to pass nullptr
- don't release and access sk_sp<SkData> 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 <reed@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>

tests/PixelRefTest.cpp

diff --git a/tests/PixelRefTest.cpp b/tests/PixelRefTest.cpp
index 487e519..683e249 100644
--- a/tests/PixelRefTest.cpp
+++ b/tests/PixelRefTest.cpp
@@ -69,7 +69,7 @@
 DEF_TEST(PixelRef_GenIDChange, r) {
     SkImageInfo info = SkImageInfo::MakeN32Premul(10, 10);
 
-    sk_sp<SkPixelRef> pixelRef(SkMallocPixelRef::NewAllocate(info, 0, nullptr));
+    sk_sp<SkPixelRef> pixelRef = SkMallocPixelRef::MakeAllocate(info, 0, nullptr);
 
     // Register a listener.
     int count = 0;