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

Side by Side Diff: Source/core/rendering/RenderTableCol.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 unified diff | Download patch
« no previous file with comments | « Source/core/rendering/RenderTableCell.h ('k') | Source/core/rendering/RenderTableRow.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1997 Martin Jones (mjones@kde.org) 2 * Copyright (C) 1997 Martin Jones (mjones@kde.org)
3 * (C) 1997 Torben Weis (weis@kde.org) 3 * (C) 1997 Torben Weis (weis@kde.org)
4 * (C) 1998 Waldo Bastian (bastian@kde.org) 4 * (C) 1998 Waldo Bastian (bastian@kde.org)
5 * (C) 1999 Lars Knoll (knoll@kde.org) 5 * (C) 1999 Lars Knoll (knoll@kde.org)
6 * (C) 1999 Antti Koivisto (koivisto@kde.org) 6 * (C) 1999 Antti Koivisto (koivisto@kde.org)
7 * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved.
8 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 8 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 15 matching lines...) Expand all
26 #ifndef RenderTableCol_h 26 #ifndef RenderTableCol_h
27 #define RenderTableCol_h 27 #define RenderTableCol_h
28 28
29 #include "core/rendering/RenderBox.h" 29 #include "core/rendering/RenderBox.h"
30 30
31 namespace blink { 31 namespace blink {
32 32
33 class RenderTable; 33 class RenderTable;
34 class RenderTableCell; 34 class RenderTableCell;
35 35
36 class RenderTableCol FINAL : public RenderBox { 36 class RenderTableCol final : public RenderBox {
37 public: 37 public:
38 explicit RenderTableCol(Element*); 38 explicit RenderTableCol(Element*);
39 virtual void trace(Visitor*) OVERRIDE; 39 virtual void trace(Visitor*) override;
40 40
41 RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); } 41 RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
42 42
43 // If you have a RenderTableCol, use firstChild or lastChild instead. 43 // If you have a RenderTableCol, use firstChild or lastChild instead.
44 void slowFirstChild() const WTF_DELETED_FUNCTION; 44 void slowFirstChild() const WTF_DELETED_FUNCTION;
45 void slowLastChild() const WTF_DELETED_FUNCTION; 45 void slowLastChild() const WTF_DELETED_FUNCTION;
46 46
47 const RenderObjectChildList* children() const { return &m_children; } 47 const RenderObjectChildList* children() const { return &m_children; }
48 RenderObjectChildList* children() { return &m_children; } 48 RenderObjectChildList* children() { return &m_children; }
49 49
(...skipping 23 matching lines...) Expand all
73 73
74 // Returns the next column or column-group. 74 // Returns the next column or column-group.
75 RenderTableCol* nextColumn() const; 75 RenderTableCol* nextColumn() const;
76 76
77 const BorderValue& borderAdjoiningCellStartBorder(const RenderTableCell*) co nst; 77 const BorderValue& borderAdjoiningCellStartBorder(const RenderTableCell*) co nst;
78 const BorderValue& borderAdjoiningCellEndBorder(const RenderTableCell*) cons t; 78 const BorderValue& borderAdjoiningCellEndBorder(const RenderTableCell*) cons t;
79 const BorderValue& borderAdjoiningCellBefore(const RenderTableCell*) const; 79 const BorderValue& borderAdjoiningCellBefore(const RenderTableCell*) const;
80 const BorderValue& borderAdjoiningCellAfter(const RenderTableCell*) const; 80 const BorderValue& borderAdjoiningCellAfter(const RenderTableCell*) const;
81 81
82 private: 82 private:
83 virtual RenderObjectChildList* virtualChildren() OVERRIDE { return children( ); } 83 virtual RenderObjectChildList* virtualChildren() override { return children( ); }
84 virtual const RenderObjectChildList* virtualChildren() const OVERRIDE { retu rn children(); } 84 virtual const RenderObjectChildList* virtualChildren() const override { retu rn children(); }
85 85
86 virtual const char* renderName() const OVERRIDE { return "RenderTableCol"; } 86 virtual const char* renderName() const override { return "RenderTableCol"; }
87 virtual bool isRenderTableCol() const OVERRIDE { return true; } 87 virtual bool isRenderTableCol() const override { return true; }
88 virtual void updateFromElement() OVERRIDE; 88 virtual void updateFromElement() override;
89 virtual void computePreferredLogicalWidths() OVERRIDE { ASSERT_NOT_REACHED() ; } 89 virtual void computePreferredLogicalWidths() override { ASSERT_NOT_REACHED() ; }
90 90
91 virtual void insertedIntoTree() OVERRIDE; 91 virtual void insertedIntoTree() override;
92 virtual void willBeRemovedFromTree() OVERRIDE; 92 virtual void willBeRemovedFromTree() override;
93 93
94 virtual bool isChildAllowed(RenderObject*, RenderStyle*) const OVERRIDE; 94 virtual bool isChildAllowed(RenderObject*, RenderStyle*) const override;
95 virtual bool canHaveChildren() const OVERRIDE; 95 virtual bool canHaveChildren() const override;
96 virtual LayerType layerTypeRequired() const OVERRIDE { return NoLayer; } 96 virtual LayerType layerTypeRequired() const override { return NoLayer; }
97 97
98 virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayer ModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) cons t OVERRIDE; 98 virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayer ModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) cons t override;
99 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) OVERRIDE; 99 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) override;
100 100
101 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE; 101 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride;
102 102
103 RenderTable* table() const; 103 RenderTable* table() const;
104 104
105 RenderObjectChildList m_children; 105 RenderObjectChildList m_children;
106 unsigned m_span; 106 unsigned m_span;
107 }; 107 };
108 108
109 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderTableCol, isRenderTableCol()); 109 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderTableCol, isRenderTableCol());
110 110
111 } 111 }
112 112
113 #endif 113 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderTableCell.h ('k') | Source/core/rendering/RenderTableRow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698