Source/core/rendering/RenderGrid.h - Issue 129173004: Update rendering classes to use OVERRIDE / FINAL when needed

Side by Side Diff: Source/core/rendering/RenderGrid.h

Issue 129173004: Update rendering classes to use OVERRIDE / FINAL when needed (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebase Created 6 years, 11 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 unified diff | Download patch

« Source/core/rendering/RenderFileUploadControl.h ('K') | « Source/core/rendering/RenderFullScreen.h ('k') | Source/core/rendering/RenderHTMLCanvas.h » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2011 Apple Inc. All rights reserved.	2 * Copyright (C) 2011 Apple Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 108 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
119 PassOwnPtr<GridSpan> resolveGridPositionsFromStyle(const RenderBox*, GridTra ckSizingDirection) const;	119 PassOwnPtr<GridSpan> resolveGridPositionsFromStyle(const RenderBox*, GridTra ckSizingDirection) const;

120 size_t resolveNamedGridLinePositionFromStyle(const GridPosition&, GridPositi onSide) const;	120 size_t resolveNamedGridLinePositionFromStyle(const GridPosition&, GridPositi onSide) const;

121 size_t resolveGridPositionFromStyle(const GridPosition&, GridPositionSide) c onst;	121 size_t resolveGridPositionFromStyle(const GridPosition&, GridPositionSide) c onst;

122 PassOwnPtr<GridSpan> resolveGridPositionAgainstOppositePosition(size_t resol vedOppositePosition, const GridPosition&, GridPositionSide) const;	122 PassOwnPtr<GridSpan> resolveGridPositionAgainstOppositePosition(size_t resol vedOppositePosition, const GridPosition&, GridPositionSide) const;

123 PassOwnPtr<GridSpan> resolveNamedGridLinePositionAgainstOppositePosition(siz e_t resolvedOppositePosition, const GridPosition&, GridPositionSide) const;	123 PassOwnPtr<GridSpan> resolveNamedGridLinePositionAgainstOppositePosition(siz e_t resolvedOppositePosition, const GridPosition&, GridPositionSide) const;

124 PassOwnPtr<GridSpan> resolveBeforeStartNamedGridLinePositionAgainstOppositeP osition(size_t resolvedOppositePosition, const GridPosition&, const Vector<size_ t>&) const;	124 PassOwnPtr<GridSpan> resolveBeforeStartNamedGridLinePositionAgainstOppositeP osition(size_t resolvedOppositePosition, const GridPosition&, const Vector<size_ t>&) const;

125 PassOwnPtr<GridSpan> resolveAfterEndNamedGridLinePositionAgainstOppositePosi tion(size_t resolvedOppositePosition, const GridPosition&, const Vector<size_t>& ) const;	125 PassOwnPtr<GridSpan> resolveAfterEndNamedGridLinePositionAgainstOppositePosi tion(size_t resolvedOppositePosition, const GridPosition&, const Vector<size_t>& ) const;

126	126

127 LayoutUnit gridAreaBreadthForChild(const RenderBox* child, GridTrackSizingDi rection, const Vector<GridTrack>&) const;	127 LayoutUnit gridAreaBreadthForChild(const RenderBox* child, GridTrackSizingDi rection, const Vector<GridTrack>&) const;

128	128

129 virtual void paintChildren(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL;	129 virtual void paintChildren(PaintInfo&, const LayoutPoint&) OVERRIDE;

130 void paintChildrenSlowCase(PaintInfo&, const LayoutPoint&);	130 void paintChildrenSlowCase(PaintInfo&, const LayoutPoint&);

131	131

132 bool gridIsDirty() const { return m_gridIsDirty; }	132 bool gridIsDirty() const { return m_gridIsDirty; }

133	133

134 #ifndef NDEBUG	134 #ifndef NDEBUG

135 bool tracksAreWiderThanMinTrackBreadth(GridTrackSizingDirection, const Vecto r<GridTrack>&);	135 bool tracksAreWiderThanMinTrackBreadth(GridTrackSizingDirection, const Vecto r<GridTrack>&);

136 #endif	136 #endif

137	137

138 size_t gridColumnCount() const	138 size_t gridColumnCount() const

139 {	139 {

(...skipping 15 matching lines...) Expand all Loading...
155 HashMap<const RenderBox*, GridCoordinate> m_gridItemCoordinate;	155 HashMap<const RenderBox*, GridCoordinate> m_gridItemCoordinate;

156 OrderIterator m_orderIterator;	156 OrderIterator m_orderIterator;

157 bool m_gridItemOverflowGridArea;	157 bool m_gridItemOverflowGridArea;

158 };	158 };

159	159

160 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderGrid, isRenderGrid());	160 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderGrid, isRenderGrid());

161	161

162 } // namespace WebCore	162 } // namespace WebCore

163	163

164 #endif // RenderGrid_h	164 #endif // RenderGrid_h

OLD	NEW