Revert "Revert of add colortable support to imagegenerator (https://codereview.chromium.org/3044430…

src/core/SkCanvas.cpp

 
 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkCanvas.h"
@@ skipping 1096 matching lines @@
             return; // failure, fAddr is NULL
         }
         fAddr = fBitmap.getPixels();
         fRowBytes = fBitmap.rowBytes();
     }
     SkASSERT(fAddr);    // success
 }
 
 bool SkAutoROCanvasPixels::asROBitmap(SkBitmap* bitmap) const {
     if (fAddr) {
-        return bitmap->installPixels(fInfo, const_cast<void*>(fAddr), fRowBytes,
-                                     NULL, NULL);
+        return bitmap->installPixels(fInfo, const_cast<void*>(fAddr), fRowBytes);
     } else {
         bitmap->reset();
         return false;
     }
 }
 
 void SkCanvas::onPushCull(const SkRect& cullRect) {
     // do nothing. Subclasses may do something
 }
 
@@ skipping 1498 matching lines @@
     if (!supported_for_raster_canvas(info)) {
         return NULL;
     }
 
     SkBitmap bitmap;
     if (!bitmap.installPixels(info, pixels, rowBytes)) {
         return NULL;
     }
     return SkNEW_ARGS(SkCanvas, (bitmap));
 }