Index: src/doc/SkDocument_PDF.cpp |
diff --git a/src/doc/SkDocument_PDF.cpp b/src/doc/SkDocument_PDF.cpp |
index 27cf2e88c53241d20b56ce3c79b9166580909bc6..9da155cb28d03979b03909b25c8a4af2bff8bc71 100644 |
--- a/src/doc/SkDocument_PDF.cpp |
+++ b/src/doc/SkDocument_PDF.cpp |
@@ -11,8 +11,10 @@ |
class SkDocument_PDF : public SkDocument { |
public: |
- SkDocument_PDF(SkWStream* stream, void (*doneProc)(SkWStream*)) |
- : SkDocument(stream, doneProc) { |
+ SkDocument_PDF(SkWStream* stream, void (*doneProc)(SkWStream*), |
+ SkPicture::EncodeBitmap encoder) |
+ : SkDocument(stream, doneProc) |
+ , fEncoder(encoder) { |
fDoc = SkNEW(SkPDFDocument); |
fCanvas = NULL; |
fDevice = NULL; |
@@ -24,20 +26,17 @@ public: |
} |
protected: |
- virtual SkCanvas* onBeginPage(SkScalar width, SkScalar height, |
- const SkRect& content) SK_OVERRIDE { |
+ virtual SkCanvas* onBeginPage(const SkSize& trimSize, |
+ const SkRect* mediaBox) SK_OVERRIDE { |
SkASSERT(NULL == fCanvas); |
SkASSERT(NULL == fDevice); |
- SkISize pageS, contentS; |
- SkMatrix matrix; |
+ SkRect content = mediaBox ? *mediaBox : SkRect::MakeSize(trimSize); |
- pageS.set(SkScalarRoundToInt(width), SkScalarRoundToInt(height)); |
- contentS.set(SkScalarRoundToInt(content.width()), |
- SkScalarRoundToInt(content.height())); |
- matrix.setTranslate(content.fLeft, content.fTop); |
- |
- fDevice = SkNEW_ARGS(SkPDFDevice, (pageS, contentS, matrix)); |
+ fDevice = SkNEW_ARGS(SkPDFDeviceFlattener, (trimSize, content)); |
+ if (fEncoder) { |
+ fDevice->setDCTEncoder(fEncoder); |
+ } |
fCanvas = SkNEW_ARGS(SkCanvas, (fDevice)); |
return fCanvas; |
} |
@@ -56,36 +55,44 @@ protected: |
fDevice = NULL; |
} |
- virtual void onClose(SkWStream* stream) SK_OVERRIDE { |
+ virtual bool onClose(SkWStream* stream) SK_OVERRIDE { |
SkASSERT(NULL == fCanvas); |
SkASSERT(NULL == fDevice); |
- fDoc->emitPDF(stream); |
+ bool success = fDoc->emitPDF(stream); |
+ SkDELETE(fDoc); |
+ fDoc = NULL; |
+ return success; |
+ } |
+ |
+ virtual void onAbort() SK_OVERRIDE { |
SkDELETE(fDoc); |
fDoc = NULL; |
} |
private: |
SkPDFDocument* fDoc; |
- SkPDFDevice* fDevice; |
+ SkPDFDeviceFlattener* fDevice; |
SkCanvas* fCanvas; |
+ SkPicture::EncodeBitmap fEncoder; |
}; |
/////////////////////////////////////////////////////////////////////////////// |
-SkDocument* SkDocument::CreatePDF(SkWStream* stream, void (*done)(SkWStream*)) { |
- return stream ? SkNEW_ARGS(SkDocument_PDF, (stream, done)) : NULL; |
+SkDocument* SkDocument::CreatePDF(SkWStream* stream, void (*done)(SkWStream*), |
+ SkPicture::EncodeBitmap enc) { |
+ return stream ? SkNEW_ARGS(SkDocument_PDF, (stream, done, enc)) : NULL; |
} |
static void delete_wstream(SkWStream* stream) { |
SkDELETE(stream); |
} |
-SkDocument* SkDocument::CreatePDF(const char path[]) { |
+SkDocument* SkDocument::CreatePDF(const char path[], SkPicture::EncodeBitmap enc) { |
SkFILEWStream* stream = SkNEW_ARGS(SkFILEWStream, (path)); |
if (!stream->isValid()) { |
SkDELETE(stream); |
return NULL; |
} |
- return SkNEW_ARGS(SkDocument_PDF, (stream, delete_wstream)); |
+ return SkNEW_ARGS(SkDocument_PDF, (stream, delete_wstream, enc)); |
} |