[WIP] WebFonts cache-aware timeout adaption

third_party/WebKit/Source/core/fetch/FontResource.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile, Inc.
  *
  * 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
@@ skipping 21 matching lines @@
 #include "platform/Histogram.h"
 #include "platform/SharedBuffer.h"
 #include "platform/fonts/FontCustomPlatformData.h"
 #include "platform/fonts/FontPlatformData.h"
 #include "wtf/CurrentTime.h"
 
 namespace blink {
 
 // Durations of font-display periods.
 // https://tabatkins.github.io/specs/css-font-display/#font-display-desc
+// BUG(570205): Revisit short limit value once cache-aware font display is

[kouhei (in TOK), 2016/10/20 10:43:07]

TODO(shaochuan) Revisit ... crbug.com/570205.

[Shao-Chuan Lee, 2016/10/21 04:35:02]

Done.

+// launched.
 static const double fontLoadWaitShortLimitSec = 0.1;
 static const double fontLoadWaitLongLimitSec = 3.0;
 
 enum FontPackageFormat {
   PackageFormatUnknown,
   PackageFormatSFNT,
   PackageFormatWOFF,
   PackageFormatWOFF2,
   PackageFormatSVG,
   PackageFormatEnumMax
@@ skipping 84 matching lines @@
 
 FontPlatformData FontResource::platformDataFromCustomData(
     float size,
     bool bold,
     bool italic,
     FontOrientation orientation) {
   DCHECK(m_fontData);
   return m_fontData->fontPlatformData(size, bold, italic, orientation);
 }
 
+void FontResource::willReloadAfterDiskCacheMiss() {
+  ProhibitAddRemoveClientInScope prohibitAddRemoveClient(this);
+
+  ResourceClientWalker<FontResourceClient> walker(clients());
+  while (FontResourceClient* client = walker.next())
+    client->willReloadAfterDiskCacheMiss(this);
+
+  DCHECK(isLoading());
+  DCHECK(!resourceRequest().isCacheAwareLoadingActivated());
+  // Both timers should have been started by calling startLoadLimitTimers() from
+  // RemoteFontFaceSource::beginLoadIfNeeded().
+  if (!m_fontLoadShortLimitTimer.isActive())
+    fontLoadShortLimitCallback(nullptr);
+  if (!m_fontLoadLongLimitTimer.isActive())
+    fontLoadLongLimitCallback(nullptr);
+}
+
 void FontResource::fontLoadShortLimitCallback(TimerBase*) {
   if (!isLoading())
     return;
+  if (resourceRequest().isCacheAwareLoadingActivated())
+    return;
   DCHECK_EQ(m_loadLimitState, UnderLimit);
   m_loadLimitState = ShortLimitExceeded;
   ResourceClientWalker<FontResourceClient> walker(clients());
   while (FontResourceClient* client = walker.next())
     client->fontLoadShortLimitExceeded(this);
 }
 
 void FontResource::fontLoadLongLimitCallback(TimerBase*) {
   if (!isLoading())
     return;
+  if (resourceRequest().isCacheAwareLoadingActivated())
+    return;
   DCHECK_EQ(m_loadLimitState, ShortLimitExceeded);
   m_loadLimitState = LongLimitExceeded;
   ResourceClientWalker<FontResourceClient> walker(clients());
   while (FontResourceClient* client = walker.next())
     client->fontLoadLongLimitExceeded(this);
 }
 
 void FontResource::allClientsAndObserversRemoved() {
   m_fontData.reset();
   Resource::allClientsAndObserversRemoved();
 }
 
 void FontResource::checkNotify() {
   m_fontLoadShortLimitTimer.stop();
   m_fontLoadLongLimitTimer.stop();
 
   Resource::checkNotify();
 }
 
 }  // namespace blink