DM: Don't hold onto data longer than needed.

dm/DMSrcSink.h

 #ifndef DMSrcSink_DEFINED
 #define DMSrcSink_DEFINED
 
 #include "DMGpuSupport.h"
 #include "SkBBHFactory.h"
 #include "SkBBoxHierarchy.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkGPipe.h"
@@ skipping 29 matching lines @@
 
     // File extension for the content draw() outputs, e.g. "png", "pdf".
     virtual const char* fileExtension() const  = 0;
 };
 
 enum { kAnyThread_Enclave, kGPUSink_Enclave, kPDFSink_Enclave };
 static const int kNumEnclaves = kPDFSink_Enclave + 1;
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-void SafeUnref(SkPicture*);  // These need external linkage (and specific types).
-void SafeUnref(SkData*);
-
 class GMSrc : public Src {
 public:
     explicit GMSrc(skiagm::GMRegistry::Factory);
 
     Error draw(SkCanvas*) const SK_OVERRIDE;
     SkISize size() const SK_OVERRIDE;
     Name name() const SK_OVERRIDE;
 private:
     skiagm::GMRegistry::Factory fFactory;
 };
 
 class ImageSrc : public Src {
 public:
     explicit ImageSrc(SkString path, int subsets = 0);
 
     Error draw(SkCanvas*) const SK_OVERRIDE;
     SkISize size() const SK_OVERRIDE;
     Name name() const SK_OVERRIDE;
 private:
     SkString                     fPath;
     int                          fSubsets;
-    SkLazyPtr<SkData, SafeUnref> fEncoded;
 };
 
 class SKPSrc : public Src {
 public:
     explicit SKPSrc(SkString path);
 
     Error draw(SkCanvas*) const SK_OVERRIDE;
     SkISize size() const SK_OVERRIDE;
     Name name() const SK_OVERRIDE;
 private:
     SkString                        fPath;
-    SkLazyPtr<SkPicture, SafeUnref> fPic;
 };
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 class GPUSink : public Sink {
 public:
     GPUSink(GrContextFactory::GLContextType, GrGLStandard, int samples, bool dfText, bool threaded);
 
     Error draw(const Src&, SkBitmap*, SkWStream*) const SK_OVERRIDE;
     int enclave() const SK_OVERRIDE;
@@ skipping 72 matching lines @@
     const char* fileExtension() const SK_OVERRIDE { return fSink->fileExtension(); }
 private:
     const int                   fW, fH;
     SkAutoTDelete<SkBBHFactory> fFactory;
     SkAutoTDelete<Sink>         fSink;
 };
 
 }  // namespace DM
 
 #endif//DMSrcSink_DEFINED