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 <reed@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>

2 files changed, 8 insertions, 3 deletions

diff --git a/include/utils/SkNWayCanvas.h b/include/utils/SkNWayCanvas.h
index e8b88ab157..d8856dad0b 100644
--- a/include/utils/SkNWayCanvas.h
+++ b/include/utils/SkNWayCanvas.h
@@ -10,9 +10,9 @@
 #define SkNWayCanvas_DEFINED
 
 #include "../private/SkTDArray.h"
-#include "SkCanvas.h"
+#include "SkNoDrawCanvas.h"
 
-class SK_API SkNWayCanvas : public SkCanvas {
+class SK_API SkNWayCanvas : public SkNoDrawCanvas {
 public:
     SkNWayCanvas(int width, int height);
     virtual ~SkNWayCanvas();
@@ -87,7 +87,7 @@ protected:
     class Iter;
 
 private:
-    typedef SkCanvas INHERITED;
+    typedef SkNoDrawCanvas INHERITED;
 };
 
 
diff --git a/include/utils/SkNoDrawCanvas.h b/include/utils/SkNoDrawCanvas.h
index 0330251ede..e8c5d7e5ca 100644
--- a/include/utils/SkNoDrawCanvas.h
+++ b/include/utils/SkNoDrawCanvas.h
@@ -10,6 +10,8 @@
 
 #include "SkCanvas.h"
 
+struct SkIRect;
+
 // SkNoDrawCanvas is a helper for SkCanvas subclasses which do not need to
 // actually rasterize (e.g., analysis of the draw calls).
 //
@@ -22,6 +24,9 @@ class SK_API SkNoDrawCanvas : public SkCanvas {
 public:
     SkNoDrawCanvas(int width, int height);
 
+    // TODO: investigate the users of this ctor.
+    SkNoDrawCanvas(const SkIRect&);
+
 protected:
     SaveLayerStrategy getSaveLayerStrategy(const SaveLayerRec& rec) override;