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

gm/peekpixels.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkPath.h"
@@ skipping 28 matching lines @@
             SkCanvas* surfCanvas = surface->getCanvas();
 
             draw_content(surfCanvas);
             SkBitmap bitmap;
 
             // test peekPixels
             {
                 SkImageInfo info;
                 size_t rowBytes;
                 const void* addr = surfCanvas->peekPixels(&info, &rowBytes);
-                if (addr && bitmap.installPixels(info, const_cast<void*>(addr),
-                                                 rowBytes, NULL, NULL)) {
+                if (addr && bitmap.installPixels(info, const_cast<void*>(addr), rowBytes)) {
                     canvas->drawBitmap(bitmap, 0, 0, NULL);
                 }
             }
 
             // test ROCanvasPixels
             canvas->translate(120, 0);
             SkAutoROCanvasPixels ropixels(surfCanvas);
             if (ropixels.asROBitmap(&bitmap)) {
                 canvas->drawBitmap(bitmap, 0, 0, NULL);
             }
 
             // test Surface
             canvas->translate(120, 0);
             surface->draw(canvas, 0, 0, NULL);
         }
     }
 
     virtual uint32_t onGetFlags() const {
         // we explicitly test peekPixels and readPixels, neither of which
         // return something for a picture-backed canvas, so we skip that test.
         return kSkipPicture_Flag;
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 DEF_GM( return SkNEW(PeekPixelsGM); )