WebFonts cache-aware timeout adaptation

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

Index: third_party/WebKit/Source/core/fetch/FontResource.h
diff --git a/third_party/WebKit/Source/core/fetch/FontResource.h b/third_party/WebKit/Source/core/fetch/FontResource.h
index 1a4d0ae51db8b44ffbf66354e00057ec4709b2b3..23d84554f3e1ae7c72ff42fec2af753e3f2a92b4 100644
--- a/third_party/WebKit/Source/core/fetch/FontResource.h
+++ b/third_party/WebKit/Source/core/fetch/FontResource.h
@@ -26,6 +26,7 @@
 #ifndef FontResource_h
 #define FontResource_h
 
+#include "base/gtest_prod_util.h"
 #include "core/CoreExport.h"
 #include "core/fetch/Resource.h"
 #include "core/fetch/ResourceClient.h"
@@ -72,6 +73,8 @@ class CORE_EXPORT FontResource final : public Resource {
   // font is not needed for painting the text.
   bool isLowPriorityLoadingAllowedForRemoteFont() const;
 
+  void willReloadAfterDiskCacheMiss() override;
+
  private:
   class FontResourceFactory : public ResourceFactory {
    public:
@@ -88,12 +91,16 @@ class CORE_EXPORT FontResource final : public Resource {
   void checkNotify() override;
   void fontLoadShortLimitCallback(TimerBase*);
   void fontLoadLongLimitCallback(TimerBase*);
+  void notifyClientsShortLimitExceeded();
+  void notifyClientsLongLimitExceeded();
 
+  // This is used in UMA histograms, should not change order.
   enum LoadLimitState {
     LoadNotStarted,
     UnderLimit,
     ShortLimitExceeded,
-    LongLimitExceeded
+    LongLimitExceeded,
+    LoadLimitStateEnumMax
   };
 
   std::unique_ptr<FontCustomPlatformData> m_fontData;
@@ -104,6 +111,7 @@ class CORE_EXPORT FontResource final : public Resource {
   Timer<FontResource> m_fontLoadLongLimitTimer;
 
   friend class MemoryCache;
+  FRIEND_TEST_ALL_PREFIXES(ResourceFetcherTest, CacheAwareFontLoading);
 };
 
 DEFINE_RESOURCE_TYPE_CASTS(Font);
@@ -115,6 +123,10 @@ class FontResourceClient : public ResourceClient {
     return client->getResourceClientType() == FontType;
   }
   ResourceClientType getResourceClientType() const final { return FontType; }
+
+  // If cache-aware loading is activated, both callbacks will be blocked until
+  // disk cache miss. Calls to addClient() and removeClient() in both callbacks
+  // are prohibited to prevent race issues regarding current loading state.
   virtual void fontLoadShortLimitExceeded(FontResource*) {}
   virtual void fontLoadLongLimitExceeded(FontResource*) {}