summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/skia/src/image/SkImagePriv.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/skia/src/image/SkImagePriv.h')
-rw-r--r--chromium/third_party/skia/src/image/SkImagePriv.h21
1 files changed, 1 insertions, 20 deletions
diff --git a/chromium/third_party/skia/src/image/SkImagePriv.h b/chromium/third_party/skia/src/image/SkImagePriv.h
index bf28f598c50..031832bd0d4 100644
--- a/chromium/third_party/skia/src/image/SkImagePriv.h
+++ b/chromium/third_party/skia/src/image/SkImagePriv.h
@@ -11,10 +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
extern SkImage* SkNewImageFromPixelRef(const SkImageInfo&, SkPixelRef*,
size_t rowBytes);
@@ -25,24 +21,12 @@ extern SkImage* SkNewImageFromPixelRef(const SkImageInfo&, SkPixelRef*,
* be shared if either the bitmap is marked as immutable, or canSharePixelRef
* is true.
*
- * If the bitmap's config cannot be converted into a corresponding
+ * If the bitmap's colortype cannot be converted into a corresponding
* SkImageInfo, or the bitmap's pixels cannot be accessed, this will return
* NULL.
*/
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 +36,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.