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

Unified Diff: Source/core/layout/LayoutGrid.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/LayoutFullScreen.cpp ('k') | Source/core/layout/LayoutHTMLCanvas.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutGrid.h
diff --git a/Source/core/layout/LayoutGrid.h b/Source/core/layout/LayoutGrid.h
index d8acfb701c80c4a21c07c5772ebf26794a93c386..7e2d84825f36498aa857e8c3e433ed72d189c872 100644
--- a/Source/core/layout/LayoutGrid.h
+++ b/Source/core/layout/LayoutGrid.h
@@ -50,13 +50,13 @@ enum GridAxisPosition {GridAxisStart, GridAxisEnd, GridAxisCenter};
class LayoutGrid final : public LayoutBlock {
public:
explicit LayoutGrid(Element*);
- virtual ~LayoutGrid();
+ ~LayoutGrid() override;
- virtual const char* name() const override { return "LayoutGrid"; }
+ const char* name() const override { return "LayoutGrid"; }
- virtual void layoutBlock(bool relayoutChildren) override;
+ void layoutBlock(bool relayoutChildren) override;
- virtual bool canCollapseAnonymousBlockChild() const override { return false; }
+ bool canCollapseAnonymousBlockChild() const override { return false; }
void dirtyGrid();
@@ -92,14 +92,14 @@ public:
}
private:
- virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectLayoutGrid || LayoutBlock::isOfType(type); }
- virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
- virtual void computePreferredLogicalWidths() override;
+ bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectLayoutGrid || LayoutBlock::isOfType(type); }
+ void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
+ void computePreferredLogicalWidths() override;
- virtual void addChild(LayoutObject* newChild, LayoutObject* beforeChild = nullptr) override;
- virtual void removeChild(LayoutObject*) override;
+ void addChild(LayoutObject* newChild, LayoutObject* beforeChild = nullptr) override;
+ void removeChild(LayoutObject*) override;
- virtual void styleDidChange(StyleDifference, const ComputedStyle*) override;
+ void styleDidChange(StyleDifference, const ComputedStyle*) override;
bool explicitGridDidResize(const ComputedStyle&) const;
bool namedGridLinesDefinitionDidChange(const ComputedStyle&) const;
@@ -156,7 +156,7 @@ private:
void applyStretchAlignmentToTracksIfNeeded(GridTrackSizingDirection, GridSizingData&, LayoutUnit availableSpace);
- virtual void paintChildren(const PaintInfo&, const LayoutPoint&) override;
+ void paintChildren(const PaintInfo&, const LayoutPoint&) override;
bool allowedToStretchLogicalHeightForChild(const LayoutBox& child) const;
bool needToStretchChildLogicalHeight(const LayoutBox&) const;
LayoutUnit childIntrinsicHeight(const LayoutBox&) const;
« no previous file with comments | « Source/core/layout/LayoutFullScreen.cpp ('k') | Source/core/layout/LayoutHTMLCanvas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698