PDF: remove last use of SkPDFImage
Add a GM.
BUG=skia:255
Review URL: https://codereview.chromium.org/950633003
diff --git a/src/pdf/SkPDFBitmap.h b/src/pdf/SkPDFBitmap.h
index 45a8aa6..02a79df 100644
--- a/src/pdf/SkPDFBitmap.h
+++ b/src/pdf/SkPDFBitmap.h
@@ -17,18 +17,15 @@
* It is designed to use a minimal amout of memory, aside from refing
* the bitmap's pixels, and its emitObject() does not cache any data.
*
- * As of now, it only supports 8888 bitmaps (the most common case).
+ * If !bitmap.isImmutable(), then a copy of the bitmap must be made;
+ * there is no way around this.
*
* The SkPDFBitmap::Create function will check the canon for duplicates.
*/
class SkPDFBitmap : public SkPDFObject {
public:
// Returns NULL on unsupported bitmap;
- // TODO(halcanary): support other bitmap colortypes and replace
- // SkPDFImage.
- static SkPDFBitmap* Create(SkPDFCanon*,
- const SkBitmap&,
- const SkIRect& subset);
+ static SkPDFBitmap* Create(SkPDFCanon*, const SkBitmap&);
~SkPDFBitmap();
void emitObject(SkWStream*, SkPDFCatalog*) SK_OVERRIDE;
void addResources(SkTSet<SkPDFObject*>* resourceSet,
@@ -43,7 +40,7 @@
const SkBitmap fBitmap;
const SkAutoTUnref<SkPDFObject> fSMask;
SkPDFBitmap(const SkBitmap&, SkPDFObject*);
- void emitDict(SkWStream*, SkPDFCatalog*, size_t, bool) const;
+ void emitDict(SkWStream*, SkPDFCatalog*, size_t) const;
};
#endif // SkPDFBitmap_DEFINED