Revert of PDF: remove last use of SkPDFImage

src/pdf/SkPDFDevice.cpp

Index: src/pdf/SkPDFDevice.cpp
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index a0ad1343af4bba4291e6565ab8155b03b39cdb55..273b958a8c6376e33d4aa151436a730a45b80b22 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -17,10 +17,10 @@
 #include "SkPaint.h"
 #include "SkPath.h"
 #include "SkPathOps.h"
-#include "SkPDFBitmap.h"
 #include "SkPDFFont.h"
 #include "SkPDFFormXObject.h"
 #include "SkPDFGraphicState.h"
+#include "SkPDFImage.h"
 #include "SkPDFResourceDict.h"
 #include "SkPDFShader.h"
 #include "SkPDFStream.h"
@@ -2126,7 +2126,7 @@
     if (content.needShape()) {
         SkPath shape;
         shape.addRect(SkRect::MakeWH(SkIntToScalar(subset.width()),
-                                     SkIntToScalar(subset.height())));
+                                     SkIntToScalar( subset.height())));
         shape.transform(matrix);
         content.setShape(shape);
     }
@@ -2134,12 +2134,8 @@
         return;
     }
 
-    SkBitmap subsetBitmap;
-    // Should extractSubset be done by the SkPDFDevice?
-    if (!bitmap->extractSubset(&subsetBitmap, subset)) {
-        return;
-    }
-    SkAutoTUnref<SkPDFObject> image(SkPDFBitmap::Create(fCanon, subsetBitmap));
+    SkAutoTUnref<SkPDFObject> image(
+            SkPDFCreateImageObject(fCanon, *bitmap, subset));
     if (!image) {
         return;
     }