Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[fetch|fileapi]

Source/core/fetch/ImageResource.h

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
@@ skipping 23 matching lines @@
 namespace blink {
 
 class ImageResourceClient;
 class ResourceFetcher;
 class FloatSize;
 class Length;
 class MemoryCache;
 class RenderObject;
 class SecurityOrigin;
 
-class ImageResource FINAL : public Resource, public ImageObserver {
+class ImageResource final : public Resource, public ImageObserver {
     friend class MemoryCache;
 
 public:
     typedef ImageResourceClient ClientType;
 
     ImageResource(const ResourceRequest&);
     ImageResource(blink::Image*);
     // Exposed for testing
     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.
     bool hasImage() const { return m_image.get(); }
     bool currentFrameKnownToBeOpaque(const RenderObject*); // Side effect: ensures decoded image is in cache, therefore should only be called when about to draw the image.
 
     static std::pair<blink::Image*, float> brokenImage(float deviceScaleFactor); // Returns an image and the image's resolution scale factor.
     bool willPaintBrokenImage() const;
 
     bool canRender(const RenderObject& renderer, float multiplier) { return !errorOccurred() && !imageSizeForRenderer(&renderer, multiplier).isEmpty(); }
@@ skipping 11 matching lines @@
         IntrinsicSize // Report the intrinsic size, i.e. ignore whatever has been set extrinsically.
     };
     // This method takes a zoom multiplier that can be used to increase the natural size of the image by the zoom.
     LayoutSize imageSizeForRenderer(const RenderObject*, float multiplier, SizeType = NormalSize); // returns the size of the complete image.
     void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio);
 
     static void updateBitmapImages(HashSet<ImageResource*>&, bool redecodeImages = false);
 
     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();
 
     void setCustomAcceptHeader();
     void createImage();
     void updateImage(bool allDataReceived);
     void clearImage();
     // 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;
     ContainerSizeRequests m_pendingContainerSizeRequests;
     float m_devicePixelRatioHeaderValue;
 
     RefPtr<blink::Image> m_image;
     OwnPtr<SVGImageCache> m_svgImageCache;
     bool m_loadingMultipartContent;
     bool m_hasDevicePixelRatioHeaderValue;
 };
 
 DEFINE_RESOURCE_TYPE_CASTS(Image);
 
 }
 
 #endif