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

Unified Diff: Source/core/rendering/RenderMultiColumnSet.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/RenderMultiColumnFlowThread.h ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderMultiColumnSet.h
diff --git a/Source/core/rendering/RenderMultiColumnSet.h b/Source/core/rendering/RenderMultiColumnSet.h
index 4bc34e8555fdbec9badcfd5d967d36eb33e61706..17af0cea88305df746c8425f9b01e53f8f77032e 100644
--- a/Source/core/rendering/RenderMultiColumnSet.h
+++ b/Source/core/rendering/RenderMultiColumnSet.h
@@ -50,16 +50,16 @@ namespace blink {
//
// Column spans result in the creation of new column sets, since a spanning renderer has to be
// placed in between the column sets that come before and after the span.
-class RenderMultiColumnSet FINAL : public RenderRegion {
+class RenderMultiColumnSet final : public RenderRegion {
public:
enum BalancedHeightCalculation { GuessFromFlowThreadPortion, StretchBySpaceShortage };
static RenderMultiColumnSet* createAnonymous(RenderFlowThread*, RenderStyle* parentStyle);
- virtual bool isRenderMultiColumnSet() const OVERRIDE { return true; }
+ virtual bool isRenderMultiColumnSet() const override { return true; }
- virtual LayoutUnit pageLogicalWidth() const OVERRIDE FINAL { return flowThread()->logicalWidth(); }
- virtual LayoutUnit pageLogicalHeight() const OVERRIDE FINAL { return m_columnHeight; }
+ virtual LayoutUnit pageLogicalWidth() const override final { return flowThread()->logicalWidth(); }
+ virtual LayoutUnit pageLogicalHeight() const override final { return m_columnHeight; }
RenderBlockFlow* multiColumnBlockFlow() const { return toRenderBlockFlow(parent()); }
RenderMultiColumnFlowThread* multiColumnFlowThread() const
@@ -130,16 +130,16 @@ public:
private:
RenderMultiColumnSet(RenderFlowThread*);
- virtual void insertedIntoTree() OVERRIDE FINAL;
- virtual void willBeRemovedFromTree() OVERRIDE FINAL;
+ virtual void insertedIntoTree() override final;
+ virtual void willBeRemovedFromTree() override final;
- virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const OVERRIDE;
+ virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
- virtual void paintObject(PaintInfo&, const LayoutPoint& paintOffset) OVERRIDE;
+ virtual void paintObject(PaintInfo&, const LayoutPoint& paintOffset) override;
- virtual void addOverflowFromChildren() OVERRIDE;
+ virtual void addOverflowFromChildren() override;
- virtual const char* renderName() const OVERRIDE;
+ virtual const char* renderName() const override;
LayoutUnit calculateMaxColumnHeight() const;
LayoutRect columnRectAt(unsigned index) const;
« no previous file with comments | « Source/core/rendering/RenderMultiColumnFlowThread.h ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698