Index: Source/core/fetch/FontResource.h |
diff --git a/Source/core/fetch/FontResource.h b/Source/core/fetch/FontResource.h |
index 40b2e03aa1a50500af7e3289d5c0671025405801..0483dec2272f1fa62ea407ca152e5be3f9dd7b70 100644 |
--- a/Source/core/fetch/FontResource.h |
+++ b/Source/core/fetch/FontResource.h |
@@ -44,15 +44,15 @@ public: |
typedef ResourceClient ClientType; |
static ResourcePtr<FontResource> fetch(FetchRequest&, ResourceFetcher*); |
- virtual ~FontResource(); |
+ ~FontResource() override; |
- virtual void load(ResourceFetcher*, const ResourceLoaderOptions&) override; |
+ void load(ResourceFetcher*, const ResourceLoaderOptions&) override; |
- virtual void didAddClient(ResourceClient*) override; |
+ void didAddClient(ResourceClient*) override; |
- virtual void allClientsRemoved() override; |
+ void allClientsRemoved() override; |
void beginLoadIfNeeded(ResourceFetcher* dl); |
- virtual bool stillNeedsLoad() const override { return m_state != LoadInitiated; } |
+ bool stillNeedsLoad() const override { return m_state != LoadInitiated; } |
bool exceedsFontLoadWaitLimit() const { return m_exceedsFontLoadWaitLimit; } |
bool loadScheduled() const { return m_state != Unloaded; } |
@@ -67,7 +67,7 @@ public: |
FontPlatformData platformDataFromCustomData(float size, bool bold, bool italic, FontOrientation = FontOrientation::Horizontal); |
protected: |
- virtual bool isSafeToUnlock() const override; |
+ bool isSafeToUnlock() const override; |
private: |
class FontResourceFactory : public ResourceFactory { |
@@ -82,7 +82,7 @@ private: |
}; |
FontResource(const ResourceRequest&); |
- virtual void checkNotify() override; |
+ void checkNotify() override; |
void fontLoadWaitLimitCallback(Timer<FontResource>*); |
enum State { Unloaded, LoadScheduled, LoadInitiated }; |
@@ -101,12 +101,12 @@ DEFINE_RESOURCE_TYPE_CASTS(Font); |
class FontResourceClient : public ResourceClient { |
public: |
- virtual ~FontResourceClient() { } |
+ ~FontResourceClient() override {} |
static ResourceClientType expectedType() { return FontType; } |
- virtual ResourceClientType resourceClientType() const override final { return expectedType(); } |
- virtual void fontLoaded(FontResource*) { } |
- virtual void didStartFontLoad(FontResource*) { } |
- virtual void fontLoadWaitLimitExceeded(FontResource*) { } |
+ ResourceClientType resourceClientType() const final { return expectedType(); } |
+ virtual void fontLoaded(FontResource*) {} |
+ virtual void didStartFontLoad(FontResource*) {} |
+ virtual void fontLoadWaitLimitExceeded(FontResource*) {} |
}; |
} |