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

Unified Diff: Source/core/rendering/RenderImage.h

Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased the patch 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/rendering/RenderIFrame.h ('k') | Source/core/rendering/RenderImageResourceStyleImage.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderImage.h
diff --git a/Source/core/rendering/RenderImage.h b/Source/core/rendering/RenderImage.h
index cc8736969f9f4cb46cabe35c9af464b9f4f5bc33..87f1b8960a99bcbf3650068572308c846cd8c2f9 100644
--- a/Source/core/rendering/RenderImage.h
+++ b/Source/core/rendering/RenderImage.h
@@ -41,7 +41,7 @@ public:
RenderImage(Element*);
virtual ~RenderImage();
- virtual void destroy() OVERRIDE;
+ virtual void destroy() override;
static RenderImage* createAnonymous(Document*);
@@ -67,40 +67,40 @@ public:
inline void setImageDevicePixelRatio(float factor) { m_imageDevicePixelRatio = factor; }
float imageDevicePixelRatio() const { return m_imageDevicePixelRatio; }
- virtual void intrinsicSizeChanged() OVERRIDE
+ virtual void intrinsicSizeChanged() override
{
if (m_imageResource)
imageChanged(m_imageResource->imagePtr());
}
protected:
- virtual bool needsPreferredWidthsRecalculation() const OVERRIDE FINAL;
- virtual RenderBox* embeddedContentBox() const OVERRIDE FINAL;
- virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const OVERRIDE FINAL;
+ virtual bool needsPreferredWidthsRecalculation() const override final;
+ virtual RenderBox* embeddedContentBox() const override final;
+ virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const override final;
- virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) OVERRIDE;
+ virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) override;
- virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL;
- virtual void layout() OVERRIDE;
- virtual bool updateImageLoadingPriorities() OVERRIDE FINAL;
+ virtual void paint(PaintInfo&, const LayoutPoint&) override final;
+ virtual void layout() override;
+ virtual bool updateImageLoadingPriorities() override final;
private:
- virtual const char* renderName() const OVERRIDE { return "RenderImage"; }
+ virtual const char* renderName() const override { return "RenderImage"; }
- virtual bool isImage() const OVERRIDE { return true; }
- virtual bool isRenderImage() const OVERRIDE FINAL { return true; }
+ virtual bool isImage() const override { return true; }
+ virtual bool isRenderImage() const override final { return true; }
- virtual void paintReplaced(PaintInfo&, const LayoutPoint&) OVERRIDE;
+ virtual void paintReplaced(PaintInfo&, const LayoutPoint&) override;
- virtual bool foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, unsigned maxDepthToTest) const OVERRIDE FINAL;
- virtual bool computeBackgroundIsKnownToBeObscured() OVERRIDE FINAL;
+ virtual bool foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, unsigned maxDepthToTest) const override final;
+ virtual bool computeBackgroundIsKnownToBeObscured() override final;
- virtual LayoutUnit minimumReplacedHeight() const OVERRIDE;
+ virtual LayoutUnit minimumReplacedHeight() const override;
- virtual void notifyFinished(Resource*) OVERRIDE FINAL;
- virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE FINAL;
+ virtual void notifyFinished(Resource*) override final;
+ virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override final;
- virtual bool boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance, InlineFlowBox*) const OVERRIDE FINAL;
+ virtual bool boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance, InlineFlowBox*) const override final;
IntSize imageSizeForError(ImageResource*) const;
void paintInvalidationOrMarkForLayout(bool imageSizeChanged, const IntRect* = 0);
« no previous file with comments | « Source/core/rendering/RenderIFrame.h ('k') | Source/core/rendering/RenderImageResourceStyleImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698