Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(711)

Unified Diff: src/pdf/SkPDFImage.cpp

Issue 870333002: Simplify reference management in SkPDF (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: make Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/pdf/SkPDFImage.h ('k') | src/pdf/SkPDFPage.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/pdf/SkPDFImage.cpp
diff --git a/src/pdf/SkPDFImage.cpp b/src/pdf/SkPDFImage.cpp
index 5dc6babec9ac8614546cc11dce499cec50d5d4e8..3c0d850fda9d1d0273e280d13452c3a239aa521a 100644
--- a/src/pdf/SkPDFImage.cpp
+++ b/src/pdf/SkPDFImage.cpp
@@ -504,27 +504,12 @@ SkPDFImage* SkPDFImage::CreateImage(const SkBitmap& bitmap,
SkAutoTUnref<SkPDFImage> mask(
SkNEW_ARGS(SkPDFImage, (alphaData.get(), bitmap,
true, srcRect, NULL)));
- image->addSMask(mask);
+ image->insert("SMask", new SkPDFObjRef(mask))->unref();
}
-
return image;
}
-SkPDFImage::~SkPDFImage() {
- fResources.unrefAll();
-}
-
-SkPDFImage* SkPDFImage::addSMask(SkPDFImage* mask) {
- fResources.push(mask);
- mask->ref();
- insert("SMask", new SkPDFObjRef(mask))->unref();
- return mask;
-}
-
-void SkPDFImage::getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
- SkTSet<SkPDFObject*>* newResourceObjects) {
- GetResourcesHelper(&fResources, knownResourceObjects, newResourceObjects);
-}
+SkPDFImage::~SkPDFImage() {}
SkPDFImage::SkPDFImage(SkStream* stream,
const SkBitmap& bitmap,
@@ -673,8 +658,6 @@ class PDFJPEGImage : public SkPDFObject {
public:
PDFJPEGImage(SkData* data, int width, int height)
: fData(SkRef(data)), fWidth(width), fHeight(height) {}
- virtual void getResources(const SkTSet<SkPDFObject*>&,
- SkTSet<SkPDFObject*>*) SK_OVERRIDE {}
virtual void emitObject(
SkWStream* stream,
SkPDFCatalog* catalog, bool indirect) SK_OVERRIDE {
« no previous file with comments | « src/pdf/SkPDFImage.h ('k') | src/pdf/SkPDFPage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698