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 e83ab315a525782642b34205c432c2d1cc84114f..463c6fa670d3ebe2e7a29882e6101c5b652d1ee5 100644
--- a/third_party/WebKit/Source/core/fetch/FontResource.h
+++ b/third_party/WebKit/Source/core/fetch/FontResource.h
@@ -67,6 +67,10 @@ class CORE_EXPORT FontResource final : public Resource {
       bool italic,
       FontOrientation = FontOrientation::Horizontal);
 
+  // Calls to addClient() and removeClient() is forbidden in this callback to

[Kunihiko Sakamoto, 2016/10/31 08:22:46]

Is this restriction specific to FontResource? If not, shouldn't this comment
written in Resource.h?

[yhirano, 2016/10/31 12:44:32]

The comment is for FontResourceClient implementers, so it would be good to have
this comment in FontResourceClient.

[Shao-Chuan Lee, 2016/11/01 08:57:07]

Moved comment to FontResourceClient.

+  // prevent potential race issues.
+  void willReloadAfterDiskCacheMiss() override;
+
  private:
   class FontResourceFactory : public ResourceFactory {
    public:
@@ -83,6 +87,8 @@ class CORE_EXPORT FontResource final : public Resource {
   void checkNotify() override;
   void fontLoadShortLimitCallback(TimerBase*);
   void fontLoadLongLimitCallback(TimerBase*);
+  void notifyClientsShortLimitExceeded();
+  void notifyClientsLongLimitExceeded();
 
   enum LoadLimitState {
     LoadNotStarted,
@@ -112,6 +118,7 @@ class FontResourceClient : public ResourceClient {
   ResourceClientType getResourceClientType() const final { return FontType; }
   virtual void fontLoadShortLimitExceeded(FontResource*) {}

[Kunihiko Sakamoto, 2016/10/31 08:22:46]

Can you add a comment noting that these callbacks are blocked while loading from
cache.

[Kunihiko Sakamoto, 2016/11/02 03:46:36]

Ping, in case you have missed this comment.

[Shao-Chuan Lee, 2016/11/07 06:52:47]

Done.

   virtual void fontLoadLongLimitExceeded(FontResource*) {}
+  virtual void willReloadAfterDiskCacheMiss(const FontResource*) {}
 };
 
 }  // namespace blink