PDF: Correctly embed JPEG images directly into PDF output.

src/pdf/SkPDFBitmap.h

Index: src/pdf/SkPDFBitmap.h
diff --git a/src/pdf/SkPDFBitmap.h b/src/pdf/SkPDFBitmap.h
index bf41f6341a9d11cd49d6635e4a474c806df77e9c..2c8653f3158769f712de7f01085e54e5d1193053 100644
--- a/src/pdf/SkPDFBitmap.h
+++ b/src/pdf/SkPDFBitmap.h
@@ -26,22 +26,15 @@ class SkPDFBitmap : public SkPDFObject {
 public:
     // Returns NULL on unsupported bitmap;
     static SkPDFBitmap* Create(SkPDFCanon*, const SkBitmap&);
-    ~SkPDFBitmap();
-    void emitObject(SkWStream*,
-                    const SkPDFObjNumMap& objNumMap,
-                    const SkPDFSubstituteMap& substitutes) override;
-    void addResources(SkPDFObjNumMap*,
-                      const SkPDFSubstituteMap&) const override;
     bool equals(const SkBitmap& other) const {
         return fBitmap.getGenerationID() == other.getGenerationID() &&
                fBitmap.pixelRefOrigin() == other.pixelRefOrigin() &&
                fBitmap.dimensions() == other.dimensions();
     }
 
-private:
+protected:
     const SkBitmap fBitmap;
-    const SkAutoTUnref<SkPDFObject> fSMask;
-    SkPDFBitmap(const SkBitmap&, SkPDFObject*);
+    SkPDFBitmap(const SkBitmap& bm) : fBitmap(bm) {}
 };
 
 #endif  // SkPDFBitmap_DEFINED