[go: nahoru, domu]

[PE] Remove DISALLOW* macro usage from cc/

This patch replaces DISALLOW style macros from base/macros.h with
explicitly deleted constructors and/or operators.

R=pkasting@chromium.org

Change-Id: I78a2030015dbbb05e7e8c7fac4dcc502efc250c2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1518337
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Commit-Queue: vmpstr <vmpstr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#640415}
diff --git a/cc/paint/paint_canvas.h b/cc/paint/paint_canvas.h
index 342e20e4..0f0c694e 100644
--- a/cc/paint/paint_canvas.h
+++ b/cc/paint/paint_canvas.h
@@ -6,7 +6,6 @@
 #define CC_PAINT_PAINT_CANVAS_H_
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "build/build_config.h"
 #include "cc/paint/paint_export.h"
@@ -42,8 +41,11 @@
 // from SkCanvas to PaintCanvas or from SkPicture back into PaintRecord.
 class CC_PAINT_EXPORT PaintCanvas {
  public:
-  PaintCanvas() {}
-  virtual ~PaintCanvas() {}
+  PaintCanvas() = default;
+  PaintCanvas(const PaintCanvas&) = delete;
+  virtual ~PaintCanvas() = default;
+
+  PaintCanvas& operator=(const PaintCanvas&) = delete;
 
   // TODO(enne): this only appears to mostly be used to determine if this is
   // recording or not, so could be simplified or removed.
@@ -193,8 +195,6 @@
 
  private:
   printing::MetafileSkia* metafile_ = nullptr;
-
-  DISALLOW_COPY_AND_ASSIGN(PaintCanvas);
 };
 
 class CC_PAINT_EXPORT PaintCanvasAutoRestore {