Remove CSSFontSelector argument and member from CSSSegmentedFontFace

third_party/WebKit/Source/core/css/CSSSegmentedFontFace.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 18 matching lines @@
 #include "core/css/CSSFontSelector.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/fonts/FontDescription.h"
 #include "platform/fonts/FontFaceCreationParams.h"
 #include "platform/fonts/SegmentedFontData.h"
 #include "platform/fonts/SimpleFontData.h"
 
 namespace blink {
 
-CSSSegmentedFontFace::CSSSegmentedFontFace(CSSFontSelector* fontSelector,
-                                           FontTraits traits)
-    : m_fontSelector(fontSelector),
-      m_traits(traits),
+CSSSegmentedFontFace::CSSSegmentedFontFace(FontTraits traits)
+    : m_traits(traits),
       m_firstNonCssConnectedFace(m_fontFaces.end()),
       m_approximateCharacterCount(0) {}
 
 CSSSegmentedFontFace::~CSSSegmentedFontFace() {}
 
 void CSSSegmentedFontFace::pruneTable() {
   // Make sure the glyph page tree prunes out all uses of this custom font.
   if (m_fontDataTable.isEmpty())
     return;
 
@@ skipping 87 matching lines @@
   if (fontData->numFaces()) {
     // No release, we have a reference to an object in the cache which should
     // retain the ref count it has.
     return fontData;
   }
 
   return nullptr;
 }
 
 void CSSSegmentedFontFace::willUseFontData(
+    Document* document,
     const FontDescription& fontDescription,
     const String& text) {
   m_approximateCharacterCount += text.length();
   for (FontFaceList::reverse_iterator it = m_fontFaces.rbegin();
        it != m_fontFaces.rend(); ++it) {
     if ((*it)->loadStatus() != FontFace::Unloaded)
       break;
-    if ((*it)->cssFontFace()->maybeLoadFont(fontDescription, text))
+    if ((*it)->cssFontFace()->maybeLoadFont(document, fontDescription, text))
       break;
   }
 }
 
 void CSSSegmentedFontFace::willUseRange(
+    Document* document,
     const blink::FontDescription& fontDescription,
     const blink::FontDataForRangeSet& rangeSet) {
   // Iterating backwards since later defined unicode-range faces override
   // previously defined ones, according to the CSS3 fonts module.
   // https://drafts.csswg.org/css-fonts/#composite-fonts
   for (FontFaceList::reverse_iterator it = m_fontFaces.rbegin();
        it != m_fontFaces.rend(); ++it) {
     CSSFontFace* cssFontFace = (*it)->cssFontFace();
-    if (cssFontFace->maybeLoadFont(fontDescription, rangeSet))
+    if (cssFontFace->maybeLoadFont(document, fontDescription, rangeSet))
       break;
   }
 }
 
 bool CSSSegmentedFontFace::checkFont(const String& text) const {
   for (const auto& fontFace : m_fontFaces) {
     if (fontFace->loadStatus() != FontFace::Loaded &&
         fontFace->cssFontFace()->ranges()->intersectsWith(text))
       return false;
   }
   return true;
 }
 
 void CSSSegmentedFontFace::match(const String& text,
                                  HeapVector<Member<FontFace>>& faces) const {
   for (const auto& fontFace : m_fontFaces) {
     if (fontFace->cssFontFace()->ranges()->intersectsWith(text))
       faces.push_back(fontFace);
   }
 }
 
 DEFINE_TRACE(CSSSegmentedFontFace) {
-  visitor->trace(m_fontSelector);
   visitor->trace(m_firstNonCssConnectedFace);
   visitor->trace(m_fontFaces);
 }
 
 }  // namespace blink