From b1de5f9f2737159ce055305d87d237be5b0dc010 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Sat, 1 Jul 2017 22:17:15 -0400 Subject: SkDocument: consolidate trimBox code Change-Id: I56f651320964eb3bd33475d21e6977803c4ca140 Reviewed-on: https://skia-review.googlesource.com/21370 Reviewed-by: Ben Wagner Reviewed-by: Mike Reed Commit-Queue: Hal Canary --- src/xps/SkXPSDocument.cpp | 6 +----- src/xps/SkXPSDocument.h | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'src/xps') diff --git a/src/xps/SkXPSDocument.cpp b/src/xps/SkXPSDocument.cpp index 0d12e4f7f8..ac62c62002 100644 --- a/src/xps/SkXPSDocument.cpp +++ b/src/xps/SkXPSDocument.cpp @@ -33,13 +33,9 @@ SkXPSDocument::~SkXPSDocument() { this->close(); } -SkCanvas* SkXPSDocument::onBeginPage(SkScalar width, - SkScalar height, - const SkRect& trimBox) { +SkCanvas* SkXPSDocument::onBeginPage(SkScalar width, SkScalar height) { fDevice.beginSheet(fUnitsPerMeter, fPixelsPerMeter, {width, height}); fCanvas.reset(new SkCanvas(&fDevice)); - fCanvas->clipRect(trimBox); - fCanvas->translate(trimBox.x(), trimBox.y()); return fCanvas.get(); } diff --git a/src/xps/SkXPSDocument.h b/src/xps/SkXPSDocument.h index 726af8f58f..cccfc1f777 100644 --- a/src/xps/SkXPSDocument.h +++ b/src/xps/SkXPSDocument.h @@ -24,7 +24,7 @@ public: virtual ~SkXPSDocument(); protected: - SkCanvas* onBeginPage(SkScalar w, SkScalar h, const SkRect&) override; + SkCanvas* onBeginPage(SkScalar w, SkScalar h) override; void onEndPage() override; void onClose(SkWStream*) override; void onAbort() override; -- cgit v1.2.3