Revert of Make SkPicture/SkImageGenerator default to SkCodec

tools/gpuveto.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 "LazyDecodeBitmap.h"
 #include "SkCommandLineFlags.h"
 #include "SkPicture.h"
 #include "SkPictureRecorder.h"
 #include "SkStream.h"
 
 DEFINE_string2(readFile, r, "", "skp file to process.");
 DEFINE_bool2(quiet, q, false, "quiet");
 
 // This tool just loads a single skp, replays into a new SkPicture (to
 // regenerate the GPU-specific tracking information) and reports
@@ skipping 16 matching lines @@
     }
 
     SkFILEStream inputStream(FLAGS_readFile[0]);
     if (!inputStream.isValid()) {
         if (!FLAGS_quiet) {
             SkDebugf("Couldn't open file\n");
         }
         return kError;
     }
 
-    SkAutoTUnref<SkPicture> picture(SkPicture::CreateFromStream(&inputStream));
+    SkPicture::InstallPixelRefProc proc = &sk_tools::LazyDecodeBitmap;
+
+    SkAutoTUnref<SkPicture> picture(SkPicture::CreateFromStream(&inputStream, proc));
     if (nullptr == picture.get()) {
         if (!FLAGS_quiet) {
             SkDebugf("Could not read the SkPicture\n");
         }
         return kError;
     }
 
     // The SkPicture tracking information is only generated during recording
     // an isn't serialized. Replay the picture to regenerated the tracking data.
     SkPictureRecorder recorder;
@@ skipping 13 matching lines @@
     SkDebugf("gpuveto is only useful when GPU rendering is enabled\n");
     return kError;
 #endif
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif