| 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 97ea91f2ea76ce92fe8f0dfc61ea812019b653c2..e83ab315a525782642b34205c432c2d1cc84114f 100644
|
| --- a/third_party/WebKit/Source/core/fetch/FontResource.h
|
| +++ b/third_party/WebKit/Source/core/fetch/FontResource.h
|
| @@ -54,7 +54,7 @@ class CORE_EXPORT FontResource final : public Resource {
|
| void setRevalidatingRequest(const ResourceRequest&) override;
|
|
|
| void allClientsAndObserversRemoved() override;
|
| - void startLoadLimitTimersIfNeeded();
|
| + void startLoadLimitTimers();
|
|
|
| void setCORSFailed() override { m_corsFailed = true; }
|
| bool isCORSFailed() const { return m_corsFailed; }
|
| @@ -84,7 +84,12 @@ class CORE_EXPORT FontResource final : public Resource {
|
| void fontLoadShortLimitCallback(TimerBase*);
|
| void fontLoadLongLimitCallback(TimerBase*);
|
|
|
| - enum LoadLimitState { UnderLimit, ShortLimitExceeded, LongLimitExceeded };
|
| + enum LoadLimitState {
|
| + LoadNotStarted,
|
| + UnderLimit,
|
| + ShortLimitExceeded,
|
| + LongLimitExceeded
|
| + };
|
|
|
| std::unique_ptr<FontCustomPlatformData> m_fontData;
|
| String m_otsParsingMessage;
|
|
|