Remove SkPicture pointer from SkPicturePlayback

src/core/SkPictureRecord.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPictureRecord_DEFINED
 #define SkPictureRecord_DEFINED
 
@@ skipping 70 matching lines @@
             return SkData::NewEmpty();
         }
 
         if (deepCopy) {
             return SkData::NewWithCopy(fWriter.contiguousArray(), fWriter.bytesWritten());
         }
 
         return fWriter.snapshotAsData();
     }
 
-    SkPathHeap* pathHeap() {
-        return fPathHeap;
+    const SkPathHeap* pathHeap() const {
+        return fPathHeap.get();
     }
 
     const SkPictureContentInfo& contentInfo() const {
         return fContentInfo;
     }
 
     void setFlags(uint32_t recordFlags) {
         fRecordFlags = recordFlags;
     }
 
@@ skipping 226 matching lines @@
     friend class SkPictureTester; // for unit testing
 
 #ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
     SkMatrixClipStateMgr fMCMgr;
 #endif
 
     typedef SkCanvas INHERITED;
 };
 
 #endif