update callsites for Make image factories

gm/multipicturedraw.cpp

 /*
  * Copyright 2014 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 "SkColorFilter.h"
@@ skipping 493 matching lines @@
             (*gLayoutMthds[fLayout])(canvas, &mpd,
                                      gContentMthds[fContent],
                                      fPictures, &composeSteps);
 
             mpd.draw();
 
             // Compose all the drawn canvases into the final canvas
             for (int i = 0; i < composeSteps.count(); ++i) {
                 const ComposeStep& step = composeSteps[i];
 
-                SkAutoTUnref<SkImage> image(step.fSurf->newImageSnapshot());
-
-                canvas->drawImage(image, step.fX, step.fY, step.fPaint);
+                canvas->drawImage(step.fSurf->makeImageSnapshot().get(),
+                                  step.fX, step.fY, step.fPaint);
             }
         }
 
         SkISize onISize() override { return SkISize::Make(kPicWidth, kPicHeight); }
 
         SkString onShortName() override {
             static const char* gContentNames[] = {
                 "noclip", "rectclip", "rrectclip", "pathclip", 
                 "invpathclip", "sierpinski", "biglayer"
             };
@@ skipping 39 matching lines @@
                                        MultiPictureDraw::kTiled_Layout);)
     DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kPathClipMulti_Content,
                                        MultiPictureDraw::kTiled_Layout);)
     DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kInvPathClipMulti_Content,
                                        MultiPictureDraw::kTiled_Layout);)
     DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kSierpinski_Content,
                                        MultiPictureDraw::kTiled_Layout);)
     DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kBigLayer_Content,
                                        MultiPictureDraw::kTiled_Layout);)
 }