Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(936)

Unified Diff: Source/core/fetch/FontResource.h

Issue 1229743005: Fix virtual/override/final usage in Source/core/{fetch,loader,streams,xmlhttprequest}/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/fetch/DocumentResourceReference.h ('k') | Source/core/fetch/ImageResource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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*) {}
};
}
« no previous file with comments | « Source/core/fetch/DocumentResourceReference.h ('k') | Source/core/fetch/ImageResource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698