SkCanvas, SkImageGenerator, SkStream: remove SkNoncopyable

Change-Id: If2b27f62c3d825b388239ef6ee35722d46eed664
Reviewed-on: https://skia-review.googlesource.com/134949
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>

3 files changed, 34 insertions, 6 deletions

diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index cd83c9ca3c..e6c896fa58 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -75,7 +75,12 @@ class SkVertices;
     SkCanvas can be constructed to draw to SkBitmap without first creating raster surface.
     This approach may be deprecated in the future.
 */
-class SK_API SkCanvas : SkNoncopyable {
+class SK_API SkCanvas {
+    SkCanvas(SkCanvas&&) = delete;
+    SkCanvas(const SkCanvas&) = delete;
+    SkCanvas& operator=(SkCanvas&&) = delete;
+    SkCanvas& operator=(const SkCanvas&) = delete;
+
     enum PrivateSaveLayerFlags {
         kDontClipToLayer_PrivateSaveLayerFlag   = 1U << 31,
     };
@@ -2703,8 +2708,12 @@ private:
     bool fAllowSoftClip;
     bool fAllowSimplifyClip;
 
-    class AutoValidateClip : ::SkNoncopyable {
+    class AutoValidateClip {
     public:
+        AutoValidateClip(AutoValidateClip&&) = delete;
+        AutoValidateClip(const AutoValidateClip&) = delete;
+        AutoValidateClip& operator=(AutoValidateClip&&) = delete;
+        AutoValidateClip& operator=(const AutoValidateClip&) = delete;
         explicit AutoValidateClip(SkCanvas* canvas) : fCanvas(canvas) {
             fCanvas->validateClip();
         }
@@ -2730,8 +2739,12 @@ private:
     goes out of scope. Use this to guarantee that the canvas is restored to a known
     state.
 */
-class SkAutoCanvasRestore : SkNoncopyable {
+class SkAutoCanvasRestore {
 public:
+    SkAutoCanvasRestore(SkAutoCanvasRestore&&) = delete;
+    SkAutoCanvasRestore(const SkAutoCanvasRestore&) = delete;
+    SkAutoCanvasRestore& operator=(SkAutoCanvasRestore&&) = delete;
+    SkAutoCanvasRestore& operator=(const SkAutoCanvasRestore&) = delete;
 
     /** Preserves SkCanvas save count. Optionally saves SkCanvas clip and SkCanvas matrix.
 
diff --git a/include/core/SkImageGenerator.h b/include/core/SkImageGenerator.h
index 86a0747519..3e0d313ced 100644
--- a/include/core/SkImageGenerator.h
+++ b/include/core/SkImageGenerator.h
@@ -24,8 +24,13 @@ class SkMatrix;
 class SkPaint;
 class SkPicture;
 
-class SK_API SkImageGenerator : public SkNoncopyable {
+class SK_API SkImageGenerator {
 public:
+    SkImageGenerator(SkImageGenerator&&) = delete;
+    SkImageGenerator(const SkImageGenerator&) = delete;
+    SkImageGenerator& operator=(SkImageGenerator&&) = delete;
+    SkImageGenerator& operator=(const SkImageGenerator&) = delete;
+
     /**
      *  The PixelRef which takes ownership of this SkImageGenerator
      *  will call the image generator's destructor.
diff --git a/include/core/SkStream.h b/include/core/SkStream.h
index d73c8a097e..0c6ce0b520 100644
--- a/include/core/SkStream.h
+++ b/include/core/SkStream.h
@@ -38,9 +38,14 @@ class SkStreamMemory;
  *  no more data (at EOF or hit an error). The caller should *not* call again
  *  in hopes of fulfilling more of the request.
  */
-class SK_API SkStream : public SkNoncopyable {
+class SK_API SkStream {
 public:
     virtual ~SkStream() {}
+    SkStream() {}
+    SkStream(SkStream&&) = delete;
+    SkStream(const SkStream&) = delete;
+    SkStream& operator=(SkStream&&) = delete;
+    SkStream& operator=(const SkStream&) = delete;
 
     /**
      *  Attempts to open the specified file as a stream, returns nullptr on failure.
@@ -218,9 +223,14 @@ private:
     SkStreamMemory* onFork() const override = 0;
 };
 
-class SK_API SkWStream : SkNoncopyable {
+class SK_API SkWStream {
 public:
     virtual ~SkWStream();
+    SkWStream() {}
+    SkWStream(SkWStream&&) = delete;
+    SkWStream(const SkWStream&) = delete;
+    SkWStream& operator=(SkWStream&&) = delete;
+    SkWStream& operator=(const SkWStream&) = delete;
 
     /** Called to write bytes to a SkWStream. Returns true on success
         @param buffer the address of at least size bytes to be written to the stream