| Index: Source/core/fetch/FontResource.h
|
| diff --git a/Source/core/fetch/FontResource.h b/Source/core/fetch/FontResource.h
|
| index 103961117ced5f5435871e9f5374bcc924cf1745..07401b96304c08d34a8bb206ec93a7e46c0be596 100644
|
| --- a/Source/core/fetch/FontResource.h
|
| +++ b/Source/core/fetch/FontResource.h
|
| @@ -55,9 +55,13 @@ public:
|
|
|
| virtual void allClientsRemoved() OVERRIDE;
|
| void beginLoadIfNeeded(ResourceFetcher* dl);
|
| - virtual bool stillNeedsLoad() const OVERRIDE { return !m_loadInitiated; }
|
| + virtual bool stillNeedsLoad() const OVERRIDE { return m_state != LoadInitiated; }
|
| bool exceedsFontLoadWaitLimit() const { return m_exceedsFontLoadWaitLimit; }
|
|
|
| + bool loadScheduled() const { return m_state != Unloaded; }
|
| + void didScheduleLoad();
|
| + void didUnscheduleLoad();
|
| +
|
| void setCORSFailed() { m_corsFailed = true; }
|
| bool isCORSFailed() const { return m_corsFailed; }
|
|
|
| @@ -76,8 +80,10 @@ private:
|
| virtual void checkNotify() OVERRIDE;
|
| void fontLoadWaitLimitCallback(Timer<FontResource>*);
|
|
|
| + enum State { Unloaded, LoadScheduled, LoadInitiated };
|
| +
|
| OwnPtr<FontCustomPlatformData> m_fontData;
|
| - bool m_loadInitiated;
|
| + State m_state;
|
| bool m_exceedsFontLoadWaitLimit;
|
| bool m_corsFailed;
|
| Timer<FontResource> m_fontLoadWaitLimitTimer;
|
|
|