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

Unified Diff: Source/core/layout/LayoutFlexibleBox.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
« no previous file with comments | « Source/core/layout/LayoutFileUploadControl.h ('k') | Source/core/layout/LayoutFlowThread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutFlexibleBox.h
diff --git a/Source/core/layout/LayoutFlexibleBox.h b/Source/core/layout/LayoutFlexibleBox.h
index 41a1de010c0d9c6914bb66dabdb8c22de83aa4b1..c4a70835ab7661e8727dae6381de4717417abfc4 100644
--- a/Source/core/layout/LayoutFlexibleBox.h
+++ b/Source/core/layout/LayoutFlexibleBox.h
@@ -40,31 +40,31 @@ namespace blink {
class CORE_EXPORT LayoutFlexibleBox : public LayoutBlock {
public:
LayoutFlexibleBox(Element*);
- virtual ~LayoutFlexibleBox();
+ ~LayoutFlexibleBox() override;
static LayoutFlexibleBox* createAnonymous(Document*);
- virtual const char* name() const override { return "LayoutFlexibleBox"; }
+ const char* name() const override { return "LayoutFlexibleBox"; }
- virtual bool isFlexibleBox() const override final { return true; }
- virtual bool canCollapseAnonymousBlockChild() const override { return false; }
- virtual void layoutBlock(bool relayoutChildren) override final;
+ bool isFlexibleBox() const final { return true; }
+ bool canCollapseAnonymousBlockChild() const override { return false; }
+ void layoutBlock(bool relayoutChildren) final;
- virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
- virtual int firstLineBoxBaseline() const override;
- virtual int inlineBlockBaseline(LineDirectionMode) const override;
+ int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
+ int firstLineBoxBaseline() const override;
+ int inlineBlockBaseline(LineDirectionMode) const override;
- virtual void paintChildren(const PaintInfo&, const LayoutPoint&) override final;
+ void paintChildren(const PaintInfo&, const LayoutPoint&) final;
bool isHorizontalFlow() const;
OrderIterator& orderIterator() { return m_orderIterator; }
protected:
- virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
+ void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
- virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
- virtual void removeChild(LayoutObject*) override;
+ void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
+ void removeChild(LayoutObject*) override;
private:
enum FlexSign {
« no previous file with comments | « Source/core/layout/LayoutFileUploadControl.h ('k') | Source/core/layout/LayoutFlowThread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698