change old picture serialization to really handle images

gm/factory.cpp

Index: gm/factory.cpp
diff --git a/gm/factory.cpp b/gm/factory.cpp
index 519b8eac79a7f654229046c37c2a61ef7a042d5f..4af37636f9d647b027d389733d4d06a4a156b5b4 100644
--- a/gm/factory.cpp
+++ b/gm/factory.cpp
@@ -37,19 +37,19 @@ protected:
             SkAutoTUnref<SkDiscardableMemoryPool> pool(
                 SkDiscardableMemoryPool::Create(1));
             SkAssertResult(SkInstallDiscardablePixelRef(SkImageGenerator::NewFromData(data),
-                                                        &fBitmap, pool));
+                                                        NULL, &fBitmap, pool));
         }
     }
 
-    virtual SkString onShortName() override {
+    SkString onShortName() override {
         return SkString("factory");
     }
 
-    virtual SkISize onISize() override {
+    SkISize onISize() override {
         return SkISize::Make(640, 480);
     }
 
-    virtual void onDraw(SkCanvas* canvas) override {
+    void onDraw(SkCanvas* canvas) override {
         canvas->drawBitmap(fBitmap, 0, 0);
     }