Remove unused parameters to SkDocument::CreatePDF

All image compression currently uses (losseless) Deflate, not Jpeg.

All clients simply use SkDocument::CreatePDF(stream).

SampleApp and SkLua still use SkDocument::CreatePDF(path).

Review URL: https://codereview.chromium.org/935843007

4 files changed, 20 insertions, 30 deletions

diff --git a/src/doc/SkDocument_PDF.cpp b/src/doc/SkDocument_PDF.cpp
index de65efe8c8..6d6bf63526 100644
--- a/src/doc/SkDocument_PDF.cpp
+++ b/src/doc/SkDocument_PDF.cpp
@@ -11,16 +11,14 @@
 
 class SkDocument_PDF : public SkDocument {
 public:
-    SkDocument_PDF(SkWStream* stream, void (*doneProc)(SkWStream*,bool),
-                   SkPicture::EncodeBitmap encoder,
+    SkDocument_PDF(SkWStream* stream,
+                   void (*doneProc)(SkWStream*,bool),
                    SkScalar rasterDpi)
-            : SkDocument(stream, doneProc)
-            , fEncoder(encoder)
-            , fRasterDpi(rasterDpi) {
-        fDoc = SkNEW(SkPDFDocument);
-        fCanvas = NULL;
-        fDevice = NULL;
-    }
+        : SkDocument(stream, doneProc)
+        , fDoc(SkNEW(SkPDFDocument))
+        , fDevice(NULL)
+        , fCanvas(NULL)
+        , fRasterDpi(rasterDpi) {}
 
     virtual ~SkDocument_PDF() {
         // subclasses must call close() in their destructors
@@ -37,9 +35,6 @@ protected:
         mediaBoxSize.set(SkScalarRoundToInt(width), SkScalarRoundToInt(height));
 
         fDevice = SkNEW_ARGS(SkPDFDevice, (mediaBoxSize, mediaBoxSize, SkMatrix::I()));
-        if (fEncoder) {
-            fDevice->setDCTEncoder(fEncoder);
-        }
         if (fRasterDpi != 0) {
             fDevice->setRasterDpi(fRasterDpi);
         }
@@ -82,29 +77,24 @@ private:
     SkPDFDocument*  fDoc;
     SkPDFDevice*    fDevice;
     SkCanvas*       fCanvas;
-    SkPicture::EncodeBitmap fEncoder;
     SkScalar        fRasterDpi;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkDocument* SkDocument::CreatePDF(SkWStream* stream, void (*done)(SkWStream*,bool),
-                                  SkPicture::EncodeBitmap enc,
-                                  SkScalar dpi) {
-    return stream ? SkNEW_ARGS(SkDocument_PDF, (stream, done, enc, dpi)) : NULL;
+SkDocument* SkDocument::CreatePDF(SkWStream* stream, SkScalar dpi) {
+    return stream ? SkNEW_ARGS(SkDocument_PDF, (stream, NULL, dpi)) : NULL;
 }
 
 static void delete_wstream(SkWStream* stream, bool aborted) {
     SkDELETE(stream);
 }
 
-SkDocument* SkDocument::CreatePDF(const char path[],
-                                  SkPicture::EncodeBitmap enc,
-                                  SkScalar dpi) {
+SkDocument* SkDocument::CreatePDF(const char path[], SkScalar dpi) {
     SkFILEWStream* stream = SkNEW_ARGS(SkFILEWStream, (path));
     if (!stream->isValid()) {
         SkDELETE(stream);
         return NULL;
     }
-    return SkNEW_ARGS(SkDocument_PDF, (stream, delete_wstream, enc, dpi));
+    return SkNEW_ARGS(SkDocument_PDF, (stream, delete_wstream, dpi));
 }
diff --git a/src/pdf/SkPDFDevice.h b/src/pdf/SkPDFDevice.h
index af650055cd..de405c1317 100644
--- a/src/pdf/SkPDFDevice.h
+++ b/src/pdf/SkPDFDevice.h
@@ -137,7 +137,7 @@ public:
      *         encoding and decoding might not be worth the space savings,
      *         if any at all.
      */
-    void setDCTEncoder(SkPicture::EncodeBitmap encoder) {
+    void setDCTEncoder(SkData* (*encoder)(size_t*, const SkBitmap&)) {
         fEncoder = encoder;
     }
 
@@ -245,7 +245,7 @@ private:
     // Glyph ids used for each font on this device.
     SkAutoTDelete<SkPDFGlyphSetMap> fFontGlyphUsage;
 
-    SkPicture::EncodeBitmap fEncoder;
+    SkData* (*fEncoder)(size_t*, const SkBitmap&);
     SkScalar fRasterDpi;
 
     SkBitmap fLegacyBitmap;
diff --git a/src/pdf/SkPDFImage.cpp b/src/pdf/SkPDFImage.cpp
index 6f743fd162..c7836e5585 100644
--- a/src/pdf/SkPDFImage.cpp
+++ b/src/pdf/SkPDFImage.cpp
@@ -458,7 +458,7 @@ static SkBitmap unpremultiply_bitmap(const SkBitmap& bitmap,
 // static
 SkPDFImage* SkPDFImage::CreateImage(const SkBitmap& bitmap,
                                     const SkIRect& srcRect,
-                                    SkPicture::EncodeBitmap encoder) {
+                                    SkData* (*encoder)(size_t*, const SkBitmap&)) {
     if (bitmap.colorType() == kUnknown_SkColorType) {
         return NULL;
     }
@@ -511,7 +511,7 @@ SkPDFImage::SkPDFImage(SkStream* stream,
                        const SkBitmap& bitmap,
                        bool isAlpha,
                        const SkIRect& srcRect,
-                       SkPicture::EncodeBitmap encoder)
+                       SkData* (*encoder)(size_t*, const SkBitmap&))
     : fIsAlpha(isAlpha),
       fSrcRect(srcRect),
       fEncoder(encoder) {
@@ -720,7 +720,7 @@ static bool is_jfif_jpeg(SkData* data) {
 SkPDFObject* SkPDFCreateImageObject(
         const SkBitmap& bitmap,
         const SkIRect& subset,
-        SkPicture::EncodeBitmap encoder) {
+        SkData* (*encoder)(size_t*, const SkBitmap&)) {
     if (SkPDFObject* pdfBitmap = SkPDFBitmap::Create(bitmap, subset)) {
         return pdfBitmap;
     }
diff --git a/src/pdf/SkPDFImage.h b/src/pdf/SkPDFImage.h
index 24332cd02d..cfef38cbe2 100644
--- a/src/pdf/SkPDFImage.h
+++ b/src/pdf/SkPDFImage.h
@@ -29,7 +29,7 @@ struct SkIRect;
  *  back on SkPDFImage::CreateImage.
  */
 SkPDFObject* SkPDFCreateImageObject(
-        const SkBitmap&, const SkIRect& subset, SkPicture::EncodeBitmap);
+        const SkBitmap&, const SkIRect& subset, SkData* (*)(size_t*, const SkBitmap&));
 
 /** \class SkPDFImage
 
@@ -50,7 +50,7 @@ public:
      */
     static SkPDFImage* CreateImage(const SkBitmap& bitmap,
                                    const SkIRect& srcRect,
-                                   SkPicture::EncodeBitmap encoder);
+                                   SkData* (*encoder)(size_t*, const SkBitmap&));
 
     virtual ~SkPDFImage();
 
@@ -62,7 +62,7 @@ private:
     SkBitmap fBitmap;
     bool fIsAlpha;
     SkIRect fSrcRect;
-    SkPicture::EncodeBitmap fEncoder;
+    SkData* (*fEncoder)(size_t*, const SkBitmap&);
     bool fStreamValid;
 
     /** Create a PDF image XObject. Entries for the image properties are
@@ -81,7 +81,7 @@ private:
      *                    May be NULL.
      */
     SkPDFImage(SkStream* stream, const SkBitmap& bitmap, bool isAlpha,
-               const SkIRect& srcRect, SkPicture::EncodeBitmap encoder);
+               const SkIRect& srcRect, SkData* (*encoder)(size_t*, const SkBitmap&));
 
     /** Copy constructor, used to generate substitutes.
      *  @param image      The SkPDFImage to copy.