Replace DISALLOW_COPY_AND_ASSIGN with =delete versions in "/blink/ren…

…derer/core/style" we should return to Google C++ style when it comes to deleting implicit copy constructors and assign operators. Bug: 1010217 Change-Id: I8b1eb095ae96d208d5a5f019ed1b309de8640523 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2352266 Reviewed-by: Anders Hartvoll Ruud <andruud@chromium.org> Reviewed-by: Eric Willigers <ericwilligers@chromium.org> Commit-Queue: Eric Willigers <ericwilligers@chromium.org> Cr-Commit-Position: refs/heads/master@{#798999}
Denger-Network · Aug 18, 2020 · b189ebf · b189ebf
1 parent de03993
commit b189ebf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -988,6 +988,7 @@ Szymon Piechowicz <szymonpiechowicz@o2.pl>
 Taeheon Kim <skyrabbits1@gmail.com>
 Taeho Nam <thn7440@gmail.com>
 Taehoon Lee <taylor.hoon@gmail.com>
+Tae Shin <taeshindev@gmail.com>
 Takashi Fujita <tgfjt.mail@gmail.com>
 Takeshi Kurosawa <taken.spc@gmail.com>
 Tanay Chowdhury <tanay.c@samsung.com>

diff --git a/third_party/blink/renderer/core/style/filter_operation.h b/third_party/blink/renderer/core/style/filter_operation.h
@@ -26,7 +26,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_STYLE_FILTER_OPERATION_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_STYLE_FILTER_OPERATION_H_
 
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/style/shadow_data.h"
 #include "third_party/blink/renderer/platform/geometry/float_rect.h"
@@ -114,7 +113,8 @@ class CORE_EXPORT FilterOperation : public GarbageCollected<FilterOperation> {
   OperationType type_;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(FilterOperation);
+  FilterOperation(const FilterOperation&) = delete;
+  FilterOperation& operator=(const FilterOperation&) = delete;
 };
 
 class CORE_EXPORT ReferenceFilterOperation : public FilterOperation {

diff --git a/third_party/blink/renderer/core/style/grid_positions_resolver.h b/third_party/blink/renderer/core/style/grid_positions_resolver.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_STYLE_GRID_POSITIONS_RESOLVER_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_STYLE_GRID_POSITIONS_RESOLVER_H_
 
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/style/grid_position.h"
 #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
 
@@ -49,7 +48,8 @@ class NamedLineCollection {
   size_t auto_repeat_total_tracks_;
   size_t auto_repeat_track_list_length_;
 
-  DISALLOW_COPY_AND_ASSIGN(NamedLineCollection);
+  NamedLineCollection(const NamedLineCollection&) = delete;
+  NamedLineCollection& operator=(const NamedLineCollection&) = delete;
 };
 
 // This is a utility class with all the code related to grid items positions

diff --git a/third_party/blink/renderer/core/style/style_svg_resource.h b/third_party/blink/renderer/core/style/style_svg_resource.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_STYLE_STYLE_SVG_RESOURCE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_STYLE_STYLE_SVG_RESOURCE_H_
 
-#include "base/macros.h"
 #include "base/memory/scoped_refptr.h"
 #include "third_party/blink/renderer/core/svg/svg_resource.h"
 #include "third_party/blink/renderer/platform/heap/persistent.h"
@@ -46,7 +45,8 @@ class StyleSVGResource : public RefCounted<StyleSVGResource> {
   Persistent<SVGResource> resource_;
   const AtomicString url_;
 
-  DISALLOW_COPY_AND_ASSIGN(StyleSVGResource);
+  StyleSVGResource(const StyleSVGResource&) = delete;
+  StyleSVGResource& operator=(const StyleSVGResource&) = delete;
 };
 
 }  // namespace blink