1 files changed, 9 insertions, 7 deletions
diff --git a/chromium/third_party/blink/renderer/platform/fonts/opentype/font_settings.h b/chromium/third_party/blink/renderer/platform/fonts/opentype/font_settings.h
index d5f69315f47..588eda1b3d6 100644
--- a/chromium/third_party/blink/renderer/platform/fonts/opentype/font_settings.h
+++ b/chromium/third_party/blink/renderer/platform/fonts/opentype/font_settings.h
@@ -5,7 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_FONTS_OPENTYPE_FONT_SETTINGS_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_FONTS_OPENTYPE_FONT_SETTINGS_H_
 
-#include "base/macros.h"
 #include "base/memory/scoped_refptr.h"
 #include "third_party/blink/renderer/platform/platform_export.h"
 #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
@@ -58,6 +57,9 @@ class FontTagValuePair {
 template <typename T>
 class FontSettings {
  public:
+  FontSettings(const FontSettings&) = delete;
+  FontSettings& operator=(const FontSettings&) = delete;
+
   void Append(const T& feature) { list_.push_back(feature); }
   wtf_size_t size() const { return list_.size(); }
   const T& operator[](wtf_size_t index) const { return list_[index]; }
@@ -102,8 +104,6 @@ class FontSettings {
 
  private:
   Vector<T, 0> list_;
-
-  DISALLOW_COPY_AND_ASSIGN(FontSettings);
 };
 
 using FontFeature = FontTagValuePair<int>;
@@ -112,13 +112,14 @@ using FontVariationAxis = FontTagValuePair<float>;
 class PLATFORM_EXPORT FontFeatureSettings
     : public FontSettings<FontFeature>,
       public RefCounted<FontFeatureSettings> {
-  DISALLOW_COPY_AND_ASSIGN(FontFeatureSettings);
-
  public:
   static scoped_refptr<FontFeatureSettings> Create() {
     return base::AdoptRef(new FontFeatureSettings());
   }
 
+  FontFeatureSettings(const FontFeatureSettings&) = delete;
+  FontFeatureSettings& operator=(const FontFeatureSettings&) = delete;
+
  private:
   FontFeatureSettings() = default;
 };
@@ -126,13 +127,14 @@ class PLATFORM_EXPORT FontFeatureSettings
 class PLATFORM_EXPORT FontVariationSettings
     : public FontSettings<FontVariationAxis>,
       public RefCounted<FontVariationSettings> {
-  DISALLOW_COPY_AND_ASSIGN(FontVariationSettings);
-
  public:
   static scoped_refptr<FontVariationSettings> Create() {
     return base::AdoptRef(new FontVariationSettings());
   }
 
+  FontVariationSettings(const FontVariationSettings&) = delete;
+  FontVariationSettings& operator=(const FontVariationSettings&) = delete;
+
   unsigned GetHash() const;
 
  private: