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/BitmapCopyTest.cpp

diff --git a/tests/BitmapCopyTest.cpp b/tests/BitmapCopyTest.cpp
index d5da4be..09e44ce 100644
--- a/tests/BitmapCopyTest.cpp
+++ b/tests/BitmapCopyTest.cpp
@@ -13,11 +13,7 @@
 
 static void init_src(const SkBitmap& bitmap) {
     if (bitmap.getPixels()) {
-        if (bitmap.getColorTable()) {
-            sk_bzero(bitmap.getPixels(), bitmap.getSize());
-        } else {
-            bitmap.eraseColor(SK_ColorWHITE);
-        }
+        bitmap.eraseColor(SK_ColorWHITE);
     }
 }
 
@@ -114,12 +110,6 @@
 
                 REPORTER_ASSERT(reporter, copy.width() == W);
                 REPORTER_ASSERT(reporter, copy.height() == 2);
-
-                if (gPairs[i].fColorType == gPairs[j].fColorType) {
-                    // they should both have, or both not-have, a colortable
-                    bool hasCT = subset.getColorTable() != nullptr;
-                    REPORTER_ASSERT(reporter, (copy.getColorTable() != nullptr) == hasCT);
-                }
             }
         }