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

Unified Diff: Source/core/rendering/RenderTableCell.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/RenderTableCaption.h ('k') | Source/core/rendering/RenderTableCol.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderTableCell.h
diff --git a/Source/core/rendering/RenderTableCell.h b/Source/core/rendering/RenderTableCell.h
index 39db09d3cbc8cd269c75a69cd99aaf2e2e1cf33a..e60bebed40465ec291aeb7511dcae69fd5888931 100644
--- a/Source/core/rendering/RenderTableCell.h
+++ b/Source/core/rendering/RenderTableCell.h
@@ -39,7 +39,7 @@ enum IncludeBorderColorOrNot { DoNotIncludeBorderColor, IncludeBorderColor };
class SubtreeLayoutScope;
-class RenderTableCell FINAL : public RenderBlockFlow {
+class RenderTableCell final : public RenderBlockFlow {
public:
explicit RenderTableCell(Element*);
@@ -112,21 +112,21 @@ public:
void setCellLogicalWidth(int constrainedLogicalWidth, SubtreeLayoutScope&);
- virtual int borderLeft() const OVERRIDE;
- virtual int borderRight() const OVERRIDE;
- virtual int borderTop() const OVERRIDE;
- virtual int borderBottom() const OVERRIDE;
- virtual int borderStart() const OVERRIDE;
- virtual int borderEnd() const OVERRIDE;
- virtual int borderBefore() const OVERRIDE;
- virtual int borderAfter() const OVERRIDE;
+ virtual int borderLeft() const override;
+ virtual int borderRight() const override;
+ virtual int borderTop() const override;
+ virtual int borderBottom() const override;
+ virtual int borderStart() const override;
+ virtual int borderEnd() const override;
+ virtual int borderBefore() const override;
+ virtual int borderAfter() const override;
void collectBorderValues(RenderTable::CollapsedBorderValues&) const;
static void sortBorderValues(RenderTable::CollapsedBorderValues&);
- virtual void layout() OVERRIDE;
+ virtual void layout() override;
- virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;
+ virtual void paint(PaintInfo&, const LayoutPoint&) override;
void paintCollapsedBorders(PaintInfo&, const LayoutPoint&);
void paintBackgroundsBehindCell(PaintInfo&, const LayoutPoint&, RenderObject* backgroundObject);
@@ -144,27 +144,27 @@ public:
int intrinsicPaddingBefore() const { return m_intrinsicPaddingBefore; }
int intrinsicPaddingAfter() const { return m_intrinsicPaddingAfter; }
- virtual LayoutUnit paddingTop() const OVERRIDE;
- virtual LayoutUnit paddingBottom() const OVERRIDE;
- virtual LayoutUnit paddingLeft() const OVERRIDE;
- virtual LayoutUnit paddingRight() const OVERRIDE;
+ virtual LayoutUnit paddingTop() const override;
+ virtual LayoutUnit paddingBottom() const override;
+ virtual LayoutUnit paddingLeft() const override;
+ virtual LayoutUnit paddingRight() const override;
// FIXME: For now we just assume the cell has the same block flow direction as the table. It's likely we'll
// create an extra anonymous RenderBlock to handle mixing directionality anyway, in which case we can lock
// the block flow directionality of the cells to the table's directionality.
- virtual LayoutUnit paddingBefore() const OVERRIDE;
- virtual LayoutUnit paddingAfter() const OVERRIDE;
+ virtual LayoutUnit paddingBefore() const override;
+ virtual LayoutUnit paddingAfter() const override;
void setOverrideLogicalContentHeightFromRowHeight(LayoutUnit);
- virtual void scrollbarsChanged(bool horizontalScrollbarChanged, bool verticalScrollbarChanged) OVERRIDE;
+ virtual void scrollbarsChanged(bool horizontalScrollbarChanged, bool verticalScrollbarChanged) override;
bool cellWidthChanged() const { return m_cellWidthChanged; }
void setCellWidthChanged(bool b = true) { m_cellWidthChanged = b; }
static RenderTableCell* createAnonymous(Document*);
static RenderTableCell* createAnonymousWithParentRenderer(const RenderObject*);
- virtual RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject* parent) const OVERRIDE
+ virtual RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject* parent) const override
{
return createAnonymousWithParentRenderer(parent);
}
@@ -218,28 +218,28 @@ public:
}
#endif
protected:
- virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
- virtual void computePreferredLogicalWidths() OVERRIDE;
+ virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
+ virtual void computePreferredLogicalWidths() override;
- virtual void addLayerHitTestRects(LayerHitTestRects&, const RenderLayer* currentCompositedLayer, const LayoutPoint& layerOffset, const LayoutRect& containerRect) const OVERRIDE;
+ virtual void addLayerHitTestRects(LayerHitTestRects&, const RenderLayer* currentCompositedLayer, const LayoutPoint& layerOffset, const LayoutRect& containerRect) const override;
private:
- virtual const char* renderName() const OVERRIDE { return (isAnonymous() || isPseudoElement()) ? "RenderTableCell (anonymous)" : "RenderTableCell"; }
+ virtual const char* renderName() const override { return (isAnonymous() || isPseudoElement()) ? "RenderTableCell (anonymous)" : "RenderTableCell"; }
- virtual bool isTableCell() const OVERRIDE { return true; }
+ virtual bool isTableCell() const override { return true; }
- virtual void willBeRemovedFromTree() OVERRIDE;
+ virtual void willBeRemovedFromTree() override;
- virtual void updateLogicalWidth() OVERRIDE;
+ virtual void updateLogicalWidth() override;
- virtual void paintBoxDecorationBackground(PaintInfo&, const LayoutPoint&) OVERRIDE;
- virtual void paintMask(PaintInfo&, const LayoutPoint&) OVERRIDE;
+ virtual void paintBoxDecorationBackground(PaintInfo&, const LayoutPoint&) override;
+ virtual void paintMask(PaintInfo&, const LayoutPoint&) override;
- virtual bool boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance, InlineFlowBox*) const OVERRIDE;
+ virtual bool boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance, InlineFlowBox*) const override;
- virtual LayoutSize offsetFromContainer(const RenderObject*, const LayoutPoint&, bool* offsetDependsOnPoint = 0) const OVERRIDE;
- virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const OVERRIDE;
- virtual void mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect&, const PaintInvalidationState*) const OVERRIDE;
+ virtual LayoutSize offsetFromContainer(const RenderObject*, const LayoutPoint&, bool* offsetDependsOnPoint = 0) const override;
+ virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const override;
+ virtual void mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect&, const PaintInvalidationState*) const override;
int borderHalfLeft(bool outer) const;
int borderHalfRight(bool outer) const;
« no previous file with comments | « Source/core/rendering/RenderTableCaption.h ('k') | Source/core/rendering/RenderTableCol.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698