remove picture-backed surfaces

src/image/SkImagePriv.h

Index: src/image/SkImagePriv.h
diff --git a/src/image/SkImagePriv.h b/src/image/SkImagePriv.h
index bf28f598c50f85c654270d16ff43b5715c23453c..9f9cd12f6990917ad58a15ffd55876eb9eafd9ae 100644
--- a/src/image/SkImagePriv.h
+++ b/src/image/SkImagePriv.h
@@ -11,8 +11,6 @@
 #include "SkBitmap.h"
 #include "SkImage.h"
 
-class SkPicture;
-
 extern SkBitmap::Config SkImageInfoToBitmapConfig(const SkImageInfo&);
 
 // Call this if you explicitly want to use/share this pixelRef in the image
@@ -31,18 +29,6 @@ extern SkImage* SkNewImageFromPixelRef(const SkImageInfo&, SkPixelRef*,
  */
 extern SkImage* SkNewImageFromBitmap(const SkBitmap&, bool canSharePixelRef);
 
-extern void SkImagePrivDrawPicture(SkCanvas*, SkPicture*,
-                                   SkScalar x, SkScalar y, const SkPaint*);
-
-extern void SkImagePrivDrawPicture(SkCanvas*, SkPicture*,
-                                   const SkRect*, const SkRect&, const SkPaint*);
-
-/**
- *  Return an SkImage whose contents are those of the specified picture. Note:
- *  The picture itself is unmodified, and may continue to be used for recording
- */
-extern SkImage* SkNewImageFromPicture(const SkPicture*);
-
 static inline size_t SkImageMinRowBytes(const SkImageInfo& info) {
     return SkAlign4(info.minRowBytes());
 }
@@ -52,9 +38,6 @@ static inline size_t SkImageMinRowBytes(const SkImageInfo& info) {
 // in which case the surface may need to perform a copy-on-write.
 extern SkPixelRef* SkBitmapImageGetPixelRef(SkImage* rasterImage);
 
-// Given an image created with NewPicture, return its SkPicture.
-extern SkPicture* SkPictureImageGetPicture(SkImage* pictureImage);
-
 // Given an image created with NewTexture, return its GrTexture. This
 // may be called to see if the surface and the image share the same GrTexture,
 // in which case the surface may need to perform a copy-on-write.