WebFonts cache-aware timeout adaptation

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

 /*
  * Copyright (C) 2007, 2008 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 49 matching lines @@
   bool isCORSFailed() const { return m_corsFailed; }
   String otsParsingMessage() const { return m_otsParsingMessage; }
 
   bool ensureCustomFontData();
   FontPlatformData platformDataFromCustomData(
       float size,
       bool bold,
       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:
     FontResourceFactory() : ResourceFactory(Resource::Font) {}
 
     Resource* create(const ResourceRequest& request,
                      const ResourceLoaderOptions& options,
                      const String& charset) const override {
       return new FontResource(request, options);
     }
   };
   FontResource(const ResourceRequest&, const ResourceLoaderOptions&);
 
   void checkNotify() override;
   void fontLoadShortLimitCallback(TimerBase*);
   void fontLoadLongLimitCallback(TimerBase*);
+  void notifyClientsShortLimitExceeded();
+  void notifyClientsLongLimitExceeded();
 
   enum LoadLimitState {
     LoadNotStarted,
     UnderLimit,
     ShortLimitExceeded,
     LongLimitExceeded
   };
 
   std::unique_ptr<FontCustomPlatformData> m_fontData;
   String m_otsParsingMessage;
   LoadLimitState m_loadLimitState;
   bool m_corsFailed;
   Timer<FontResource> m_fontLoadShortLimitTimer;
   Timer<FontResource> m_fontLoadLongLimitTimer;
 
   friend class MemoryCache;
 };
 
 DEFINE_RESOURCE_TYPE_CASTS(Font);
 
 class FontResourceClient : public ResourceClient {
  public:
   ~FontResourceClient() override {}
   static bool isExpectedType(ResourceClient* client) {
     return client->getResourceClientType() == FontType;
   }
   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
 
 #endif