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

tests/DeferredCanvasTest.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 "../src/image/SkImagePriv.h"
 #include "../src/image/SkSurface_Base.h"
 #include "SkBitmap.h"
@@ skipping 22 matching lines @@
 
 static SkSurface* createSurface(SkColor color) {
     SkSurface* surface = SkSurface::NewRasterPMColor(gWidth, gHeight);
     surface->getCanvas()->clear(color);
     return surface;
 }
 
 static SkPMColor read_pixel(SkSurface* surface, int x, int y) {
     SkPMColor pixel = 0;
     SkBitmap bitmap;
-    bitmap.installPixels(SkImageInfo::MakeN32Premul(1, 1), &pixel, 4, NULL, NULL);
+    bitmap.installPixels(SkImageInfo::MakeN32Premul(1, 1), &pixel, 4);
     SkCanvas canvas(bitmap);
 
     SkPaint paint;
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
     surface->draw(&canvas, -SkIntToScalar(x), -SkIntToScalar(y), &paint);
     return pixel;
 }
 
 static void TestDeferredCanvasBitmapAccess(skiatest::Reporter* reporter) {
     SkBitmap store;
@@ skipping 777 matching lines @@
     TestDeferredCanvasSurface(reporter, NULL);
     TestDeferredCanvasSetSurface(reporter, NULL);
 }
 
 DEF_GPUTEST(DeferredCanvas_GPU, reporter, factory) {
     if (factory != NULL) {
         TestDeferredCanvasSurface(reporter, factory);
         TestDeferredCanvasSetSurface(reporter, factory);
     }
 }