Replace DISALLOW_COPY_AND_ASSIGN with =delete in blink/../cssom

Explicitly remove the copy constructor and assignment operator with the delete keyword. Bug: 1010217 Change-Id: I05d56372a89033c9e5941c476761dd621497a058 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2362170Reviewed-by: Alan Cutter <alancutter@chromium.org> Commit-Queue: Alan Cutter <alancutter@chromium.org> Cr-Commit-Position: refs/heads/master@{#799511}

Replace DISALLOW_COPY_AND_ASSIGN with =delete in blink/../cssom
Explicitly remove the copy constructor and assignment operator with the delete keyword. Bug: 1010217 Change-Id: I05d56372a89033c9e5941c476761dd621497a058 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2362170Reviewed-by: Alan Cutter <alancutter@chromium.org> Commit-Queue: Alan Cutter <alancutter@chromium.org> Cr-Commit-Position: refs/heads/master@{#799511}
9e2eeaa5 · Sundoo Kim · Commit Bot · 8700b2a9 · 9e2eeaa5 · 9e2eeaa5
Commit 9e2eeaa5 authored Aug 19, 2020 by Sundoo Kim Committed by Commit Bot Aug 19, 2020
44 changed files
--- a/third_party/blink/renderer/core/css/cssom/computed_style_property_map.h
+++ b/third_party/blink/renderer/core/css/cssom/computed_style_property_map.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_COMPUTED_STYLE_PROPERTY_MAP_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_COMPUTED_STYLE_PROPERTY_MAP_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/css_computed_style_declaration.h"
 #include "third_party/blink/renderer/core/css/css_selector.h"
 #include "third_party/blink/renderer/core/css/cssom/style_property_map_read_only_main_thread.h"
@@ -28,6 +27,8 @@ class CORE_EXPORT ComputedStylePropertyMap
  ComputedStylePropertyMap(Node* node, const String& pseudo_element = String())
      : pseudo_id_(CSSSelector::ParsePseudoId(pseudo_element, node)),
        node_(node) {}
+  ComputedStylePropertyMap(const ComputedStylePropertyMap&) = delete;
+  ComputedStylePropertyMap& operator=(const ComputedStylePropertyMap&) = delete;
  void Trace(Visitor* visitor) const override {
    visitor->Trace(node_);
@@ -58,7 +59,6 @@ class CORE_EXPORT ComputedStylePropertyMap
  Node* StyledNode() const;
  const ComputedStyle* UpdateStyle() const;
-  DISALLOW_COPY_AND_ASSIGN(ComputedStylePropertyMap);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/cross_thread_color_value.h
+++ b/third_party/blink/renderer/core/css/cssom/cross_thread_color_value.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CROSS_THREAD_COLOR_VALUE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CROSS_THREAD_COLOR_VALUE_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/css/css_primitive_value.h"
 #include "third_party/blink/renderer/core/css/cssom/cross_thread_style_value.h"
@@ -19,6 +18,8 @@ class CSSStyleValue;
 class CORE_EXPORT CrossThreadColorValue final : public CrossThreadStyleValue {
 public:
  explicit CrossThreadColorValue(Color value) : value_(value) {}
+  CrossThreadColorValue(const CrossThreadColorValue&) = delete;
+  CrossThreadColorValue& operator=(const CrossThreadColorValue&) = delete;
  ~CrossThreadColorValue() override = default;
  StyleValueType GetType() const override { return StyleValueType::kColorType; }
@@ -33,7 +34,6 @@ class CORE_EXPORT CrossThreadColorValue final : public CrossThreadStyleValue {
  friend class CrossThreadStyleValueTest;
  Color value_;
-  DISALLOW_COPY_AND_ASSIGN(CrossThreadColorValue);
 };
 template <>

--- a/third_party/blink/renderer/core/css/cssom/cross_thread_keyword_value.h
+++ b/third_party/blink/renderer/core/css/cssom/cross_thread_keyword_value.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CROSS_THREAD_KEYWORD_VALUE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CROSS_THREAD_KEYWORD_VALUE_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/css/cssom/cross_thread_style_value.h"
 #include "third_party/blink/renderer/platform/wtf/casting.h"
@@ -19,6 +18,8 @@ class CORE_EXPORT CrossThreadKeywordValue final : public CrossThreadStyleValue {
 public:
  explicit CrossThreadKeywordValue(const String& keyword)
      : keyword_value_(keyword) {}
+  CrossThreadKeywordValue(const CrossThreadKeywordValue&) = delete;
+  CrossThreadKeywordValue& operator=(const CrossThreadKeywordValue&) = delete;
  ~CrossThreadKeywordValue() override = default;
  StyleValueType GetType() const override {
@@ -34,7 +35,6 @@ class CORE_EXPORT CrossThreadKeywordValue final : public CrossThreadStyleValue {
  friend class CrossThreadStyleValueTest;
  String keyword_value_;
-  DISALLOW_COPY_AND_ASSIGN(CrossThreadKeywordValue);
 };
 template <>

--- a/third_party/blink/renderer/core/css/cssom/cross_thread_style_value.h
+++ b/third_party/blink/renderer/core/css/cssom/cross_thread_style_value.h
@@ -7,7 +7,6 @@
 #include <memory>
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/core_export.h"
 namespace blink {
@@ -26,6 +25,8 @@ class CORE_EXPORT CrossThreadStyleValue {
    kColorType,
  };
+  CrossThreadStyleValue(const CrossThreadStyleValue&) = delete;
+  CrossThreadStyleValue& operator=(const CrossThreadStyleValue&) = delete;
  virtual ~CrossThreadStyleValue() = default;
  virtual StyleValueType GetType() const = 0;
@@ -36,9 +37,6 @@ class CORE_EXPORT CrossThreadStyleValue {
 protected:
  CrossThreadStyleValue() = default;
- private:
-  DISALLOW_COPY_AND_ASSIGN(CrossThreadStyleValue);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/cross_thread_unit_value.h
+++ b/third_party/blink/renderer/core/css/cssom/cross_thread_unit_value.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CROSS_THREAD_UNIT_VALUE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CROSS_THREAD_UNIT_VALUE_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/css/css_primitive_value.h"
 #include "third_party/blink/renderer/core/css/cssom/cross_thread_style_value.h"
@@ -19,6 +18,8 @@ class CORE_EXPORT CrossThreadUnitValue final : public CrossThreadStyleValue {
 public:
  explicit CrossThreadUnitValue(double value, CSSPrimitiveValue::UnitType unit)
      : value_(value), unit_(unit) {}
+  CrossThreadUnitValue(const CrossThreadUnitValue&) = delete;
+  CrossThreadUnitValue& operator=(const CrossThreadUnitValue&) = delete;
  ~CrossThreadUnitValue() override = default;
  StyleValueType GetType() const override { return StyleValueType::kUnitType; }
@@ -34,7 +35,6 @@ class CORE_EXPORT CrossThreadUnitValue final : public CrossThreadStyleValue {
  double value_;
  CSSPrimitiveValue::UnitType unit_;
-  DISALLOW_COPY_AND_ASSIGN(CrossThreadUnitValue);
 };
 template <>

--- a/third_party/blink/renderer/core/css/cssom/cross_thread_unparsed_value.h
+++ b/third_party/blink/renderer/core/css/cssom/cross_thread_unparsed_value.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CROSS_THREAD_UNPARSED_VALUE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CROSS_THREAD_UNPARSED_VALUE_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/css/cssom/cross_thread_style_value.h"
 #include "third_party/blink/renderer/platform/wtf/casting.h"
@@ -19,6 +18,8 @@ class CORE_EXPORT CrossThreadUnparsedValue final
    : public CrossThreadStyleValue {
 public:
  explicit CrossThreadUnparsedValue(const String& value) : value_(value) {}
+  CrossThreadUnparsedValue(const CrossThreadUnparsedValue&) = delete;
+  CrossThreadUnparsedValue& operator=(const CrossThreadUnparsedValue&) = delete;
  ~CrossThreadUnparsedValue() override = default;
  StyleValueType GetType() const override {
@@ -34,7 +35,6 @@ class CORE_EXPORT CrossThreadUnparsedValue final
  friend class CrossThreadStyleValueTest;
  String value_;
-  DISALLOW_COPY_AND_ASSIGN(CrossThreadUnparsedValue);
 };
 template <>

--- a/third_party/blink/renderer/core/css/cssom/cross_thread_unsupported_value.h
+++ b/third_party/blink/renderer/core/css/cssom/cross_thread_unsupported_value.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CROSS_THREAD_UNSUPPORTED_VALUE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CROSS_THREAD_UNSUPPORTED_VALUE_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/css/cssom/cross_thread_style_value.h"
 #include "third_party/blink/renderer/platform/wtf/casting.h"
@@ -19,6 +18,9 @@ class CORE_EXPORT CrossThreadUnsupportedValue final
    : public CrossThreadStyleValue {
 public:
  explicit CrossThreadUnsupportedValue(const String& value) : value_(value) {}
+  CrossThreadUnsupportedValue(const CrossThreadUnsupportedValue&) = delete;
+  CrossThreadUnsupportedValue& operator=(const CrossThreadUnsupportedValue&) =
+      delete;
  ~CrossThreadUnsupportedValue() override = default;
  StyleValueType GetType() const override {
@@ -33,7 +35,6 @@ class CORE_EXPORT CrossThreadUnsupportedValue final
  friend class CrossThreadStyleValueTest;
  String value_;
-  DISALLOW_COPY_AND_ASSIGN(CrossThreadUnsupportedValue);
 };
 template <>

--- a/third_party/blink/renderer/core/css/cssom/css_keyword_value.h
+++ b/third_party/blink/renderer/core/css/cssom/css_keyword_value.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_KEYWORD_VALUE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_KEYWORD_VALUE_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/css/cssom/css_style_value.h"
 #include "third_party/blink/renderer/core/css_value_keywords.h"
@@ -24,6 +23,8 @@ class CORE_EXPORT CSSKeywordValue final : public CSSStyleValue {
  static CSSKeywordValue* FromCSSValue(const CSSValue&);
  explicit CSSKeywordValue(const String& keyword) : keyword_value_(keyword) {}
+  CSSKeywordValue(const CSSKeywordValue&) = delete;
+  CSSKeywordValue& operator=(const CSSKeywordValue&) = delete;
  StyleValueType GetType() const override { return kKeywordType; }
@@ -35,7 +36,6 @@ class CORE_EXPORT CSSKeywordValue final : public CSSStyleValue {
 private:
  String keyword_value_;
-  DISALLOW_COPY_AND_ASSIGN(CSSKeywordValue);
 };
 template <>

--- a/third_party/blink/renderer/core/css/cssom/css_math_invert.h
+++ b/third_party/blink/renderer/core/css/cssom/css_math_invert.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_MATH_INVERT_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_MATH_INVERT_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/cssom/css_math_value.h"
 namespace blink {
@@ -28,6 +27,8 @@ class CORE_EXPORT CSSMathInvert : public CSSMathValue {
  CSSMathInvert(CSSNumericValue* value, const CSSNumericValueType& type)
      : CSSMathValue(type), value_(value) {}
+  CSSMathInvert(const CSSMathInvert&) = delete;
+  CSSMathInvert& operator=(const CSSMathInvert&) = delete;
  String getOperator() const final { return "invert"; }
@@ -66,7 +67,6 @@ class CORE_EXPORT CSSMathInvert : public CSSMathValue {
  void BuildCSSText(Nested, ParenLess, StringBuilder&) const final;
  Member<CSSNumericValue> value_;
-  DISALLOW_COPY_AND_ASSIGN(CSSMathInvert);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_math_max.h
+++ b/third_party/blink/renderer/core/css/cssom/css_math_max.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_MATH_MAX_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_MATH_MAX_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/cssom/css_math_variadic.h"
 namespace blink {
@@ -24,6 +23,8 @@ class CORE_EXPORT CSSMathMax final : public CSSMathVariadic {
  CSSMathMax(CSSNumericArray* values, const CSSNumericValueType& type)
      : CSSMathVariadic(values, type) {}
+  CSSMathMax(const CSSMathMax&) = delete;
+  CSSMathMax& operator=(const CSSMathMax&) = delete;
  String getOperator() const final { return "max"; }
@@ -36,7 +37,6 @@ class CORE_EXPORT CSSMathMax final : public CSSMathVariadic {
  void BuildCSSText(Nested, ParenLess, StringBuilder&) const final;
  base::Optional<CSSNumericSumValue> SumValue() const final;
-  DISALLOW_COPY_AND_ASSIGN(CSSMathMax);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_math_min.h
+++ b/third_party/blink/renderer/core/css/cssom/css_math_min.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_MATH_MIN_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_MATH_MIN_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/cssom/css_math_variadic.h"
 namespace blink {
@@ -26,6 +25,8 @@ class CORE_EXPORT CSSMathMin final : public CSSMathVariadic {
  CSSMathMin(CSSNumericArray* values, const CSSNumericValueType& type)
      : CSSMathVariadic(values, type) {}
+  CSSMathMin(const CSSMathMin&) = delete;
+  CSSMathMin& operator=(const CSSMathMin&) = delete;
  String getOperator() const final { return "min"; }
@@ -38,7 +39,6 @@ class CORE_EXPORT CSSMathMin final : public CSSMathVariadic {
  void BuildCSSText(Nested, ParenLess, StringBuilder&) const final;
  base::Optional<CSSNumericSumValue> SumValue() const final;
-  DISALLOW_COPY_AND_ASSIGN(CSSMathMin);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_math_negate.h
+++ b/third_party/blink/renderer/core/css/cssom/css_math_negate.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_MATH_NEGATE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_MATH_NEGATE_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/cssom/css_math_value.h"
 namespace blink {
@@ -27,6 +26,8 @@ class CORE_EXPORT CSSMathNegate : public CSSMathValue {
  CSSMathNegate(CSSNumericValue* value, const CSSNumericValueType& type)
      : CSSMathValue(type), value_(value) {}
+  CSSMathNegate(const CSSMathNegate&) = delete;
+  CSSMathNegate& operator=(const CSSMathNegate&) = delete;
  String getOperator() const final { return "negate"; }
@@ -65,7 +66,6 @@ class CORE_EXPORT CSSMathNegate : public CSSMathValue {
  void BuildCSSText(Nested, ParenLess, StringBuilder&) const final;
  Member<CSSNumericValue> value_;
-  DISALLOW_COPY_AND_ASSIGN(CSSMathNegate);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_math_product.h
+++ b/third_party/blink/renderer/core/css/cssom/css_math_product.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_MATH_PRODUCT_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_MATH_PRODUCT_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/cssom/css_math_variadic.h"
 namespace blink {
@@ -24,6 +23,8 @@ class CORE_EXPORT CSSMathProduct final : public CSSMathVariadic {
  CSSMathProduct(CSSNumericArray* values, const CSSNumericValueType& type)
      : CSSMathVariadic(values, type) {}
+  CSSMathProduct(const CSSMathProduct&) = delete;
+  CSSMathProduct& operator=(const CSSMathProduct&) = delete;
  String getOperator() const final { return "product"; }
@@ -36,7 +37,6 @@ class CORE_EXPORT CSSMathProduct final : public CSSMathVariadic {
  void BuildCSSText(Nested, ParenLess, StringBuilder&) const final;
  base::Optional<CSSNumericSumValue> SumValue() const final;
-  DISALLOW_COPY_AND_ASSIGN(CSSMathProduct);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_math_sum.h
+++ b/third_party/blink/renderer/core/css/cssom/css_math_sum.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_MATH_SUM_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_MATH_SUM_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/cssom/css_math_variadic.h"
 namespace blink {
@@ -24,6 +23,8 @@ class CORE_EXPORT CSSMathSum final : public CSSMathVariadic {
  CSSMathSum(CSSNumericArray* values, const CSSNumericValueType& type)
      : CSSMathVariadic(values, type) {}
+  CSSMathSum(const CSSMathSum&) = delete;
+  CSSMathSum& operator=(const CSSMathSum&) = delete;
  String getOperator() const final { return "sum"; }
@@ -36,7 +37,6 @@ class CORE_EXPORT CSSMathSum final : public CSSMathVariadic {
  void BuildCSSText(Nested, ParenLess, StringBuilder&) const final;
  base::Optional<CSSNumericSumValue> SumValue() const final;
-  DISALLOW_COPY_AND_ASSIGN(CSSMathSum);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_math_value.h
+++ b/third_party/blink/renderer/core/css/cssom/css_math_value.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_MATH_VALUE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_MATH_VALUE_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/cssom/css_numeric_value.h"
 namespace blink {
@@ -16,6 +15,9 @@ class CORE_EXPORT CSSMathValue : public CSSNumericValue {
  DEFINE_WRAPPERTYPEINFO();
 public:
+  CSSMathValue(const CSSMathValue&) = delete;
+  CSSMathValue& operator=(const CSSMathValue&) = delete;
  virtual String getOperator() const = 0;
  // From CSSNumericValue.
@@ -26,9 +28,6 @@ class CORE_EXPORT CSSMathValue : public CSSNumericValue {
 protected:
  CSSMathValue(const CSSNumericValueType& type) : CSSNumericValue(type) {}
- private:
-  DISALLOW_COPY_AND_ASSIGN(CSSMathValue);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_math_variadic.h
+++ b/third_party/blink/renderer/core/css/cssom/css_math_variadic.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_MATH_VARIADIC_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_MATH_VARIADIC_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/cssom/css_math_value.h"
 #include "third_party/blink/renderer/core/css/cssom/css_numeric_array.h"
@@ -15,6 +14,9 @@ namespace blink {
 class CORE_EXPORT CSSMathVariadic : public CSSMathValue {
 public:
+  CSSMathVariadic(const CSSMathVariadic&) = delete;
+  CSSMathVariadic& operator=(const CSSMathVariadic&) = delete;
  CSSNumericArray* values() { return values_.Get(); }
  const CSSNumericValueVector& NumericValues() const {
@@ -61,7 +63,6 @@ class CORE_EXPORT CSSMathVariadic : public CSSMathValue {
 private:
  Member<CSSNumericArray> values_;
-  DISALLOW_COPY_AND_ASSIGN(CSSMathVariadic);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_matrix_component.h
+++ b/third_party/blink/renderer/core/css/cssom/css_matrix_component.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_MATRIX_COMPONENT_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_MATRIX_COMPONENT_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/cssom/css_transform_component.h"
 #include "third_party/blink/renderer/core/geometry/dom_matrix.h"
 #include "third_party/blink/renderer/core/geometry/dom_matrix_read_only.h"
@@ -30,6 +29,8 @@ class CORE_EXPORT CSSMatrixComponent final : public CSSTransformComponent {
  CSSMatrixComponent(DOMMatrixReadOnly* matrix, bool is2D)
      : CSSTransformComponent(is2D), matrix_(DOMMatrix::Create(matrix)) {}
+  CSSMatrixComponent(const CSSMatrixComponent&) = delete;
+  CSSMatrixComponent& operator=(const CSSMatrixComponent&) = delete;
  // Getters and setters for attributes defined in the IDL.
  DOMMatrix* matrix() { return matrix_.Get(); }
@@ -48,7 +49,6 @@ class CORE_EXPORT CSSMatrixComponent final : public CSSTransformComponent {
 private:
  Member<DOMMatrix> matrix_;
-  DISALLOW_COPY_AND_ASSIGN(CSSMatrixComponent);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_numeric_array.h
+++ b/third_party/blink/renderer/core/css/cssom/css_numeric_array.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_NUMERIC_ARRAY_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_NUMERIC_ARRAY_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/cssom/css_numeric_value.h"
 namespace blink {
@@ -23,6 +22,8 @@ class CORE_EXPORT CSSNumericArray final : public ScriptWrappable {
  explicit CSSNumericArray(CSSNumericValueVector values)
      : values_(std::move(values)) {}
+  CSSNumericArray(const CSSNumericArray&) = delete;
+  CSSNumericArray& operator=(const CSSNumericArray&) = delete;
  void Trace(Visitor* visitor) const override {
    visitor->Trace(values_);
@@ -40,7 +41,6 @@ class CORE_EXPORT CSSNumericArray final : public ScriptWrappable {
 private:
  CSSNumericValueVector values_;
-  DISALLOW_COPY_AND_ASSIGN(CSSNumericArray);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_numeric_value.h
+++ b/third_party/blink/renderer/core/css/cssom/css_numeric_value.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_NUMERIC_VALUE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_NUMERIC_VALUE_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/bindings/core/v8/double_or_css_numeric_value.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/css/css_primitive_value.h"
@@ -31,6 +30,9 @@ class CORE_EXPORT CSSNumericValue : public CSSStyleValue {
  DEFINE_WRAPPERTYPEINFO();
 public:
+  CSSNumericValue(const CSSNumericValue&) = delete;
+  CSSNumericValue& operator=(const CSSNumericValue&) = delete;
  static CSSNumericValue* parse(const String& css_text, ExceptionState&);
  // Blink-internal ways of creating CSSNumericValues.
  static CSSNumericValue* FromCSSValue(const CSSPrimitiveValue&);
@@ -81,7 +83,6 @@ class CORE_EXPORT CSSNumericValue : public CSSStyleValue {
 private:
  CSSNumericValueType type_;
-  DISALLOW_COPY_AND_ASSIGN(CSSNumericValue);
 };
 CSSNumericValueVector CSSNumberishesToNumericValues(

--- a/third_party/blink/renderer/core/css/cssom/css_perspective.h
+++ b/third_party/blink/renderer/core/css/cssom/css_perspective.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_PERSPECTIVE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_PERSPECTIVE_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/css/cssom/css_numeric_value.h"
 #include "third_party/blink/renderer/core/css/cssom/css_transform_component.h"
@@ -29,6 +28,8 @@ class CORE_EXPORT CSSPerspective final : public CSSTransformComponent {
  static CSSPerspective* FromCSSValue(const CSSFunctionValue&);
  CSSPerspective(CSSNumericValue* length);
+  CSSPerspective(const CSSPerspective&) = delete;
+  CSSPerspective& operator=(const CSSPerspective&) = delete;
  // Getters and setters for attributes defined in the IDL.
  CSSNumericValue* length() { return length_.Get(); }
@@ -52,7 +53,6 @@ class CORE_EXPORT CSSPerspective final : public CSSTransformComponent {
 private:
  Member<CSSNumericValue> length_;
-  DISALLOW_COPY_AND_ASSIGN(CSSPerspective);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_position_value.h
+++ b/third_party/blink/renderer/core/css/cssom/css_position_value.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_POSITION_VALUE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_POSITION_VALUE_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/css/cssom/css_style_value.h"
 #include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
@@ -30,6 +29,8 @@ class CORE_EXPORT CSSPositionValue final : public CSSStyleValue {
  static CSSPositionValue* FromCSSValue(const CSSValue&);
  CSSPositionValue(CSSNumericValue* x, CSSNumericValue* y) : x_(x), y_(y) {}
+  CSSPositionValue(const CSSPositionValue&) = delete;
+  CSSPositionValue& operator=(const CSSPositionValue&) = delete;
  // Getters and setters defined in the IDL.
  CSSNumericValue* x() { return x_.Get(); }
@@ -54,7 +55,6 @@ class CORE_EXPORT CSSPositionValue final : public CSSStyleValue {
 protected:
  Member<CSSNumericValue> x_;
  Member<CSSNumericValue> y_;
-  DISALLOW_COPY_AND_ASSIGN(CSSPositionValue);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_resource_value.h
+++ b/third_party/blink/renderer/core/css/cssom/css_resource_value.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_RESOURCE_VALUE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_RESOURCE_VALUE_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/cssom/css_style_value.h"
 #include "third_party/blink/renderer/platform/loader/fetch/resource.h"
@@ -13,6 +12,8 @@ namespace blink {
 class CORE_EXPORT CSSResourceValue : public CSSStyleValue {
 public:
+  CSSResourceValue(const CSSResourceValue&) = delete;
+  CSSResourceValue& operator=(const CSSResourceValue&) = delete;
  ~CSSResourceValue() override = default;
  const String state() const {
@@ -38,9 +39,6 @@ class CORE_EXPORT CSSResourceValue : public CSSStyleValue {
  CSSResourceValue() = default;
  virtual ResourceStatus Status() const = 0;
- private:
-  DISALLOW_COPY_AND_ASSIGN(CSSResourceValue);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_rotate.h
+++ b/third_party/blink/renderer/core/css/cssom/css_rotate.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_ROTATE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_ROTATE_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/cssom/css_numeric_value.h"
 #include "third_party/blink/renderer/core/css/cssom/css_transform_component.h"
@@ -43,6 +42,8 @@ class CORE_EXPORT CSSRotate final : public CSSTransformComponent {
            CSSNumericValue* z,
            CSSNumericValue* angle,
            bool is2D);
+  CSSRotate(const CSSRotate&) = delete;
+  CSSRotate& operator=(const CSSRotate&) = delete;
  // Getters and setters for attributes defined in the IDL.
  CSSNumericValue* angle() { return angle_.Get(); }
@@ -73,7 +74,6 @@ class CORE_EXPORT CSSRotate final : public CSSTransformComponent {
  Member<CSSNumericValue> x_;
  Member<CSSNumericValue> y_;
  Member<CSSNumericValue> z_;
-  DISALLOW_COPY_AND_ASSIGN(CSSRotate);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_scale.h
+++ b/third_party/blink/renderer/core/css/cssom/css_scale.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_SCALE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_SCALE_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/cssom/css_transform_component.h"
 #include "third_party/blink/renderer/core/css/cssom/css_unit_value.h"
 #include "third_party/blink/renderer/core/geometry/dom_matrix.h"
@@ -47,6 +46,8 @@ class CORE_EXPORT CSSScale final : public CSSTransformComponent {
           CSSNumericValue* y,
           CSSNumericValue* z,
           bool is2D);
+  CSSScale(const CSSScale&) = delete;
+  CSSScale& operator=(const CSSScale&) = delete;
  // Getters and setters for attributes defined in the IDL.
  void x(CSSNumberish& x) { x.SetCSSNumericValue(x_); }
@@ -73,8 +74,6 @@ class CORE_EXPORT CSSScale final : public CSSTransformComponent {
  Member<CSSNumericValue> x_;
  Member<CSSNumericValue> y_;
  Member<CSSNumericValue> z_;
-  DISALLOW_COPY_AND_ASSIGN(CSSScale);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_skew.h
+++ b/third_party/blink/renderer/core/css/cssom/css_skew.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_SKEW_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_SKEW_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/cssom/css_numeric_value.h"
 #include "third_party/blink/renderer/core/css/cssom/css_transform_component.h"
@@ -31,6 +30,8 @@ class CORE_EXPORT CSSSkew final : public CSSTransformComponent {
  static CSSSkew* FromCSSValue(const CSSFunctionValue&);
  CSSSkew(CSSNumericValue* ax, CSSNumericValue* ay);
+  CSSSkew(const CSSSkew&) = delete;
+  CSSSkew& operator=(const CSSSkew&) = delete;
  // Getters and setters for the ax and ay attributes defined in the IDL.
  CSSNumericValue* ax() { return ax_.Get(); }
@@ -58,7 +59,6 @@ class CORE_EXPORT CSSSkew final : public CSSTransformComponent {
 private:
  Member<CSSNumericValue> ax_;
  Member<CSSNumericValue> ay_;
-  DISALLOW_COPY_AND_ASSIGN(CSSSkew);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_skew_x.h
+++ b/third_party/blink/renderer/core/css/cssom/css_skew_x.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_SKEW_X_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_SKEW_X_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/cssom/css_numeric_value.h"
 #include "third_party/blink/renderer/core/css/cssom/css_transform_component.h"
@@ -31,6 +30,8 @@ class CORE_EXPORT CSSSkewX final : public CSSTransformComponent {
  static CSSSkewX* FromCSSValue(const CSSFunctionValue&);
  CSSSkewX(CSSNumericValue* ax);
+  CSSSkewX(const CSSSkewX&) = delete;
+  CSSSkewX& operator=(const CSSSkewX&) = delete;
  // Getters and setters for the ax attributes defined in the IDL.
  CSSNumericValue* ax() { return ax_.Get(); }
@@ -54,7 +55,6 @@ class CORE_EXPORT CSSSkewX final : public CSSTransformComponent {
 private:
  Member<CSSNumericValue> ax_;
-  DISALLOW_COPY_AND_ASSIGN(CSSSkewX);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_skew_y.h
+++ b/third_party/blink/renderer/core/css/cssom/css_skew_y.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_SKEW_Y_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_SKEW_Y_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/cssom/css_numeric_value.h"
 #include "third_party/blink/renderer/core/css/cssom/css_transform_component.h"
@@ -31,6 +30,8 @@ class CORE_EXPORT CSSSkewY final : public CSSTransformComponent {
  static CSSSkewY* FromCSSValue(const CSSFunctionValue&);
  CSSSkewY(CSSNumericValue* ay);
+  CSSSkewY(const CSSSkewY&) = delete;
+  CSSSkewY& operator=(const CSSSkewY&) = delete;
  // Getters and setters for the ay attributes defined in the IDL.
  CSSNumericValue* ay() { return ay_.Get(); }
@@ -54,7 +55,6 @@ class CORE_EXPORT CSSSkewY final : public CSSTransformComponent {
 private:
  Member<CSSNumericValue> ay_;
-  DISALLOW_COPY_AND_ASSIGN(CSSSkewY);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_style_image_value.h
+++ b/third_party/blink/renderer/core/css/cssom/css_style_image_value.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_STYLE_IMAGE_VALUE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_STYLE_IMAGE_VALUE_H_
-#include "base/macros.h"
 #include "base/optional.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/css/cssom/css_resource_value.h"
@@ -20,6 +19,8 @@ class CORE_EXPORT CSSStyleImageValue : public CSSResourceValue,
  DEFINE_WRAPPERTYPEINFO();
 public:
+  CSSStyleImageValue(const CSSStyleImageValue&) = delete;
+  CSSStyleImageValue& operator=(const CSSStyleImageValue&) = delete;
  ~CSSStyleImageValue() override = default;
  // IDL
@@ -37,9 +38,6 @@ class CORE_EXPORT CSSStyleImageValue : public CSSResourceValue,
  CSSStyleImageValue() = default;
  virtual base::Optional<IntSize> IntrinsicSize() const = 0;
- private:
-  DISALLOW_COPY_AND_ASSIGN(CSSStyleImageValue);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_style_value.h
+++ b/third_party/blink/renderer/core/css/cssom/css_style_value.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_STYLE_VALUE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_STYLE_VALUE_H_
-#include "base/macros.h"
 #include "base/optional.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/css/css_property_names.h"
@@ -57,6 +56,8 @@ class CORE_EXPORT CSSStyleValue : public ScriptWrappable {
                                      const String& value,
                                      ExceptionState&);
+  CSSStyleValue(const CSSStyleValue&) = delete;
+  CSSStyleValue& operator=(const CSSStyleValue&) = delete;
  ~CSSStyleValue() override = default;
  virtual StyleValueType GetType() const = 0;
@@ -82,7 +83,6 @@ class CORE_EXPORT CSSStyleValue : public ScriptWrappable {
 private:
  String css_text_;
-  DISALLOW_COPY_AND_ASSIGN(CSSStyleValue);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_style_variable_reference_value.h
+++ b/third_party/blink/renderer/core/css/cssom/css_style_variable_reference_value.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_STYLE_VARIABLE_REFERENCE_VALUE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_STYLE_VARIABLE_REFERENCE_VALUE_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/css/cssom/css_unparsed_value.h"
 #include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
@@ -35,6 +34,10 @@ class CORE_EXPORT CSSStyleVariableReferenceValue final
  CSSStyleVariableReferenceValue(const String& variable,
                                 CSSUnparsedValue* fallback)
      : variable_(variable), fallback_(fallback) {}
+  CSSStyleVariableReferenceValue(const CSSStyleVariableReferenceValue&) =
+      delete;
+  CSSStyleVariableReferenceValue& operator=(
+      const CSSStyleVariableReferenceValue&) = delete;
  const String& variable() const { return variable_; }
  void setVariable(const String&, ExceptionState&);
@@ -50,9 +53,6 @@ class CORE_EXPORT CSSStyleVariableReferenceValue final
 protected:
  String variable_;
  Member<CSSUnparsedValue> fallback_;
- private:
-  DISALLOW_COPY_AND_ASSIGN(CSSStyleVariableReferenceValue);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_transform_component.h
+++ b/third_party/blink/renderer/core/css/cssom/css_transform_component.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_TRANSFORM_COMPONENT_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_TRANSFORM_COMPONENT_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/css/css_function_value.h"
 #include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
@@ -35,6 +34,8 @@ class CORE_EXPORT CSSTransformComponent : public ScriptWrappable {
    kTranslationType,
  };
+  CSSTransformComponent(const CSSTransformComponent&) = delete;
+  CSSTransformComponent& operator=(const CSSTransformComponent&) = delete;
  ~CSSTransformComponent() override = default;
  // Blink-internal ways of creating CSSTransformComponents.
@@ -56,7 +57,6 @@ class CORE_EXPORT CSSTransformComponent : public ScriptWrappable {
 private:
  bool is2D_;
-  DISALLOW_COPY_AND_ASSIGN(CSSTransformComponent);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_transform_value.h
+++ b/third_party/blink/renderer/core/css/cssom/css_transform_value.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_TRANSFORM_VALUE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_TRANSFORM_VALUE_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/css/cssom/css_style_value.h"
 #include "third_party/blink/renderer/core/css/cssom/css_transform_component.h"
@@ -34,6 +33,8 @@ class CORE_EXPORT CSSTransformValue final : public CSSStyleValue {
  CSSTransformValue(
      const HeapVector<Member<CSSTransformComponent>>& transform_components)
      : CSSStyleValue(), transform_components_(transform_components) {}
+  CSSTransformValue(const CSSTransformValue&) = delete;
+  CSSTransformValue& operator=(const CSSTransformValue&) = delete;
  bool is2D() const;
@@ -60,7 +61,6 @@ class CORE_EXPORT CSSTransformValue final : public CSSStyleValue {
 private:
  HeapVector<Member<CSSTransformComponent>> transform_components_;
-  DISALLOW_COPY_AND_ASSIGN(CSSTransformValue);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_translate.h
+++ b/third_party/blink/renderer/core/css/cssom/css_translate.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_TRANSLATE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_TRANSLATE_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/css_primitive_value.h"
 #include "third_party/blink/renderer/core/css/cssom/css_style_value.h"
 #include "third_party/blink/renderer/core/css/cssom/css_transform_component.h"
@@ -44,6 +43,8 @@ class CORE_EXPORT CSSTranslate final : public CSSTransformComponent {
               CSSNumericValue* y,
               CSSNumericValue* z,
               bool is2D);
+  CSSTranslate(const CSSTranslate&) = delete;
+  CSSTranslate& operator=(const CSSTranslate&) = delete;
  // Getters and setters for attributes defined in the IDL.
  CSSNumericValue* x() { return x_; }
@@ -70,7 +71,6 @@ class CORE_EXPORT CSSTranslate final : public CSSTransformComponent {
  Member<CSSNumericValue> x_;
  Member<CSSNumericValue> y_;
  Member<CSSNumericValue> z_;
-  DISALLOW_COPY_AND_ASSIGN(CSSTranslate);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/css_unit_value.h
+++ b/third_party/blink/renderer/core/css/cssom/css_unit_value.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_UNIT_VALUE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_UNIT_VALUE_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/css_numeric_literal_value.h"
 #include "third_party/blink/renderer/core/css/cssom/css_numeric_value.h"
 #include "third_party/blink/renderer/platform/wtf/casting.h"
@@ -33,6 +32,8 @@ class CORE_EXPORT CSSUnitValue final : public CSSNumericValue {
      : CSSNumericValue(CSSNumericValueType(unit)),
        value_(value),
        unit_(unit) {}
+  CSSUnitValue(const CSSUnitValue&) = delete;
+  CSSUnitValue& operator=(const CSSUnitValue&) = delete;
  // Setters and getters for attributes defined in the IDL.
  void setValue(double new_value) { value_ = new_value; }
@@ -67,7 +68,6 @@ class CORE_EXPORT CSSUnitValue final : public CSSNumericValue {
  double value_;
  CSSPrimitiveValue::UnitType unit_;
-  DISALLOW_COPY_AND_ASSIGN(CSSUnitValue);
 };
 template <>

--- a/third_party/blink/renderer/core/css/cssom/css_unparsed_value.h
+++ b/third_party/blink/renderer/core/css/cssom/css_unparsed_value.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_UNPARSED_VALUE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_UNPARSED_VALUE_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/bindings/core/v8/string_or_css_variable_reference_value.h"
 #include "third_party/blink/renderer/core/css/cssom/css_style_value.h"
 #include "third_party/blink/renderer/platform/wtf/casting.h"
@@ -42,6 +41,8 @@ class CORE_EXPORT CSSUnparsedValue final : public CSSStyleValue {
  CSSUnparsedValue(const HeapVector<CSSUnparsedSegment>& tokens)
      : CSSStyleValue(), tokens_(tokens) {}
+  CSSUnparsedValue(const CSSUnparsedValue&) = delete;
+  CSSUnparsedValue& operator=(const CSSUnparsedValue&) = delete;
  const CSSValue* ToCSSValue() const override;
@@ -74,7 +75,6 @@ class CORE_EXPORT CSSUnparsedValue final : public CSSStyleValue {
  FRIEND_TEST_ALL_PREFIXES(CSSVariableReferenceValueTest, MixedList);
  HeapVector<CSSUnparsedSegment> tokens_;
-  DISALLOW_COPY_AND_ASSIGN(CSSUnparsedValue);
 };
 template <>

--- a/third_party/blink/renderer/core/css/cssom/css_unsupported_color_value.h
+++ b/third_party/blink/renderer/core/css/cssom/css_unsupported_color_value.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_UNSUPPORTED_COLOR_VALUE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_UNSUPPORTED_COLOR_VALUE_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/css/css_color_value.h"
 #include "third_party/blink/renderer/core/css/cssom/css_unsupported_style_value.h"
@@ -32,6 +31,8 @@ class CORE_EXPORT CSSUnsupportedColorValue final
        color_value_(color) {}
  explicit CSSUnsupportedColorValue(const cssvalue::CSSColorValue& color_value)
      : CSSUnsupportedColorValue(color_value.Value()) {}
+  CSSUnsupportedColorValue(const CSSUnsupportedColorValue&) = delete;
+  CSSUnsupportedColorValue& operator=(const CSSUnsupportedColorValue&) = delete;
  StyleValueType GetType() const override { return kUnsupportedColorType; }
@@ -41,7 +42,6 @@ class CORE_EXPORT CSSUnsupportedColorValue final
 private:
  Color color_value_;
-  DISALLOW_COPY_AND_ASSIGN(CSSUnsupportedColorValue);
 };
 template <>

--- a/third_party/blink/renderer/core/css/cssom/css_unsupported_style_value.h
+++ b/third_party/blink/renderer/core/css/cssom/css_unsupported_style_value.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_UNSUPPORTED_STYLE_VALUE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_UNSUPPORTED_STYLE_VALUE_H_
-#include "base/macros.h"
 #include "base/optional.h"
 #include "third_party/blink/renderer/core/css/css_property_name.h"
 #include "third_party/blink/renderer/core/css/cssom/css_style_value.h"
@@ -35,6 +34,8 @@ class CORE_EXPORT CSSUnsupportedStyleValue : public CSSStyleValue {
      : name_(name) {
    SetCSSText(value.CssText());
  }
+  CSSUnsupportedStyleValue(const CSSUnsupportedStyleValue&) = delete;
+  CSSUnsupportedStyleValue& operator=(const CSSUnsupportedStyleValue&) = delete;
  StyleValueType GetType() const override {
    return StyleValueType::kUnknownType;
@@ -52,7 +53,6 @@ class CORE_EXPORT CSSUnsupportedStyleValue : public CSSStyleValue {
 private:
  base::Optional<CSSPropertyName> name_;
-  DISALLOW_COPY_AND_ASSIGN(CSSUnsupportedStyleValue);
 };
 template <>

--- a/third_party/blink/renderer/core/css/cssom/css_url_image_value.h
+++ b/third_party/blink/renderer/core/css/cssom/css_url_image_value.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_URL_IMAGE_VALUE_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_CSS_URL_IMAGE_VALUE_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/cssom/css_style_image_value.h"
 namespace blink {
@@ -15,6 +14,8 @@ class CSSImageValue;
 class CORE_EXPORT CSSURLImageValue final : public CSSStyleImageValue {
 public:
  explicit CSSURLImageValue(const CSSImageValue& value) : value_(value) {}
+  CSSURLImageValue(const CSSURLImageValue&) = delete;
+  CSSURLImageValue& operator=(const CSSURLImageValue&) = delete;
  const String& url() const;
@@ -37,7 +38,6 @@ class CORE_EXPORT CSSURLImageValue final : public CSSStyleImageValue {
  scoped_refptr<Image> GetImage() const;
  Member<const CSSImageValue> value_;
-  DISALLOW_COPY_AND_ASSIGN(CSSURLImageValue);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/declared_style_property_map.h
+++ b/third_party/blink/renderer/core/css/cssom/declared_style_property_map.h
@@ -23,6 +23,8 @@ class StyleRule;
 class CORE_EXPORT DeclaredStylePropertyMap final : public StylePropertyMap {
 public:
  explicit DeclaredStylePropertyMap(CSSStyleRule* owner_rule);
+  DeclaredStylePropertyMap(const DeclaredStylePropertyMap&) = delete;
+  DeclaredStylePropertyMap& operator=(const DeclaredStylePropertyMap&) = delete;
  void Trace(Visitor* visitor) const override {
    visitor->Trace(owner_rule_);
@@ -50,8 +52,6 @@ class CORE_EXPORT DeclaredStylePropertyMap final : public StylePropertyMap {
  StyleRule* GetStyleRule() const;
  WeakMember<CSSStyleRule> owner_rule_;
-  DISALLOW_COPY_AND_ASSIGN(DeclaredStylePropertyMap);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/inline_style_property_map.h
+++ b/third_party/blink/renderer/core/css/cssom/inline_style_property_map.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_INLINE_STYLE_PROPERTY_MAP_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_INLINE_STYLE_PROPERTY_MAP_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/cssom/style_property_map.h"
 #include "third_party/blink/renderer/core/dom/element.h"
@@ -15,6 +14,8 @@ class CORE_EXPORT InlineStylePropertyMap final : public StylePropertyMap {
 public:
  explicit InlineStylePropertyMap(Element* owner_element)
      : owner_element_(owner_element) {}
+  InlineStylePropertyMap(const InlineStylePropertyMap&) = delete;
+  InlineStylePropertyMap& operator=(const InlineStylePropertyMap&) = delete;
  void Trace(Visitor* visitor) const override {
    visitor->Trace(owner_element_);
@@ -40,7 +41,6 @@ class CORE_EXPORT InlineStylePropertyMap final : public StylePropertyMap {
 private:
  Member<Element> owner_element_;
-  DISALLOW_COPY_AND_ASSIGN(InlineStylePropertyMap);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/paint_worklet_style_property_map.h
+++ b/third_party/blink/renderer/core/css/cssom/paint_worklet_style_property_map.h
@@ -7,7 +7,6 @@
 #include <memory>
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/cssom/cross_thread_style_value.h"
 #include "third_party/blink/renderer/core/css/cssom/style_property_map_read_only.h"
 #include "third_party/blink/renderer/platform/graphics/compositor_element_id.h"
@@ -50,6 +49,9 @@ class CORE_EXPORT PaintWorkletStylePropertyMap
  // This constructor should be called on the worklet-thread only.
  explicit PaintWorkletStylePropertyMap(CrossThreadData data);
+  PaintWorkletStylePropertyMap(const PaintWorkletStylePropertyMap&) = delete;
+  PaintWorkletStylePropertyMap& operator=(const PaintWorkletStylePropertyMap&) =
+      delete;
  CSSStyleValue* get(const ExecutionContext*,
                     const String& property_name,
@@ -75,8 +77,6 @@ class CORE_EXPORT PaintWorkletStylePropertyMap
  IterationSource* StartIteration(ScriptState*, ExceptionState&) override;
  CrossThreadData data_;
-  DISALLOW_COPY_AND_ASSIGN(PaintWorkletStylePropertyMap);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/prepopulated_computed_style_property_map.h
+++ b/third_party/blink/renderer/core/css/cssom/prepopulated_computed_style_property_map.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_PREPOPULATED_COMPUTED_STYLE_PROPERTY_MAP_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_PREPOPULATED_COMPUTED_STYLE_PROPERTY_MAP_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/core/css/css_property_id_templates.h"
 #include "third_party/blink/renderer/core/css/cssom/style_property_map_read_only_main_thread.h"
 #include "third_party/blink/renderer/platform/wtf/text/atomic_string_hash.h"
@@ -34,6 +33,10 @@ class CORE_EXPORT PrepopulatedComputedStylePropertyMap
      const ComputedStyle&,
      const Vector<CSSPropertyID>& native_properties,
      const Vector<AtomicString>& custom_properties);
+  PrepopulatedComputedStylePropertyMap(
+      const PrepopulatedComputedStylePropertyMap&) = delete;
+  PrepopulatedComputedStylePropertyMap& operator=(
+      const PrepopulatedComputedStylePropertyMap&) = delete;
  // Updates the values of the properties based on the new computed style.
  void UpdateStyle(const Document&, const ComputedStyle&);
@@ -56,8 +59,6 @@ class CORE_EXPORT PrepopulatedComputedStylePropertyMap
  HeapHashMap<CSSPropertyID, Member<const CSSValue>> native_values_;
  HeapHashMap<AtomicString, Member<const CSSValue>> custom_values_;
-  DISALLOW_COPY_AND_ASSIGN(PrepopulatedComputedStylePropertyMap);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/style_property_map.h
+++ b/third_party/blink/renderer/core/css/cssom/style_property_map.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_STYLE_PROPERTY_MAP_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSSOM_STYLE_PROPERTY_MAP_H_
-#include "base/macros.h"
 #include "third_party/blink/renderer/bindings/core/v8/css_style_value_or_string.h"
 #include "third_party/blink/renderer/core/css/cssom/style_property_map_read_only_main_thread.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context.h"
@@ -19,6 +18,9 @@ class CORE_EXPORT StylePropertyMap : public StylePropertyMapReadOnlyMainThread {
  DEFINE_WRAPPERTYPEINFO();
 public:
+  StylePropertyMap(const StylePropertyMap&) = delete;
+  StylePropertyMap& operator=(const StylePropertyMap&) = delete;
  void set(const ExecutionContext*,
           const String& property_name,
           const HeapVector<CSSStyleValueOrString>& values,
@@ -43,9 +45,6 @@ class CORE_EXPORT StylePropertyMap : public StylePropertyMapReadOnlyMainThread {
  virtual void RemoveAllProperties() = 0;
  StylePropertyMap() = default;
- private:
-  DISALLOW_COPY_AND_ASSIGN(StylePropertyMap);
 };
 }  // namespace blink

--- a/third_party/blink/renderer/core/css/cssom/style_property_map_read_only_main_thread.h
+++ b/third_party/blink/renderer/core/css/cssom/style_property_map_read_only_main_thread.h
@@ -17,6 +17,10 @@ class CORE_EXPORT StylePropertyMapReadOnlyMainThread
 public:
  using StylePropertyMapEntry = std::pair<String, CSSStyleValueVector>;
+  StylePropertyMapReadOnlyMainThread(
+      const StylePropertyMapReadOnlyMainThread&) = delete;
+  StylePropertyMapReadOnlyMainThread& operator=(
+      const StylePropertyMapReadOnlyMainThread&) = delete;
  ~StylePropertyMapReadOnlyMainThread() override = default;
  CSSStyleValue* get(const ExecutionContext*,
@@ -47,9 +51,6 @@ class CORE_EXPORT StylePropertyMapReadOnlyMainThread
  IterationSource* StartIteration(ScriptState*, ExceptionState&) override;
  CSSStyleValue* GetShorthandProperty(const CSSProperty&) const;
- private:
-  DISALLOW_COPY_AND_ASSIGN(StylePropertyMapReadOnlyMainThread);
 };
 }  // namespace blink