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>

src/image/SkSurface_Raster.cpp

diff --git a/src/image/SkSurface_Raster.cpp b/src/image/SkSurface_Raster.cpp
index 688e234..51b9487 100644
--- a/src/image/SkSurface_Raster.cpp
+++ b/src/image/SkSurface_Raster.cpp
@@ -99,7 +99,7 @@
                                    const SkSurfaceProps* props)
     : INHERITED(info, props)
 {
-    fBitmap.installPixels(info, pixels, rb, nullptr, releaseProc, context);
+    fBitmap.installPixels(info, pixels, rb, releaseProc, context);
     fRowBytes = 0;              // don't need to track the rowbytes
     fWeOwnThePixels = false;    // We are "Direct"
 }
@@ -203,7 +203,7 @@
         return nullptr;
     }
 
-    sk_sp<SkPixelRef> pr = SkMallocPixelRef::MakeZeroed(info, rowBytes, nullptr);
+    sk_sp<SkPixelRef> pr = SkMallocPixelRef::MakeZeroed(info, rowBytes);
     if (!pr) {
         return nullptr;
     }