From 439ace939b6aaa58408ece0e9e89b633353571ae Mon Sep 17 00:00:00 2001 From: Florin Malita Date: Fri, 2 Dec 2016 12:05:41 -0500 Subject: Rebase non-drawing SkCanvas subclasses to SkNoDrawCanvas R=reed@google.com,mtklein@google.com Change-Id: I7df84587821db561e262a915afa23108a4a78834 Reviewed-on: https://skia-review.googlesource.com/5508 Reviewed-by: Mike Reed Commit-Queue: Florin Malita --- src/pipe/SkPipeCanvas.cpp | 2 +- src/pipe/SkPipeCanvas.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/pipe') diff --git a/src/pipe/SkPipeCanvas.cpp b/src/pipe/SkPipeCanvas.cpp index 43235c3e68..1614bbd6b8 100644 --- a/src/pipe/SkPipeCanvas.cpp +++ b/src/pipe/SkPipeCanvas.cpp @@ -208,7 +208,7 @@ public: /////////////////////////////////////////////////////////////////////////////////////////////////// SkPipeCanvas::SkPipeCanvas(const SkRect& cull, SkPipeDeduper* deduper, SkWStream* stream) - : INHERITED(cull.roundOut(), SkCanvas::kConservativeRasterClip_InitFlag) + : INHERITED(cull.roundOut()) , fDeduper(deduper) , fStream(stream) {} diff --git a/src/pipe/SkPipeCanvas.h b/src/pipe/SkPipeCanvas.h index 508c2a1ba5..e7b99bdd93 100644 --- a/src/pipe/SkPipeCanvas.h +++ b/src/pipe/SkPipeCanvas.h @@ -8,9 +8,9 @@ #ifndef SkPipeCanvas_DEFINED #define SkPipeCanvas_DEFINED -#include "SkCanvas.h" #include "SkDeduper.h" #include "SkImage.h" +#include "SkNoDrawCanvas.h" #include "SkPipe.h" #include "SkTypeface.h" #include "SkWriteBuffer.h" @@ -89,7 +89,7 @@ private: }; -class SkPipeCanvas : public SkCanvas { +class SkPipeCanvas : public SkNoDrawCanvas { public: SkPipeCanvas(const SkRect& cull, SkPipeDeduper*, SkWStream*); ~SkPipeCanvas() override; @@ -165,7 +165,7 @@ private: friend class SkPipeWriter; - typedef SkCanvas INHERITED; + typedef SkNoDrawCanvas INHERITED; }; -- cgit v1.2.3