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

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

Issue 631223002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[fetch|fileapi] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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/FontResource.h ('k') | Source/core/fetch/ImageResourceClient.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/fetch/ImageResource.h
diff --git a/Source/core/fetch/ImageResource.h b/Source/core/fetch/ImageResource.h
index 5b66b44a6bcd265fb4401491181e96cded39e9e9..5fd733cf21be2d238801beed231841f376364efe 100644
--- a/Source/core/fetch/ImageResource.h
+++ b/Source/core/fetch/ImageResource.h
@@ -41,7 +41,7 @@ class MemoryCache;
class RenderObject;
class SecurityOrigin;
-class ImageResource FINAL : public Resource, public ImageObserver {
+class ImageResource final : public Resource, public ImageObserver {
friend class MemoryCache;
public:
@@ -53,7 +53,7 @@ public:
ImageResource(const ResourceRequest&, blink::Image*);
virtual ~ImageResource();
- virtual void load(ResourceFetcher*, const ResourceLoaderOptions&) OVERRIDE;
+ virtual void load(ResourceFetcher*, const ResourceLoaderOptions&) override;
blink::Image* image(); // Returns the nullImage() if the image is not available yet.
blink::Image* imageForRenderer(const RenderObject*); // Returns the nullImage() if the image is not available yet.
@@ -85,33 +85,33 @@ public:
bool isAccessAllowed(SecurityOrigin*);
- virtual void didAddClient(ResourceClient*) OVERRIDE;
- virtual void didRemoveClient(ResourceClient*) OVERRIDE;
+ virtual void didAddClient(ResourceClient*) override;
+ virtual void didRemoveClient(ResourceClient*) override;
- virtual void allClientsRemoved() OVERRIDE;
+ virtual void allClientsRemoved() override;
- virtual void appendData(const char*, unsigned) OVERRIDE;
- virtual void error(Resource::Status) OVERRIDE;
- virtual void responseReceived(const ResourceResponse&) OVERRIDE;
- virtual void finishOnePart() OVERRIDE;
+ virtual void appendData(const char*, unsigned) override;
+ virtual void error(Resource::Status) override;
+ virtual void responseReceived(const ResourceResponse&) override;
+ virtual void finishOnePart() override;
// For compatibility, images keep loading even if there are HTTP errors.
- virtual bool shouldIgnoreHTTPStatusCodeErrors() const OVERRIDE { return true; }
+ virtual bool shouldIgnoreHTTPStatusCodeErrors() const override { return true; }
- virtual bool isImage() const OVERRIDE { return true; }
- virtual bool stillNeedsLoad() const OVERRIDE { return !errorOccurred() && status() == Unknown && !isLoading(); }
+ virtual bool isImage() const override { return true; }
+ virtual bool stillNeedsLoad() const override { return !errorOccurred() && status() == Unknown && !isLoading(); }
// ImageObserver
- virtual void decodedSizeChanged(const blink::Image*, int delta) OVERRIDE;
- virtual void didDraw(const blink::Image*) OVERRIDE;
+ virtual void decodedSizeChanged(const blink::Image*, int delta) override;
+ virtual void didDraw(const blink::Image*) override;
- virtual bool shouldPauseAnimation(const blink::Image*) OVERRIDE;
- virtual void animationAdvanced(const blink::Image*) OVERRIDE;
- virtual void changedInRect(const blink::Image*, const IntRect&) OVERRIDE;
+ virtual bool shouldPauseAnimation(const blink::Image*) override;
+ virtual void animationAdvanced(const blink::Image*) override;
+ virtual void changedInRect(const blink::Image*, const IntRect&) override;
protected:
- virtual bool isSafeToUnlock() const OVERRIDE;
- virtual void destroyDecodedDataIfPossible() OVERRIDE;
+ virtual bool isSafeToUnlock() const override;
+ virtual void destroyDecodedDataIfPossible() override;
private:
void clear();
@@ -123,7 +123,7 @@ private:
// If not null, changeRect is the changed part of the image.
void notifyObservers(const IntRect* changeRect = 0);
- virtual void switchClientsToRevalidatedResource() OVERRIDE;
+ virtual void switchClientsToRevalidatedResource() override;
typedef pair<IntSize, float> SizeAndZoom;
typedef HashMap<const ImageResourceClient*, SizeAndZoom> ContainerSizeRequests;
« no previous file with comments | « Source/core/fetch/FontResource.h ('k') | Source/core/fetch/ImageResourceClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698