Revert of XPS, DM: add SkDocument::CreateXPS

dm/DMSrcSink.cpp

 #include "DMSrcSink.h"
 #include "SamplePipeControllers.h"
 #include "SkCommonFlags.h"
 #include "SkDocument.h"
 #include "SkError.h"
 #include "SkMultiPictureDraw.h"
 #include "SkNullCanvas.h"
 #include "SkOSFile.h"
 #include "SkPictureRecorder.h"
 #include "SkRandom.h"
@@ skipping 176 matching lines @@
     dst->allocPixels(info);
     canvas->readPixels(dst, 0, 0);
     if (FLAGS_abandonGpuContext) {
         factory.abandonContexts();
     }
     return "";
 }
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-static Error draw_skdocument(const Src& src, SkDocument* doc, SkWStream* dst) {
-    // Print the given DM:Src to a document, breaking on 8.5x11 pages.
-    SkASSERT(doc);
+PDFSink::PDFSink() {}
+
+Error PDFSink::draw(const Src& src, SkBitmap*, SkWStream* dst, SkString*) const {
+    // Print the given DM:Src to a PDF, breaking on 8.5x11 pages.
+    SkAutoTUnref<SkDocument> doc(SkDocument::CreatePDF(dst));
+
     int width  = src.size().width(),
         height = src.size().height();
 
     const int kLetterWidth  = 612,  // 8.5 * 72
               kLetterHeight = 792;  // 11 * 72
     const SkRect letter = SkRect::MakeWH(SkIntToScalar(kLetterWidth),
                                          SkIntToScalar(kLetterHeight));
 
     int xPages = ((width - 1) / kLetterWidth) + 1;
     int yPages = ((height - 1) / kLetterHeight) + 1;
@@ skipping 11 matching lines @@
                 return err;
             }
             doc->endPage();
         }
     }
     doc->close();
     dst->flush();
     return "";
 }
 
-PDFSink::PDFSink() {}
-
-Error PDFSink::draw(const Src& src, SkBitmap*, SkWStream* dst, SkString*) const {
-    SkAutoTUnref<SkDocument> doc(SkDocument::CreatePDF(dst));
-    if (!doc) {
-        return "SkDocument::CreatePDF() returned NULL";
-    }
-    return draw_skdocument(src, doc.get(), dst);
-}
-
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-XPSSink::XPSSink() {}
-
-Error XPSSink::draw(const Src& src, SkBitmap*, SkWStream* dst, SkString*) const {
-    SkAutoTUnref<SkDocument> doc(SkDocument::CreateXPS(dst));
-    if (!doc) {
-        return "SkDocument::CreateXPS() returned NULL";
-    }
-    return draw_skdocument(src, doc.get(), dst);
-}
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-
 SKPSink::SKPSink() {}
 
 Error SKPSink::draw(const Src& src, SkBitmap*, SkWStream* dst, SkString*) const {
     SkSize size;
     size = src.size();
     SkPictureRecorder recorder;
     Error err = src.draw(recorder.beginRecording(size.width(), size.height()));
     if (!err.isEmpty()) {
         return err;
     }
@@ skipping 218 matching lines @@
             surfaces.unrefAll();
             return "";
         }
         SkISize size() const SK_OVERRIDE { return fSize; }
         Name name() const SK_OVERRIDE { sk_throw(); return ""; }  // No one should be calling this.
     } proxy(fW, fH, pic, src.size());
     return fSink->draw(proxy, bitmap, stream, log);
 }
 
 }  // namespace DM