OLD | NEW |
---|---|
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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
136 { | 136 { |
137 setRange(start, end); | 137 setRange(start, end); |
138 } | 138 } |
139 | 139 |
140 void setRange(RenderMultiColumnSet* start, RenderMultiColumnSet* end) | 140 void setRange(RenderMultiColumnSet* start, RenderMultiColumnSet* end) |
141 { | 141 { |
142 m_startColumnSet = start; | 142 m_startColumnSet = start; |
143 m_endColumnSet = end; | 143 m_endColumnSet = end; |
144 } | 144 } |
145 | 145 |
146 RenderMultiColumnSet* startColumnSet() const { return m_startColumnSet; } | |
mstensho (USE GERRIT)
2014/10/01 22:21:37
What purpose would this class (RenderMultiColumnSe
| |
147 RenderMultiColumnSet* endColumnSet() const { return m_endColumnSet; } | |
148 | |
149 private: | 146 private: |
150 RenderMultiColumnSet* m_startColumnSet; | 147 RenderMultiColumnSet* m_startColumnSet; |
151 RenderMultiColumnSet* m_endColumnSet; | 148 RenderMultiColumnSet* m_endColumnSet; |
Julien - ping for review
2014/10/02 16:47:49
Those 2 variables are unused in the code and could
| |
152 }; | 149 }; |
153 | 150 |
154 typedef PODInterval<LayoutUnit, RenderMultiColumnSet*> MultiColumnSetInterva l; | 151 typedef PODInterval<LayoutUnit, RenderMultiColumnSet*> MultiColumnSetInterva l; |
155 typedef PODIntervalTree<LayoutUnit, RenderMultiColumnSet*> MultiColumnSetInt ervalTree; | 152 typedef PODIntervalTree<LayoutUnit, RenderMultiColumnSet*> MultiColumnSetInt ervalTree; |
156 | 153 |
157 class RegionSearchAdapter { | |
mstensho (USE GERRIT)
2014/10/01 22:21:37
I suggest that you keep this. I'm about to start u
| |
158 public: | |
159 RegionSearchAdapter(LayoutUnit offset) | |
160 : m_offset(offset) | |
161 , m_result(0) | |
162 { | |
163 } | |
164 | |
165 const LayoutUnit& lowValue() const { return m_offset; } | |
166 const LayoutUnit& highValue() const { return m_offset; } | |
167 void collectIfNeeded(const MultiColumnSetInterval&); | |
168 | |
169 RenderRegion* result() const { return m_result; } | |
170 | |
171 private: | |
172 LayoutUnit m_offset; | |
173 RenderRegion* m_result; | |
174 }; | |
175 | |
176 // Stack of objects that pushed a LayoutState object on the RenderView. The | 154 // Stack of objects that pushed a LayoutState object on the RenderView. The |
177 // objects on the stack are the ones that are curently in the process of bei ng | 155 // objects on the stack are the ones that are curently in the process of bei ng |
178 // laid out. | 156 // laid out. |
179 ListHashSet<const RenderObject*> m_statePusherObjectsStack; | 157 ListHashSet<const RenderObject*> m_statePusherObjectsStack; |
180 typedef HashMap<const RenderBox*, LayoutUnit> RenderBoxToOffsetMap; | 158 typedef HashMap<const RenderBox*, LayoutUnit> RenderBoxToOffsetMap; |
181 RenderBoxToOffsetMap m_boxesToOffsetMap; | 159 RenderBoxToOffsetMap m_boxesToOffsetMap; |
182 | 160 |
183 MultiColumnSetIntervalTree m_multiColumnSetIntervalTree; | 161 MultiColumnSetIntervalTree m_multiColumnSetIntervalTree; |
184 | 162 |
185 bool m_regionsInvalidated : 1; | 163 bool m_regionsInvalidated : 1; |
(...skipping 20 matching lines...) Expand all Loading... | |
206 }; | 184 }; |
207 | 185 |
208 template <> struct ValueToString<RenderMultiColumnSet*> { | 186 template <> struct ValueToString<RenderMultiColumnSet*> { |
209 static String string(const RenderMultiColumnSet* value) { return String::for mat("%p", value); } | 187 static String string(const RenderMultiColumnSet* value) { return String::for mat("%p", value); } |
210 }; | 188 }; |
211 #endif | 189 #endif |
212 | 190 |
213 } // namespace blink | 191 } // namespace blink |
214 | 192 |
215 #endif // RenderFlowThread_h | 193 #endif // RenderFlowThread_h |
OLD | NEW |