diff options
| author |  Hal Canary <halcanary@google.com> | 2017-07-20 15:36:00 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-20 20:23:54 +0000 |
| commit | c7d295ecf712dece58ae6654721b3708fd8a40d6 (patch) | |
| tree | 17102e9c4283d6d8edc328ce8a58da872ba17fe4 | |
| parent | 93d7d23a3a2d293da998187cdc9d628086a60d5f (diff) | |
DM: excercise other SkPDF raster dpis
Change-Id: Ia50661a8391da526d509adbe2d7203866c140b1c
Reviewed-on: https://skia-review.googlesource.com/25321
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
| -rw-r--r-- | dm/DM.cpp | 6 | ||||
| -rw-r--r-- | dm/DMSrcSink.cpp | 3 | ||||
| -rw-r--r-- | dm/DMSrcSink.h | 3 |
3 files changed, 7 insertions, 5 deletions
@@ -20,6 +20,7 @@ #include "SkCommonFlagsConfig.h" #include "SkCommonFlagsPathRenderer.h" #include "SkData.h" +#include "SkDocument.h" #include "SkDebugfTracer.h" #include "SkEventTracingPriv.h" #include "SkFontMgr.h" @@ -877,13 +878,14 @@ static Sink* create_sink(const GrContextOptions& grCtxOptions, const SkCommandLi SINK("8888", RasterSink, kN32_SkColorType); SINK("srgb", RasterSink, kN32_SkColorType, srgbColorSpace); SINK("f16", RasterSink, kRGBA_F16_SkColorType, srgbLinearColorSpace); - SINK("pdf", PDFSink); + SINK("pdf", PDFSink, false, SK_ScalarDefaultRasterDPI); SINK("skp", SKPSink); SINK("pipe", PipeSink); SINK("svg", SVGSink); SINK("null", NullSink); SINK("xps", XPSSink); - SINK("pdfa", PDFSink, true); + SINK("pdfa", PDFSink, true, SK_ScalarDefaultRasterDPI); + SINK("pdf300", PDFSink, false, 300); SINK("jsdebug", DebugSink); } #undef SINK diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index a299369f0a..6876254ce7 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -1393,8 +1393,7 @@ Error PDFSink::draw(const Src& src, SkBitmap*, SkWStream* dst, SkString*) const metadata.fTitle = src.name(); metadata.fSubject = "rendering correctness test"; metadata.fCreator = "Skia/DM"; - sk_sp<SkDocument> doc = SkDocument::MakePDF(dst, SK_ScalarDefaultRasterDPI, - metadata, nullptr, fPDFA); + sk_sp<SkDocument> doc = SkDocument::MakePDF(dst, fRasterDpi, metadata, nullptr, fPDFA); if (!doc) { return "SkDocument::MakePDF() returned nullptr"; } diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h index f2e4ac29f7..a4c3c488dd 100644 --- a/dm/DMSrcSink.h +++ b/dm/DMSrcSink.h @@ -330,11 +330,12 @@ private: class PDFSink : public Sink { public: - PDFSink(bool pdfa = false) : fPDFA(pdfa) {} + PDFSink(bool pdfa, SkScalar rasterDpi) : fPDFA(pdfa), fRasterDpi(rasterDpi) {} Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override; const char* fileExtension() const override { return "pdf"; } SinkFlags flags() const override { return SinkFlags{ SinkFlags::kVector, SinkFlags::kDirect }; } bool fPDFA; + SkScalar fRasterDpi; }; class XPSSink : public Sink { |