1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/third_party/blink/renderer/platform/fonts/glyph_metrics_map.h b/chromium/third_party/blink/renderer/platform/fonts/glyph_metrics_map.h
index d3b908b218e..a93c90c1c85 100644
--- a/chromium/third_party/blink/renderer/platform/fonts/glyph_metrics_map.h
+++ b/chromium/third_party/blink/renderer/platform/fonts/glyph_metrics_map.h
@@ -37,7 +37,6 @@
 #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
 #include "third_party/blink/renderer/platform/wtf/assertions.h"
 #include "third_party/blink/renderer/platform/wtf/hash_map.h"
-#include "third_party/blink/renderer/platform/wtf/text/unicode.h"
 
 namespace blink {
 
@@ -49,6 +48,8 @@ class GlyphMetricsMap {
 
  public:
   GlyphMetricsMap() : filled_primary_page_(false) {}
+  GlyphMetricsMap(const GlyphMetricsMap&) = delete;
+  GlyphMetricsMap& operator=(const GlyphMetricsMap&) = delete;
   T MetricsForGlyph(Glyph glyph) {
     return LocatePage(glyph / GlyphMetricsPage::kSize)->MetricsForGlyph(glyph);
   }
@@ -61,9 +62,10 @@ class GlyphMetricsMap {
  private:
   class GlyphMetricsPage {
     USING_FAST_MALLOC(GlyphMetricsPage);
-    DISALLOW_COPY_AND_ASSIGN(GlyphMetricsPage);
 
    public:
+    GlyphMetricsPage(const GlyphMetricsPage&) = delete;
+    GlyphMetricsPage& operator=(const GlyphMetricsPage&) = delete;
     static const size_t kSize =
         256;  // Usually covers Latin-1 in a single page.
     GlyphMetricsPage() {}
@@ -95,8 +97,6 @@ class GlyphMetricsMap {
   // We optimize for the page that contains glyph indices 0-255.
   GlyphMetricsPage primary_page_;
   std::unique_ptr<HashMap<int, std::unique_ptr<GlyphMetricsPage>>> pages_;
-
-  DISALLOW_COPY_AND_ASSIGN(GlyphMetricsMap);
 };
 
 template <>
@@ -119,7 +119,7 @@ GlyphMetricsMap<T>::LocatePageSlowCase(unsigned page_number) {
     filled_primary_page_ = true;
   } else {
     if (pages_) {
-      page = pages_->at(page_number);
+      page = pages_->DeprecatedAtOrEmptyValue(page_number);
       if (page)
         return page;
     } else {