OLD | NEW |
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 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
290 | 290 |
291 RenderRegion* RenderMultiColumnFlowThread::regionAtBlockOffset(LayoutUnit /*offs
et*/) const | 291 RenderRegion* RenderMultiColumnFlowThread::regionAtBlockOffset(LayoutUnit /*offs
et*/) const |
292 { | 292 { |
293 // For now there's only one column set, so this is easy: | 293 // For now there's only one column set, so this is easy: |
294 return firstMultiColumnSet(); | 294 return firstMultiColumnSet(); |
295 } | 295 } |
296 | 296 |
297 bool RenderMultiColumnFlowThread::addForcedRegionBreak(LayoutUnit offset, Render
Object* /*breakChild*/, bool /*isBefore*/, LayoutUnit* offsetBreakAdjustment) | 297 bool RenderMultiColumnFlowThread::addForcedRegionBreak(LayoutUnit offset, Render
Object* /*breakChild*/, bool /*isBefore*/, LayoutUnit* offsetBreakAdjustment) |
298 { | 298 { |
299 if (RenderMultiColumnSet* multicolSet = toRenderMultiColumnSet(regionAtBlock
Offset(offset))) { | 299 if (RenderMultiColumnSet* multicolSet = toRenderMultiColumnSet(regionAtBlock
Offset(offset))) { |
300 multicolSet->addForcedBreak(offset); | 300 multicolSet->addContentRun(offset); |
301 if (offsetBreakAdjustment) | 301 if (offsetBreakAdjustment) |
302 *offsetBreakAdjustment = pageLogicalHeightForOffset(offset) ? pageRe
mainingLogicalHeightForOffset(offset, IncludePageBoundary) : LayoutUnit(); | 302 *offsetBreakAdjustment = pageLogicalHeightForOffset(offset) ? pageRe
mainingLogicalHeightForOffset(offset, IncludePageBoundary) : LayoutUnit(); |
303 return true; | 303 return true; |
304 } | 304 } |
305 return false; | 305 return false; |
306 } | 306 } |
307 | 307 |
308 bool RenderMultiColumnFlowThread::isPageLogicalHeightKnown() const | 308 bool RenderMultiColumnFlowThread::isPageLogicalHeightKnown() const |
309 { | 309 { |
310 if (RenderMultiColumnSet* columnSet = lastMultiColumnSet()) | 310 if (RenderMultiColumnSet* columnSet = lastMultiColumnSet()) |
311 return columnSet->computedColumnHeight(); | 311 return columnSet->computedColumnHeight(); |
312 return false; | 312 return false; |
313 } | 313 } |
314 | 314 |
315 } | 315 } |
OLD | NEW |