| Index: Source/core/fetch/ImageResource.h
|
| diff --git a/Source/core/fetch/ImageResource.h b/Source/core/fetch/ImageResource.h
|
| index 7247e7cd9d25f7f962a7cd6c8d77fb9d7ea4d3fb..7a6a0b4f4b09c0cbccf245548a2a26b3f2ca528c 100644
|
| --- a/Source/core/fetch/ImageResource.h
|
| +++ b/Source/core/fetch/ImageResource.h
|
| @@ -54,9 +54,9 @@ public:
|
| ImageResource(blink::Image*);
|
| // Exposed for testing
|
| ImageResource(const ResourceRequest&, blink::Image*);
|
| - virtual ~ImageResource();
|
| + ~ImageResource() override;
|
|
|
| - virtual void load(ResourceFetcher*, const ResourceLoaderOptions&) override;
|
| + void load(ResourceFetcher*, const ResourceLoaderOptions&) override;
|
|
|
| blink::Image* image(); // Returns the nullImage() if the image is not available yet.
|
| blink::Image* imageForLayoutObject(const LayoutObject*); // Returns the nullImage() if the image is not available yet.
|
| @@ -92,33 +92,33 @@ public:
|
|
|
| void updateImageAnimationPolicy();
|
|
|
| - virtual void didAddClient(ResourceClient*) override;
|
| - virtual void didRemoveClient(ResourceClient*) override;
|
| + void didAddClient(ResourceClient*) override;
|
| + void didRemoveClient(ResourceClient*) override;
|
|
|
| - virtual void allClientsRemoved() override;
|
| + void allClientsRemoved() override;
|
|
|
| - virtual void appendData(const char*, unsigned) override;
|
| - virtual void error(Resource::Status) override;
|
| - virtual void responseReceived(const ResourceResponse&, PassOwnPtr<WebDataConsumerHandle>) override;
|
| - virtual void finishOnePart() override;
|
| + void appendData(const char*, unsigned) override;
|
| + void error(Resource::Status) override;
|
| + void responseReceived(const ResourceResponse&, PassOwnPtr<WebDataConsumerHandle>) override;
|
| + void finishOnePart() override;
|
|
|
| // For compatibility, images keep loading even if there are HTTP errors.
|
| - virtual bool shouldIgnoreHTTPStatusCodeErrors() const override { return true; }
|
| + bool shouldIgnoreHTTPStatusCodeErrors() const override { return true; }
|
|
|
| - virtual bool isImage() const override { return true; }
|
| - virtual bool stillNeedsLoad() const override { return !errorOccurred() && status() == Unknown && !isLoading(); }
|
| + bool isImage() const override { return true; }
|
| + 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;
|
| + void decodedSizeChanged(const blink::Image*, int delta) override;
|
| + 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;
|
| + bool shouldPauseAnimation(const blink::Image*) override;
|
| + void animationAdvanced(const blink::Image*) override;
|
| + void changedInRect(const blink::Image*, const IntRect&) override;
|
|
|
| protected:
|
| - virtual bool isSafeToUnlock() const override;
|
| - virtual void destroyDecodedDataIfPossible() override;
|
| + bool isSafeToUnlock() const override;
|
| + void destroyDecodedDataIfPossible() override;
|
|
|
| private:
|
| static void preCacheDataURIImage(const FetchRequest&, ResourceFetcher*);
|
|
|