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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.h

Issue 2711003005: Merge overflowRectForFlowThreadPortion() into flowThreadPortionOverflowRectAt(). (Closed)
Patch Set: Created 3 years, 10 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 | « no previous file | third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.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) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 Apple Inc. 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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 } 153 }
154 154
155 // Return the amount of flow thread contents that the specified fragmentainer 155 // Return the amount of flow thread contents that the specified fragmentainer
156 // group can hold without overflowing. 156 // group can hold without overflowing.
157 LayoutUnit fragmentainerGroupCapacity( 157 LayoutUnit fragmentainerGroupCapacity(
158 const MultiColumnFragmentainerGroup& group) const { 158 const MultiColumnFragmentainerGroup& group) const {
159 return group.logicalHeight() * usedColumnCount(); 159 return group.logicalHeight() * usedColumnCount();
160 } 160 }
161 161
162 LayoutRect flowThreadPortionRect() const; 162 LayoutRect flowThreadPortionRect() const;
163 LayoutRect flowThreadPortionOverflowRect() const;
164 LayoutRect overflowRectForFlowThreadPortion(
165 const LayoutRect& flowThreadPortionRect,
166 bool isFirstPortion,
167 bool isLastPortion) const;
168 163
169 // The used CSS value of column-count, i.e. how many columns there are room 164 // The used CSS value of column-count, i.e. how many columns there are room
170 // for without overflowing. 165 // for without overflowing.
171 unsigned usedColumnCount() const { 166 unsigned usedColumnCount() const {
172 return multiColumnFlowThread()->columnCount(); 167 return multiColumnFlowThread()->columnCount();
173 } 168 }
174 169
175 bool heightIsAuto() const; 170 bool heightIsAuto() const;
176 171
177 // Find the column that contains the given block offset, and return the 172 // Find the column that contains the given block offset, and return the
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 LayoutUnit m_oldLogicalTop; 268 LayoutUnit m_oldLogicalTop;
274 269
275 bool m_initialHeightCalculated; 270 bool m_initialHeightCalculated;
276 }; 271 };
277 272
278 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutMultiColumnSet, isLayoutMultiColumnSet()); 273 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutMultiColumnSet, isLayoutMultiColumnSet());
279 274
280 } // namespace blink 275 } // namespace blink
281 276
282 #endif // LayoutMultiColumnSet_h 277 #endif // LayoutMultiColumnSet_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698