commit 086a427b0cee3862f25c492fc5082ff24105dc53
author Mike Reed <reed@google.com> Tue Jul 18 10:53:11 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 18 15:50:43 2017 +0000
tree 79d4311c12309e5bc34950a0131771d3cb8f6171
parent 918ad9d5f19efdbd57486b8f931f7af197896010

guard references to SkColorTable

Bug: skia:6828
Change-Id: I0c8c78e70b118f51cb59dc45675e4ddcd4776108
Reviewed-on: https://skia-review.googlesource.com/24260
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>

tests/PixelRefTest.cpp

diff --git a/tests/PixelRefTest.cpp b/tests/PixelRefTest.cpp
index 683e249..c978d81 100644
--- a/tests/PixelRefTest.cpp
+++ b/tests/PixelRefTest.cpp
@@ -23,21 +23,21 @@
 
     info = SkImageInfo::MakeN32Premul(0, 0);
     release_counter = 1;
-    success = bm.installPixels(info, nullptr, 0, nullptr, decrement_counter_proc, &release_counter);
+    success = bm.installPixels(info, nullptr, 0, decrement_counter_proc, &release_counter);
     REPORTER_ASSERT(reporter, true == success);
     bm.reset();
     REPORTER_ASSERT(reporter, 0 == release_counter);
 
     info = SkImageInfo::MakeN32Premul(10, 10);
     release_counter = 1;
-    success = bm.installPixels(info, nullptr, 0, nullptr, decrement_counter_proc, &release_counter);
+    success = bm.installPixels(info, nullptr, 0, decrement_counter_proc, &release_counter);
     REPORTER_ASSERT(reporter, true == success);
     bm.reset();
     REPORTER_ASSERT(reporter, 0 == release_counter);
 
     info = SkImageInfo::MakeN32Premul(-10, -10);
     release_counter = 1;
-    success = bm.installPixels(info, nullptr, 0, nullptr, decrement_counter_proc, &release_counter);
+    success = bm.installPixels(info, nullptr, 0, decrement_counter_proc, &release_counter);
     REPORTER_ASSERT(reporter, false == success);
     bm.reset();
     REPORTER_ASSERT(reporter, 0 == release_counter);
@@ -69,7 +69,7 @@
 DEF_TEST(PixelRef_GenIDChange, r) {
     SkImageInfo info = SkImageInfo::MakeN32Premul(10, 10);
 
-    sk_sp<SkPixelRef> pixelRef = SkMallocPixelRef::MakeAllocate(info, 0, nullptr);
+    sk_sp<SkPixelRef> pixelRef = SkMallocPixelRef::MakeAllocate(info, 0);
 
     // Register a listener.
     int count = 0;