| Index: Source/core/fetch/FontResource.h
|
| diff --git a/Source/core/fetch/FontResource.h b/Source/core/fetch/FontResource.h
|
| index 07401b96304c08d34a8bb206ec93a7e46c0be596..7bb07dc1f2aed48c44914784563cccffea1c0429 100644
|
| --- a/Source/core/fetch/FontResource.h
|
| +++ b/Source/core/fetch/FontResource.h
|
| @@ -41,21 +41,21 @@ class FontPlatformData;
|
| class SVGFontElement;
|
| class FontCustomPlatformData;
|
|
|
| -class FontResource FINAL : public Resource {
|
| +class FontResource final : public Resource {
|
| public:
|
| typedef ResourceClient ClientType;
|
|
|
| FontResource(const ResourceRequest&);
|
| virtual ~FontResource();
|
| - virtual void trace(Visitor*) OVERRIDE;
|
| + virtual void trace(Visitor*) override;
|
|
|
| - virtual void load(ResourceFetcher*, const ResourceLoaderOptions&) OVERRIDE;
|
| + virtual void load(ResourceFetcher*, const ResourceLoaderOptions&) override;
|
|
|
| - virtual void didAddClient(ResourceClient*) OVERRIDE;
|
| + virtual void didAddClient(ResourceClient*) override;
|
|
|
| - virtual void allClientsRemoved() OVERRIDE;
|
| + virtual void allClientsRemoved() override;
|
| void beginLoadIfNeeded(ResourceFetcher* dl);
|
| - virtual bool stillNeedsLoad() const OVERRIDE { return m_state != LoadInitiated; }
|
| + virtual bool stillNeedsLoad() const override { return m_state != LoadInitiated; }
|
| bool exceedsFontLoadWaitLimit() const { return m_exceedsFontLoadWaitLimit; }
|
|
|
| bool loadScheduled() const { return m_state != Unloaded; }
|
| @@ -74,10 +74,10 @@ public:
|
| #endif
|
|
|
| protected:
|
| - virtual bool isSafeToUnlock() const OVERRIDE;
|
| + virtual bool isSafeToUnlock() const override;
|
|
|
| private:
|
| - virtual void checkNotify() OVERRIDE;
|
| + virtual void checkNotify() override;
|
| void fontLoadWaitLimitCallback(Timer<FontResource>*);
|
|
|
| enum State { Unloaded, LoadScheduled, LoadInitiated };
|
| @@ -101,7 +101,7 @@ class FontResourceClient : public ResourceClient {
|
| public:
|
| virtual ~FontResourceClient() { }
|
| static ResourceClientType expectedType() { return FontType; }
|
| - virtual ResourceClientType resourceClientType() const OVERRIDE FINAL { return expectedType(); }
|
| + virtual ResourceClientType resourceClientType() const override final { return expectedType(); }
|
| virtual void fontLoaded(FontResource*) { }
|
| virtual void didStartFontLoad(FontResource*) { }
|
| virtual void fontLoadWaitLimitExceeded(FontResource*) { }
|
|
|