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

Side by Side Diff: Source/core/layout/LayoutFlowThread.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/LayoutFlexibleBox.cpp ('k') | Source/core/layout/LayoutFlowThread.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) 2011 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2011 Adobe Systems Incorporated. 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 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 virtual void mapRectToPaintInvalidationBacking(const LayoutBoxModelObject* p aintInvalidationContainer, LayoutRect&, const PaintInvalidationState*) const ove rride; 90 virtual void mapRectToPaintInvalidationBacking(const LayoutBoxModelObject* p aintInvalidationContainer, LayoutRect&, const PaintInvalidationState*) const ove rride;
91 91
92 LayoutUnit pageLogicalHeightForOffset(LayoutUnit); 92 LayoutUnit pageLogicalHeightForOffset(LayoutUnit);
93 LayoutUnit pageRemainingLogicalHeightForOffset(LayoutUnit, PageBoundaryRule = IncludePageBoundary); 93 LayoutUnit pageRemainingLogicalHeightForOffset(LayoutUnit, PageBoundaryRule = IncludePageBoundary);
94 94
95 virtual void setPageBreak(LayoutUnit /*offset*/, LayoutUnit /*spaceShortage* /) { } 95 virtual void setPageBreak(LayoutUnit /*offset*/, LayoutUnit /*spaceShortage* /) { }
96 virtual void updateMinimumPageHeight(LayoutUnit /*offset*/, LayoutUnit /*min Height*/) { } 96 virtual void updateMinimumPageHeight(LayoutUnit /*offset*/, LayoutUnit /*min Height*/) { }
97 97
98 bool columnSetsHaveUniformLogicalHeight() const { return m_columnSetsHaveUni formLogicalHeight; } 98 bool columnSetsHaveUniformLogicalHeight() const { return m_columnSetsHaveUni formLogicalHeight; }
99 99
100 virtual bool addForcedColumnBreak(LayoutUnit, LayoutObject* breakChild, bool isBefore, LayoutUnit* offsetBreakAdjustment = 0) { return false; } 100 virtual bool addForcedColumnBreak(LayoutUnit, LayoutObject* breakChild, bool isBefore, LayoutUnit* offsetBreakAdjustment = nullptr) { return false; }
101 101
102 virtual bool isPageLogicalHeightKnown() const { return true; } 102 virtual bool isPageLogicalHeightKnown() const { return true; }
103 bool pageLogicalSizeChanged() const { return m_pageLogicalSizeChanged; } 103 bool pageLogicalSizeChanged() const { return m_pageLogicalSizeChanged; }
104 104
105 void collectLayerFragments(DeprecatedPaintLayerFragments&, const LayoutRect& layerBoundingBox, const LayoutRect& dirtyRect); 105 void collectLayerFragments(DeprecatedPaintLayerFragments&, const LayoutRect& layerBoundingBox, const LayoutRect& dirtyRect);
106 106
107 // Return the visual bounding box based on the supplied flow-thread bounding box. Both 107 // Return the visual bounding box based on the supplied flow-thread bounding box. Both
108 // rectangles are completely physical in terms of writing mode. 108 // rectangles are completely physical in terms of writing mode.
109 LayoutRect fragmentsBoundingBox(const LayoutRect& layerBoundingBox) const; 109 LayoutRect fragmentsBoundingBox(const LayoutRect& layerBoundingBox) const;
110 110
(...skipping 16 matching lines...) Expand all
127 127
128 LayoutMultiColumnSetList m_multiColumnSetList; 128 LayoutMultiColumnSetList m_multiColumnSetList;
129 129
130 typedef PODInterval<LayoutUnit, LayoutMultiColumnSet*> MultiColumnSetInterva l; 130 typedef PODInterval<LayoutUnit, LayoutMultiColumnSet*> MultiColumnSetInterva l;
131 typedef PODIntervalTree<LayoutUnit, LayoutMultiColumnSet*> MultiColumnSetInt ervalTree; 131 typedef PODIntervalTree<LayoutUnit, LayoutMultiColumnSet*> MultiColumnSetInt ervalTree;
132 132
133 class MultiColumnSetSearchAdapter { 133 class MultiColumnSetSearchAdapter {
134 public: 134 public:
135 MultiColumnSetSearchAdapter(LayoutUnit offset) 135 MultiColumnSetSearchAdapter(LayoutUnit offset)
136 : m_offset(offset) 136 : m_offset(offset)
137 , m_result(0) 137 , m_result(nullptr)
138 { 138 {
139 } 139 }
140 140
141 const LayoutUnit& lowValue() const { return m_offset; } 141 const LayoutUnit& lowValue() const { return m_offset; }
142 const LayoutUnit& highValue() const { return m_offset; } 142 const LayoutUnit& highValue() const { return m_offset; }
143 void collectIfNeeded(const MultiColumnSetInterval&); 143 void collectIfNeeded(const MultiColumnSetInterval&);
144 144
145 LayoutMultiColumnSet* result() const { return m_result; } 145 LayoutMultiColumnSet* result() const { return m_result; }
146 146
147 private: 147 private:
(...skipping 17 matching lines...) Expand all
165 }; 165 };
166 166
167 template <> struct ValueToString<LayoutMultiColumnSet*> { 167 template <> struct ValueToString<LayoutMultiColumnSet*> {
168 static String string(const LayoutMultiColumnSet* value) { return String::for mat("%p", value); } 168 static String string(const LayoutMultiColumnSet* value) { return String::for mat("%p", value); }
169 }; 169 };
170 #endif 170 #endif
171 171
172 } // namespace blink 172 } // namespace blink
173 173
174 #endif // LayoutFlowThread_h 174 #endif // LayoutFlowThread_h
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutFlexibleBox.cpp ('k') | Source/core/layout/LayoutFlowThread.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698