| Index: Source/core/fetch/ImageResource.h
|
| diff --git a/Source/core/fetch/ImageResource.h b/Source/core/fetch/ImageResource.h
|
| index f04260641db7c04984995bac224f927b502e7651..ada4cf453c9d9290ab2fea28a215e188b1e8e20a 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 : public Resource, public ImageObserver {
|
| +class ImageResource FINAL : public Resource, public ImageObserver {
|
| friend class MemoryCache;
|
|
|
| public:
|
| @@ -51,7 +51,7 @@ public:
|
| ImageResource(WebCore::Image*);
|
| virtual ~ImageResource();
|
|
|
| - virtual void load(ResourceFetcher*, const ResourceLoaderOptions&);
|
| + virtual void load(ResourceFetcher*, const ResourceLoaderOptions&) OVERRIDE;
|
|
|
| WebCore::Image* image(); // Returns the nullImage() if the image is not available yet.
|
| WebCore::Image* imageForRenderer(const RenderObject*); // Returns the nullImage() if the image is not available yet.
|
| @@ -81,30 +81,30 @@ public:
|
|
|
| bool isAccessAllowed(SecurityOrigin*);
|
|
|
| - virtual void didAddClient(ResourceClient*);
|
| - virtual void didRemoveClient(ResourceClient*);
|
| + virtual void didAddClient(ResourceClient*) OVERRIDE;
|
| + virtual void didRemoveClient(ResourceClient*) OVERRIDE;
|
|
|
| - virtual void allClientsRemoved();
|
| - virtual void destroyDecodedData();
|
| + virtual void allClientsRemoved() OVERRIDE;
|
| + virtual void destroyDecodedData() OVERRIDE;
|
|
|
| virtual void appendData(const char*, int) OVERRIDE;
|
| - virtual void error(Resource::Status);
|
| - virtual void responseReceived(const ResourceResponse&);
|
| + 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 { return true; }
|
| + virtual bool shouldIgnoreHTTPStatusCodeErrors() const OVERRIDE { return true; }
|
|
|
| - virtual bool isImage() const { return true; }
|
| + virtual bool isImage() const OVERRIDE { return true; }
|
| virtual bool stillNeedsLoad() const OVERRIDE { return !errorOccurred() && status() == Unknown && !isLoading(); }
|
|
|
| // ImageObserver
|
| - virtual void decodedSizeChanged(const WebCore::Image*, int delta);
|
| - virtual void didDraw(const WebCore::Image*);
|
| + virtual void decodedSizeChanged(const WebCore::Image*, int delta) OVERRIDE;
|
| + virtual void didDraw(const WebCore::Image*) OVERRIDE;
|
|
|
| - virtual bool shouldPauseAnimation(const WebCore::Image*);
|
| - virtual void animationAdvanced(const WebCore::Image*);
|
| - virtual void changedInRect(const WebCore::Image*, const IntRect&);
|
| + virtual bool shouldPauseAnimation(const WebCore::Image*) OVERRIDE;
|
| + virtual void animationAdvanced(const WebCore::Image*) OVERRIDE;
|
| + virtual void changedInRect(const WebCore::Image*, const IntRect&) OVERRIDE;
|
|
|
| private:
|
| void clear();
|
|
|