[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/raster/zero_copy_raster_buffer_provider.cc b/cc/raster/zero_copy_raster_buffer_provider.cc
index 8e5eb1c..6f491eb7 100644
--- a/cc/raster/zero_copy_raster_buffer_provider.cc
+++ b/cc/raster/zero_copy_raster_buffer_provider.cc
@@ -8,7 +8,6 @@
 
 #include <algorithm>
 
-#include "base/macros.h"
 #include "base/trace_event/process_memory_dump.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/traced_value.h"
@@ -75,6 +74,7 @@
         resource_format_(in_use_resource.format()),
         resource_color_space_(in_use_resource.color_space()),
         gpu_memory_buffer_(std::move(backing_->gpu_memory_buffer)) {}
+  ZeroCopyRasterBufferImpl(const ZeroCopyRasterBufferImpl&) = delete;
 
   ~ZeroCopyRasterBufferImpl() override {
     // If GpuMemoryBuffer allocation failed (https://crbug.com/554541), then
@@ -107,6 +107,8 @@
     backing_->gpu_memory_buffer = std::move(gpu_memory_buffer_);
   }
 
+  ZeroCopyRasterBufferImpl& operator=(const ZeroCopyRasterBufferImpl&) = delete;
+
   // Overridden from RasterBuffer:
   void Playback(const RasterSource* raster_source,
                 const gfx::Rect& raster_full_rect,
@@ -154,8 +156,6 @@
   viz::ResourceFormat resource_format_;
   gfx::ColorSpace resource_color_space_;
   std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_;
-
-  DISALLOW_COPY_AND_ASSIGN(ZeroCopyRasterBufferImpl);
 };
 
 }  // namespace