aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/doc
diff options
context:
space:
mode:
authorGravatar halcanary <halcanary@google.com>2015-03-03 08:34:14 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-03-03 08:34:14 -0800
commitc2574f3657b1359496a4eba5b191961974b3a64f (patch)
tree4837addb7e2b9df8d35faa943408cb25aa206fbc /src/doc
parent00d39bcbfc8394a9b48b86b04ab06ec19091fa43 (diff)
Revert of XPS, DM: add SkDocument::CreateXPS (patchset #8 id:310001 of https://codereview.chromium.org/963953002/)
Reason for revert: breaking iOS build. Original issue's description: > XPS, DM: add SkDocument::CreateXPS > > - SkDocument::CreateXPS() function added, returns NULL on non-Windows OS. > > - DM: (Windows only) an XPSSink is added, fails on non-Windows OS > > - DM: Common code for PDFSink::draw and XPSSink::draw are factored into > draw_skdocument static function. > > - SkDocument_XPS (Windows only) implementation of SkDocument via > SkXPSDevice. > > - SkDocument_XPS_None (non-Windows) returns NULL for > SkDocument::CreateXPS(). > > - gyp/xps.gyp refactored. > > - SkXPSDevice::drawTextOnPath removed (see http://crrev.com/925343003 ) > > - SkXPSDevice::drawPath supports conics via SkAutoConicToQuads. > > NOPRESUBMIT=true > > Committed: https://skia.googlesource.com/skia/+/00d39bcbfc8394a9b48b86b04ab06ec19091fa43 TBR=reed@google.com,bungeman@google.com,mtklein@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/978443002
Diffstat (limited to 'src/doc')
-rw-r--r--src/doc/SkDocument_XPS.cpp79
-rw-r--r--src/doc/SkDocument_XPS_None.cpp3
2 files changed, 0 insertions, 82 deletions
diff --git a/src/doc/SkDocument_XPS.cpp b/src/doc/SkDocument_XPS.cpp
deleted file mode 100644
index db14a708bd..0000000000
--- a/src/doc/SkDocument_XPS.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkDocument.h"
-#include "SkXPSDevice.h"
-#include "SkStream.h"
-
-class SkDocument_XPS : public SkDocument {
-public:
- SkDocument_XPS(SkWStream* stream,
- void (*doneProc)(SkWStream*, bool),
- SkScalar dpi)
- : SkDocument(stream, doneProc) {
- const SkScalar kPointsPerMeter = SkDoubleToScalar(360000.0 / 127.0);
- fUnitsPerMeter.set(kPointsPerMeter, kPointsPerMeter);
- SkScalar pixelsPerMeterScale = SkDoubleToScalar(dpi * 5000.0 / 127.0);
- fPixelsPerMeter.set(pixelsPerMeterScale, pixelsPerMeterScale);
- fDevice.beginPortfolio(stream);
- }
-
- virtual ~SkDocument_XPS() {
- // subclasses must call close() in their destructors
- this->close();
- }
-
-protected:
- virtual SkCanvas* onBeginPage(SkScalar width,
- SkScalar height,
- const SkRect& trimBox) SK_OVERRIDE {
- fDevice.beginSheet(fUnitsPerMeter, fPixelsPerMeter,
- SkSize::Make(width, height));
- fCanvas.reset(SkNEW_ARGS(SkCanvas, (&fDevice)));
- fCanvas->clipRect(trimBox);
- fCanvas->translate(trimBox.x(), trimBox.y());
- return fCanvas.get();
- }
-
- void onEndPage() SK_OVERRIDE {
- SkASSERT(fCanvas.get());
- fCanvas->flush();
- fCanvas.reset(NULL);
- fDevice.endSheet();
- }
-
- bool onClose(SkWStream*) SK_OVERRIDE {
- SkASSERT(!fCanvas.get());
- return fDevice.endPortfolio();
- }
-
- void onAbort() SK_OVERRIDE {}
-
-private:
- SkXPSDevice fDevice;
- SkAutoTUnref<SkCanvas> fCanvas;
- SkVector fUnitsPerMeter;
- SkVector fPixelsPerMeter;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-SkDocument* SkDocument::CreateXPS(SkWStream* stream, SkScalar dpi) {
- return stream ? SkNEW_ARGS(SkDocument_XPS, (stream, NULL, dpi)) : NULL;
-}
-
-static void delete_wstream(SkWStream* stream, bool aborted) {
- SkDELETE(stream);
-}
-
-SkDocument* SkDocument::CreateXPS(const char path[], SkScalar dpi) {
- SkAutoTDelete<SkFILEWStream> stream(SkNEW_ARGS(SkFILEWStream, (path)));
- if (!stream->isValid()) {
- return NULL;
- }
- return SkNEW_ARGS(SkDocument_XPS, (stream.detach(), delete_wstream, dpi));
-}
diff --git a/src/doc/SkDocument_XPS_None.cpp b/src/doc/SkDocument_XPS_None.cpp
deleted file mode 100644
index 01055e5cf0..0000000000
--- a/src/doc/SkDocument_XPS_None.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "SkDocument.h"
-SkDocument* SkDocument::CreateXPS(SkWStream*, SkScalar) { return NULL; }
-SkDocument* SkDocument::CreateXPS(const char path[], SkScalar) { return NULL; }