split SkPictureRecorder out of SkPicture

tools/PictureRenderer.h

Index: tools/PictureRenderer.h
===================================================================
--- tools/PictureRenderer.h	(revision 13963)
+++ tools/PictureRenderer.h	(working copy)
@@ -366,8 +366,7 @@
     }
 
     PictureRenderer()
-        : fPicture(NULL)
-        , fJsonSummaryPtr(NULL)
+        : fJsonSummaryPtr(NULL)
         , fDeviceType(kBitmap_DeviceType)
         , fBBoxHierarchyType(kNone_BBoxHierarchyType)
         , fScaleFactor(SK_Scalar1)
@@ -391,7 +390,7 @@
 
 protected:
     SkAutoTUnref<SkCanvas> fCanvas;
-    SkPicture*             fPicture;
+    SkAutoTUnref<SkPicture> fPicture;
     bool                   fUseChecksumBasedFilenames;
     ImageResultsSummary*   fJsonSummaryPtr;
     SkDeviceTypes          fDeviceType;
@@ -421,7 +420,7 @@
      */
     void scaleToScaleFactor(SkCanvas*);
 
-    SkPicture* createPicture();
+    SkPictureFactory* getFactory();
     uint32_t recordFlags();
     SkCanvas* setupCanvas();
     virtual SkCanvas* setupCanvas(int width, int height);
@@ -655,7 +654,7 @@
     virtual SkString getNormalTimeFormat() SK_OVERRIDE { return SkString("%6.4f"); }
 
 private:
-    SkAutoTUnref<SkPicture> fReplayer;
+    SkAutoTUnref<SkPictureRecorder> fRecorder;
 
     virtual SkString getConfigNameInternal() SK_OVERRIDE;