Remove CSSFontSelector argument and member from CSSSegmentedFontFace

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

 /*
  * Copyright (C) 2007, 2008, 2011 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 35 matching lines @@
     CSSSegmentedFontFace* segmentedFontFace) {
   ASSERT(!m_segmentedFontFace);
   m_segmentedFontFace = segmentedFontFace;
 }
 
 void CSSFontFace::didBeginLoad() {
   if (loadStatus() == FontFace::Unloaded)
     setLoadStatus(FontFace::Loading);
 }
 
-void CSSFontFace::fontLoaded(RemoteFontFaceSource* source) {
+void CSSFontFace::fontLoaded(RemoteFontFaceSource* source, Document* document) {
   if (!isValid() || source != m_sources.first())
     return;
 
   if (loadStatus() == FontFace::Loading) {
     if (source->isValid()) {
       setLoadStatus(FontFace::Loaded);
     } else if (source->getDisplayPeriod() ==
                RemoteFontFaceSource::FailurePeriod) {
       m_sources.clear();
       setLoadStatus(FontFace::Error);
     } else {
       m_sources.removeFirst();
-      load();
+      load(document);
     }
   }
 
   if (m_segmentedFontFace)
     m_segmentedFontFace->fontFaceInvalidated();
 }
 
 size_t CSSFontFace::approximateBlankCharacterCount() const {
   if (!m_sources.isEmpty() && m_sources.first()->isBlank() &&
       m_segmentedFontFace)
@@ skipping 26 matching lines @@
     m_sources.removeFirst();
   }
 
   if (loadStatus() == FontFace::Unloaded)
     setLoadStatus(FontFace::Loading);
   if (loadStatus() == FontFace::Loading)
     setLoadStatus(FontFace::Error);
   return nullptr;
 }
 
-bool CSSFontFace::maybeLoadFont(const FontDescription& fontDescription,
+bool CSSFontFace::maybeLoadFont(Document* document,
+                                const FontDescription& fontDescription,
                                 const String& text) {
   // This is a fast path of loading web font in style phase. For speed, this
   // only checks if the first character of the text is included in the font's
   // unicode range. If this font is needed by subsequent characters, load is
   // kicked off in layout phase.
   UChar32 character = text.characterStartingAt(0);
   if (m_ranges->contains(character)) {
     if (loadStatus() == FontFace::Unloaded)
-      load(fontDescription);
+      load(document, fontDescription);
     return true;
   }
   return false;
 }
 
-bool CSSFontFace::maybeLoadFont(const FontDescription& fontDescription,
+bool CSSFontFace::maybeLoadFont(Document* document,
+                                const FontDescription& fontDescription,
                                 const FontDataForRangeSet& rangeSet) {
   if (m_ranges == rangeSet.ranges()) {
     if (loadStatus() == FontFace::Unloaded) {
-      load(fontDescription);
+      load(document, fontDescription);
     }
     return true;
   }
   return false;
 }
 
-void CSSFontFace::load() {
+void CSSFontFace::load(Document* document) {
   FontDescription fontDescription;
   FontFamily fontFamily;
   fontFamily.setFamily(m_fontFace->family());
   fontDescription.setFamily(fontFamily);
   fontDescription.setTraits(m_fontFace->traits());
-  load(fontDescription);
+  load(document, fontDescription);
 }
 
-void CSSFontFace::load(const FontDescription& fontDescription) {
-  if (loadStatus() == FontFace::Unloaded)
+void CSSFontFace::load(Document* document,
+                       const FontDescription& fontDescription) {
+  if (loadStatus() == FontFace::Unloaded) {
     setLoadStatus(FontFace::Loading);
+    // Only begin loading if we have been added to a CSSSegmentedFontFace
+    // (which happens when we are ready to start loading).
+    if (m_segmentedFontFace)
+      FontFaceSet::from(*document)->beginFontLoading(m_fontFace);
+  }
   ASSERT(loadStatus() == FontFace::Loading);
 
   while (!m_sources.isEmpty()) {
     Member<CSSFontFaceSource>& source = m_sources.first();
     if (source->isValid()) {
       if (source->isLocal()) {
         if (source->isLocalFontAvailable(fontDescription)) {
           setLoadStatus(FontFace::Loaded);
           return;
         }
       } else {
         if (!source->isLoaded())
           source->beginLoadIfNeeded();
         else
           setLoadStatus(FontFace::Loaded);
         return;
       }
     }
     m_sources.removeFirst();
   }
   setLoadStatus(FontFace::Error);
 }
 
 void CSSFontFace::setLoadStatus(FontFace::LoadStatusType newStatus) {
   ASSERT(m_fontFace);
   if (newStatus == FontFace::Error)
     m_fontFace->setError();
   else
     m_fontFace->setLoadStatus(newStatus);
-
-  if (!m_segmentedFontFace)
-    return;
-  Document* document = m_segmentedFontFace->fontSelector()->document();
-  if (document && newStatus == FontFace::Loading)
-    FontFaceSet::from(*document)->beginFontLoading(m_fontFace);
 }
 
 DEFINE_TRACE(CSSFontFace) {
   visitor->trace(m_segmentedFontFace);
   visitor->trace(m_sources);
   visitor->trace(m_fontFace);
 }
 
 }  // namespace blink