[WIP] WebFonts cache-aware timeout adaption

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/css/RemoteFontFaceSource.h"
 
 #include "core/css/CSSCustomFontData.h"
 #include "core/css/CSSFontFace.h"
 #include "core/css/CSSFontSelector.h"
 #include "core/dom/Document.h"
@@ skipping 38 matching lines @@
 }
 
 }  // namespace
 
 RemoteFontFaceSource::RemoteFontFaceSource(FontResource* font,
                                            CSSFontSelector* fontSelector,
                                            FontDisplay display)
     : m_font(font),
       m_fontSelector(fontSelector),
       m_display(display),
-      m_period(display == FontDisplaySwap ? SwapPeriod : BlockPeriod),
+      m_period(BlockPeriod),
       m_histograms(font->url().protocolIsData()
                        ? FontLoadHistograms::FromDataURL
                        : font->isLoaded() ? FontLoadHistograms::FromMemoryCache
                                           : FontLoadHistograms::FromUnknown),
       m_isInterventionTriggered(false) {
   ThreadState::current()->registerPreFinalizer(this);
   m_font->addClient(this);
 
   if (shouldTriggerWebFontsIntervention()) {
     m_isInterventionTriggered = true;
@@ skipping 61 matching lines @@
   pruneTable();
   if (m_face) {
     m_fontSelector->fontFaceInvalidated();
     m_face->fontLoaded(this);
   }
   // Should not do anything after this line since the m_face->fontLoaded()
   // above may trigger deleting this object.
 }
 
 void RemoteFontFaceSource::fontLoadShortLimitExceeded(FontResource*) {
+  if (m_font->resourceRequest().isCacheAwareLoadingActivated())
+    return;
+
   if (m_display == FontDisplayFallback)
     switchToSwapPeriod();
   else if (m_display == FontDisplayOptional)
     switchToFailurePeriod();
 }
 
 void RemoteFontFaceSource::fontLoadLongLimitExceeded(FontResource*) {
+  if (m_font->resourceRequest().isCacheAwareLoadingActivated())
+    return;
+
   if (m_display == FontDisplayBlock ||
       (!m_isInterventionTriggered && m_display == FontDisplayAuto))
     switchToSwapPeriod();
   else if (m_display == FontDisplayFallback)
     switchToFailurePeriod();
 
   m_histograms.longLimitExceeded(m_isInterventionTriggered);
 }
 
+void RemoteFontFaceSource::willReloadAfterDiskCacheMiss(const FontResource*) {
+  if (m_display == FontDisplaySwap)
+    switchToSwapPeriod();
+
+  DCHECK(!m_font->resourceRequest().isCacheAwareLoadingActivated());
+  if (m_font->loadLimitState() == FontResource::ShortLimitExceeded ||

[Kunihiko Sakamoto, 2016/10/12 01:38:46]

Now we know that the font have to be fetched from network. What's the point of
waiting until the short limit?

+      m_font->loadLimitState() == FontResource::LongLimitExceeded)
+    fontLoadShortLimitExceeded(m_font.get());
+  if (m_font->loadLimitState() == FontResource::LongLimitExceeded)
+    fontLoadLongLimitExceeded(m_font.get());
+}
+
 void RemoteFontFaceSource::switchToSwapPeriod() {
   ASSERT(m_period == BlockPeriod);
   m_period = SwapPeriod;
 
   pruneTable();
   if (m_face) {
     m_fontSelector->fontFaceInvalidated();
     m_face->didBecomeVisibleFallback(this);
   }
 
@@ skipping 252 matching lines @@
       return Miss;
     case FromUnknown:
     // Fall through.
     default:
       NOTREACHED();
   }
   return Miss;
 }
 
 }  // namespace blink