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

Side by Side Diff: Source/core/layout/LayoutTableCol.h

Issue 1162383003: C++11: Replace 0 with nullptr where applicable in layout code. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add one more file. Created 5 years, 6 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/layout/LayoutTableCell.cpp ('k') | Source/core/layout/LayoutTableCol.cpp » ('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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 unsigned span() const { return m_span; } 51 unsigned span() const { return m_span; }
52 52
53 bool isTableColumnGroupWithColumnChildren() { return firstChild(); } 53 bool isTableColumnGroupWithColumnChildren() { return firstChild(); }
54 bool isTableColumn() const { return style()->display() == TABLE_COLUMN; } 54 bool isTableColumn() const { return style()->display() == TABLE_COLUMN; }
55 bool isTableColumnGroup() const { return style()->display() == TABLE_COLUMN_ GROUP; } 55 bool isTableColumnGroup() const { return style()->display() == TABLE_COLUMN_ GROUP; }
56 56
57 LayoutTableCol* enclosingColumnGroup() const; 57 LayoutTableCol* enclosingColumnGroup() const;
58 LayoutTableCol* enclosingColumnGroupIfAdjacentBefore() const 58 LayoutTableCol* enclosingColumnGroupIfAdjacentBefore() const
59 { 59 {
60 if (previousSibling()) 60 if (previousSibling())
61 return 0; 61 return nullptr;
62 return enclosingColumnGroup(); 62 return enclosingColumnGroup();
63 } 63 }
64 64
65 LayoutTableCol* enclosingColumnGroupIfAdjacentAfter() const 65 LayoutTableCol* enclosingColumnGroupIfAdjacentAfter() const
66 { 66 {
67 if (nextSibling()) 67 if (nextSibling())
68 return 0; 68 return nullptr;
69 return enclosingColumnGroup(); 69 return enclosingColumnGroup();
70 } 70 }
71 71
72 72
73 // Returns the next column or column-group. 73 // Returns the next column or column-group.
74 LayoutTableCol* nextColumn() const; 74 LayoutTableCol* nextColumn() const;
75 75
76 const BorderValue& borderAdjoiningCellStartBorder(const LayoutTableCell*) co nst; 76 const BorderValue& borderAdjoiningCellStartBorder(const LayoutTableCell*) co nst;
77 const BorderValue& borderAdjoiningCellEndBorder(const LayoutTableCell*) cons t; 77 const BorderValue& borderAdjoiningCellEndBorder(const LayoutTableCell*) cons t;
78 const BorderValue& borderAdjoiningCellBefore(const LayoutTableCell*) const; 78 const BorderValue& borderAdjoiningCellBefore(const LayoutTableCell*) const;
79 const BorderValue& borderAdjoiningCellAfter(const LayoutTableCell*) const; 79 const BorderValue& borderAdjoiningCellAfter(const LayoutTableCell*) const;
80 80
81 virtual const char* name() const override { return "LayoutTableCol"; } 81 virtual const char* name() const override { return "LayoutTableCol"; }
82 82
83 private: 83 private:
84 virtual LayoutObjectChildList* virtualChildren() override { return children( ); } 84 virtual LayoutObjectChildList* virtualChildren() override { return children( ); }
85 virtual const LayoutObjectChildList* virtualChildren() const override { retu rn children(); } 85 virtual const LayoutObjectChildList* virtualChildren() const override { retu rn children(); }
86 86
87 virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectLayoutTableCol || LayoutBox::isOfType(type); } 87 virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectLayoutTableCol || LayoutBox::isOfType(type); }
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(LayoutObject*, const ComputedStyle&) const overr ide; 94 virtual bool isChildAllowed(LayoutObject*, const ComputedStyle&) const overr ide;
95 virtual bool canHaveChildren() const override; 95 virtual bool canHaveChildren() const override;
96 virtual DeprecatedPaintLayerType layerTypeRequired() const override { return NoDeprecatedPaintLayer; } 96 virtual DeprecatedPaintLayerType layerTypeRequired() const override { return NoDeprecatedPaintLayer; }
97 97
98 virtual LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxMo delObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const override; 98 virtual LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxMo delObject* paintInvalidationContainer, const PaintInvalidationState* = nullptr) const override;
99 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) override; 99 virtual void imageChanged(WrappedImagePtr, const IntRect* = nullptr) overrid e;
100 100
101 virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override; 101 virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
102 102
103 LayoutTable* table() const; 103 LayoutTable* table() const;
104 104
105 LayoutObjectChildList m_children; 105 LayoutObjectChildList m_children;
106 unsigned m_span; 106 unsigned m_span;
107 }; 107 };
108 108
109 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutTableCol, isLayoutTableCol()); 109 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutTableCol, isLayoutTableCol());
110 110
111 } 111 }
112 112
113 #endif 113 #endif
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutTableCell.cpp ('k') | Source/core/layout/LayoutTableCol.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698