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

src/image/SkImage_Raster.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkImage_Base.h"
 #include "SkImagePriv.h"
 #include "SkBitmap.h"
@@ skipping 76 matching lines @@
 static void release_data(void* addr, void* context) {
     SkData* data = static_cast<SkData*>(context);
     data->unref();
 }
 
 SkImage_Raster::SkImage_Raster(const Info& info, SkData* data, size_t rowBytes)
     : INHERITED(info.fWidth, info.fHeight)
 {
     data->ref();
     void* addr = const_cast<void*>(data->data());
+    SkColorTable* ctable = NULL;
 
-    fBitmap.installPixels(info, addr, rowBytes, release_data, data);
+    fBitmap.installPixels(info, addr, rowBytes, ctable, release_data, data);

[scroggo, 2014/05/28 18:16:36]

Why not just pass NULL here?

[reed1, 2014/05/28 18:36:43]

Documentation. Not required.

     fBitmap.setImmutable();
     fBitmap.lockPixels();
 }
 
 SkImage_Raster::SkImage_Raster(const Info& info, SkPixelRef* pr, size_t rowBytes)
     : INHERITED(info.fWidth, info.fHeight)
 {
     fBitmap.setConfig(info, rowBytes);
     fBitmap.setPixelRef(pr);
     fBitmap.lockPixels();
@@ skipping 80 matching lines @@
 }
 
 SkImage* SkNewImageFromPixelRef(const SkImageInfo& info, SkPixelRef* pr,
                                 size_t rowBytes) {
     return SkNEW_ARGS(SkImage_Raster, (info, pr, rowBytes));
 }
 
 SkPixelRef* SkBitmapImageGetPixelRef(SkImage* image) {
     return ((SkImage_Raster*)image)->getPixelRef();
 }