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

Unified Diff: Source/core/rendering/RenderGrid.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/RenderFullScreen.cpp ('k') | Source/core/rendering/RenderHTMLCanvas.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderGrid.h
diff --git a/Source/core/rendering/RenderGrid.h b/Source/core/rendering/RenderGrid.h
index 6f17556a22776a0014c78a93314c230b05a58a03..859bc6df68a3126186998817300b9c90356758cd 100644
--- a/Source/core/rendering/RenderGrid.h
+++ b/Source/core/rendering/RenderGrid.h
@@ -36,16 +36,16 @@ struct GridCoordinate;
struct GridSpan;
class GridTrack;
-class RenderGrid FINAL : public RenderBlock {
+class RenderGrid final : public RenderBlock {
public:
RenderGrid(Element*);
virtual ~RenderGrid();
- virtual const char* renderName() const OVERRIDE;
+ virtual const char* renderName() const override;
- virtual void layoutBlock(bool relayoutChildren) OVERRIDE;
+ virtual void layoutBlock(bool relayoutChildren) override;
- virtual bool canCollapseAnonymousBlockChild() const OVERRIDE { return false; }
+ virtual bool canCollapseAnonymousBlockChild() const override { return false; }
void dirtyGrid();
@@ -60,15 +60,15 @@ public:
bool gridIsDirty() const { return m_gridIsDirty; }
private:
- virtual bool isRenderGrid() const OVERRIDE { return true; }
- virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const OVERRIDE;
- virtual void computePreferredLogicalWidths() OVERRIDE;
+ virtual bool isRenderGrid() const override { return true; }
+ virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
+ virtual void computePreferredLogicalWidths() override;
- virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) OVERRIDE;
+ virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) override;
void addChildToIndexesMap(RenderBox&);
- virtual void removeChild(RenderObject*) OVERRIDE;
+ virtual void removeChild(RenderObject*) override;
- virtual void styleDidChange(StyleDifference, const RenderStyle*) OVERRIDE;
+ virtual void styleDidChange(StyleDifference, const RenderStyle*) override;
bool explicitGridDidResize(const RenderStyle*) const;
bool namedGridLinesDefinitionDidChange(const RenderStyle*) const;
@@ -126,7 +126,7 @@ private:
LayoutUnit gridAreaBreadthForChild(const RenderBox& child, GridTrackSizingDirection, const Vector<GridTrack>&) const;
- virtual void paintChildren(PaintInfo&, const LayoutPoint&) OVERRIDE;
+ virtual void paintChildren(PaintInfo&, const LayoutPoint&) override;
#if ENABLE(ASSERT)
bool tracksAreWiderThanMinTrackBreadth(GridTrackSizingDirection, const Vector<GridTrack>&);
« no previous file with comments | « Source/core/rendering/RenderFullScreen.cpp ('k') | Source/core/rendering/RenderHTMLCanvas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698