some catchup CL revisions

gm/image_pict.cpp

 /*
  * Copyright 2015 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 "SkImage.h"
@@ skipping 110 matching lines @@
         const SkRect bounds = SkRect::MakeXYWH(100, 100, 100, 100);
         SkPictureRecorder recorder;
         draw_something(recorder.beginRecording(bounds), bounds);
         fPicture.reset(recorder.endRecording());
 
         // extract enough just for the oval.
         const SkISize size = SkISize::Make(100, 100);
 
         SkMatrix matrix;
         matrix.setTranslate(-100, -100);
-        fCache.reset(new SkImageCacherator(SkImageGenerator::NewFromPicture(size,
-                                                                            fPicture,
-                                                                            &matrix,
-                                                                            nullptr)));
+        auto gen = SkImageGenerator::NewFromPicture(size, fPicture, &matrix, nullptr);
+        fCache.reset(SkImageCacherator::NewFromGenerator(gen));
     }
 
     void drawSet(SkCanvas* canvas) const {
         SkMatrix matrix = SkMatrix::MakeTrans(-100, -100);
         canvas->drawPicture(fPicture, &matrix, nullptr);
 
         {
             SkBitmap bitmap;
             fCache->lockAsBitmap(&bitmap);
             canvas->drawBitmap(bitmap, 150, 0);
@@ skipping 32 matching lines @@
         canvas->restore();
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 DEF_GM( return new ImageCacheratorGM; )