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

Unified Diff: Source/core/layout/LayoutMultiColumnSet.h

Issue 1231363003: Fix virtual/override/final usage in Source/core/layout/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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
Index: Source/core/layout/LayoutMultiColumnSet.h
diff --git a/Source/core/layout/LayoutMultiColumnSet.h b/Source/core/layout/LayoutMultiColumnSet.h
index c4659df6d81b29c2f6fb3192b2b2d81427df3cf9..a563ece690d6e5a5a289d8eded33ac35066c23f0 100644
--- a/Source/core/layout/LayoutMultiColumnSet.h
+++ b/Source/core/layout/LayoutMultiColumnSet.h
@@ -68,8 +68,8 @@ public:
const MultiColumnFragmentainerGroup& fragmentainerGroupAtFlowThreadOffset(LayoutUnit) const;
const MultiColumnFragmentainerGroup& fragmentainerGroupAtVisualPoint(const LayoutPoint&) const;
- virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectLayoutMultiColumnSet || LayoutBlockFlow::isOfType(type); }
- virtual bool canHaveChildren() const override final { return false; }
+ bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectLayoutMultiColumnSet || LayoutBlockFlow::isOfType(type); }
+ bool canHaveChildren() const final { return false; }
// Return the width and height of a single column or page in the set.
LayoutUnit pageLogicalWidth() const { return flowThread()->logicalWidth(); }
@@ -141,7 +141,7 @@ public:
// overflow. Only to be called on the last set.
void expandToEncompassFlowThreadContentsIfNeeded();
- virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override final;
+ void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const final;
void attachToFlowThread();
void detachFromFlowThread();
@@ -156,23 +156,23 @@ public:
// The "CSS actual" value of column-count. This includes overflowing columns, if any.
unsigned actualColumnCount() const;
- virtual const char* name() const override { return "LayoutMultiColumnSet"; }
+ const char* name() const override { return "LayoutMultiColumnSet"; }
protected:
LayoutMultiColumnSet(LayoutFlowThread*);
private:
- virtual void insertedIntoTree() override final;
- virtual void willBeRemovedFromTree() override final;
+ void insertedIntoTree() final;
+ void willBeRemovedFromTree() final;
- virtual bool isSelfCollapsingBlock() const override { return false; }
+ bool isSelfCollapsingBlock() const override { return false; }
- virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
- virtual PositionWithAffinity positionForPoint(const LayoutPoint&) override;
+ void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
+ PositionWithAffinity positionForPoint(const LayoutPoint&) override;
- virtual void paintObject(const PaintInfo&, const LayoutPoint& paintOffset) override;
+ void paintObject(const PaintInfo&, const LayoutPoint& paintOffset) override;
- virtual void addOverflowFromChildren() override;
+ void addOverflowFromChildren() override;
MultiColumnFragmentainerGroupList m_fragmentainerGroups;
LayoutFlowThread* m_flowThread;
« no previous file with comments | « Source/core/layout/LayoutMultiColumnFlowThread.h ('k') | Source/core/layout/LayoutMultiColumnSpannerPlaceholder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698