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

Unified Diff: Source/core/rendering/RenderFlexibleBox.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/RenderFileUploadControl.h ('k') | Source/core/rendering/RenderFlowThread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderFlexibleBox.h
diff --git a/Source/core/rendering/RenderFlexibleBox.h b/Source/core/rendering/RenderFlexibleBox.h
index c3390583d507595549cceffea526034bcefe1c05..e71872b9069299366d8685b7321ac43d55f438f6 100644
--- a/Source/core/rendering/RenderFlexibleBox.h
+++ b/Source/core/rendering/RenderFlexibleBox.h
@@ -43,27 +43,27 @@ public:
static RenderFlexibleBox* createAnonymous(Document*);
- virtual const char* renderName() const OVERRIDE;
+ virtual const char* renderName() const override;
- virtual bool isFlexibleBox() const OVERRIDE FINAL { return true; }
- virtual bool canCollapseAnonymousBlockChild() const OVERRIDE { return false; }
- virtual void layoutBlock(bool relayoutChildren) OVERRIDE FINAL;
+ virtual bool isFlexibleBox() const override final { return true; }
+ virtual bool canCollapseAnonymousBlockChild() const override { return false; }
+ virtual void layoutBlock(bool relayoutChildren) override final;
- virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE;
- virtual int firstLineBoxBaseline() const OVERRIDE;
- virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE;
+ virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
+ virtual int firstLineBoxBaseline() const override;
+ virtual int inlineBlockBaseline(LineDirectionMode) const override;
- virtual void paintChildren(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL;
+ virtual void paintChildren(PaintInfo&, const LayoutPoint&) override final;
bool isHorizontalFlow() const;
OrderIterator& orderIterator() { return m_orderIterator; }
protected:
- virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const OVERRIDE;
+ virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
- virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
- virtual void removeChild(RenderObject*) OVERRIDE;
+ virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
+ virtual void removeChild(RenderObject*) override;
private:
enum FlexSign {
« no previous file with comments | « Source/core/rendering/RenderFileUploadControl.h ('k') | Source/core/rendering/RenderFlowThread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698