change internals over to SkPixmap and stop using accessBitmap

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 129 matching lines @@
     void addTextBlob(const SkTextBlob* blob);
 
     int find(const SkBitmap& bitmap);
 
 protected:
     void validate(size_t initialOffset, size_t size) const {
         SkASSERT(fWriter.bytesWritten() == initialOffset + size);
     }
 
     SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) override;
-    const void* onPeekPixels(SkImageInfo*, size_t*) override {
-        return NULL;
-    }
+    bool onPeekPixels(SkPixmap*) override { return false; }
 
     void willSave() override;
     SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) override;
     void willRestore() override;
 
     void didConcat(const SkMatrix&) override;
     void didSetMatrix(const SkMatrix&) override;
 
     void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;
 
@@ skipping 71 matching lines @@
 
     uint32_t fRecordFlags;
     int      fInitialSaveCount;
 
     friend class SkPictureData;   // for SkPictureData's SkPictureRecord-based constructor
 
     typedef SkCanvas INHERITED;
 };
 
 #endif