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 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 // FIXME: remove this method. It's a meaningless question to ask the set "ho
w many columns do | 266 // FIXME: remove this method. It's a meaningless question to ask the set "ho
w many columns do |
267 // you actually have?", since that may vary for each row. | 267 // you actually have?", since that may vary for each row. |
268 return firstFragmentainerGroup().actualColumnCount(); | 268 return firstFragmentainerGroup().actualColumnCount(); |
269 } | 269 } |
270 | 270 |
271 void LayoutMultiColumnSet::paintObject(const PaintInfo& paintInfo, const LayoutP
oint& paintOffset) | 271 void LayoutMultiColumnSet::paintObject(const PaintInfo& paintInfo, const LayoutP
oint& paintOffset) |
272 { | 272 { |
273 MultiColumnSetPainter(*this).paintObject(paintInfo, paintOffset); | 273 MultiColumnSetPainter(*this).paintObject(paintInfo, paintOffset); |
274 } | 274 } |
275 | 275 |
| 276 LayoutRect LayoutMultiColumnSet::fragmentsBoundingBox(const LayoutRect& bounding
BoxInFlowThread) const |
| 277 { |
| 278 LayoutRect result; |
| 279 for (const auto& group : m_fragmentainerGroups) |
| 280 result.unite(group.fragmentsBoundingBox(boundingBoxInFlowThread)); |
| 281 return result; |
| 282 } |
| 283 |
276 void LayoutMultiColumnSet::collectLayerFragments(DeprecatedPaintLayerFragments&
fragments, const LayoutRect& layerBoundingBox, const LayoutRect& dirtyRect) | 284 void LayoutMultiColumnSet::collectLayerFragments(DeprecatedPaintLayerFragments&
fragments, const LayoutRect& layerBoundingBox, const LayoutRect& dirtyRect) |
277 { | 285 { |
278 for (const auto& group : m_fragmentainerGroups) | 286 for (const auto& group : m_fragmentainerGroups) |
279 group.collectLayerFragments(fragments, layerBoundingBox, dirtyRect); | 287 group.collectLayerFragments(fragments, layerBoundingBox, dirtyRect); |
280 } | 288 } |
281 | 289 |
282 void LayoutMultiColumnSet::addOverflowFromChildren() | 290 void LayoutMultiColumnSet::addOverflowFromChildren() |
283 { | 291 { |
284 LayoutRect overflowRect; | 292 LayoutRect overflowRect; |
285 for (const auto& group : m_fragmentainerGroups) { | 293 for (const auto& group : m_fragmentainerGroups) { |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
325 | 333 |
326 LayoutRect LayoutMultiColumnSet::flowThreadPortionRect() const | 334 LayoutRect LayoutMultiColumnSet::flowThreadPortionRect() const |
327 { | 335 { |
328 LayoutRect portionRect(LayoutUnit(), logicalTopInFlowThread(), pageLogicalWi
dth(), logicalHeightInFlowThread()); | 336 LayoutRect portionRect(LayoutUnit(), logicalTopInFlowThread(), pageLogicalWi
dth(), logicalHeightInFlowThread()); |
329 if (!isHorizontalWritingMode()) | 337 if (!isHorizontalWritingMode()) |
330 return portionRect.transposedRect(); | 338 return portionRect.transposedRect(); |
331 return portionRect; | 339 return portionRect; |
332 } | 340 } |
333 | 341 |
334 } | 342 } |
OLD | NEW |