| 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 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 { | 202 { |
| 203 return fragmentainerGroupAtFlowThreadOffset(blockOffset).flowThreadTranslati
onAtOffset(blockOffset); | 203 return fragmentainerGroupAtFlowThreadOffset(blockOffset).flowThreadTranslati
onAtOffset(blockOffset); |
| 204 } | 204 } |
| 205 | 205 |
| 206 LayoutPoint LayoutMultiColumnSet::visualPointToFlowThreadPoint(const LayoutPoint
& visualPoint) const | 206 LayoutPoint LayoutMultiColumnSet::visualPointToFlowThreadPoint(const LayoutPoint
& visualPoint) const |
| 207 { | 207 { |
| 208 const MultiColumnFragmentainerGroup& row = fragmentainerGroupAtVisualPoint(v
isualPoint); | 208 const MultiColumnFragmentainerGroup& row = fragmentainerGroupAtVisualPoint(v
isualPoint); |
| 209 return row.visualPointToFlowThreadPoint(visualPoint - row.offsetFromColumnSe
t()); | 209 return row.visualPointToFlowThreadPoint(visualPoint - row.offsetFromColumnSe
t()); |
| 210 } | 210 } |
| 211 | 211 |
| 212 void LayoutMultiColumnSet::updateMinimumColumnHeight(LayoutUnit offsetInFlowThre
ad, LayoutUnit height) | |
| 213 { | |
| 214 fragmentainerGroupAtFlowThreadOffset(offsetInFlowThread).updateMinimumColumn
Height(height); | |
| 215 } | |
| 216 | |
| 217 LayoutUnit LayoutMultiColumnSet::pageLogicalTopForOffset(LayoutUnit offset) cons
t | 212 LayoutUnit LayoutMultiColumnSet::pageLogicalTopForOffset(LayoutUnit offset) cons
t |
| 218 { | 213 { |
| 219 return fragmentainerGroupAtFlowThreadOffset(offset).columnLogicalTopForOffse
t(offset); | 214 return fragmentainerGroupAtFlowThreadOffset(offset).columnLogicalTopForOffse
t(offset); |
| 220 } | 215 } |
| 221 | 216 |
| 222 bool LayoutMultiColumnSet::recalculateColumnHeight(BalancedColumnHeightCalculati
on calculationMode) | 217 bool LayoutMultiColumnSet::recalculateColumnHeight(BalancedColumnHeightCalculati
on calculationMode) |
| 223 { | 218 { |
| 224 bool changed = false; | 219 bool changed = false; |
| 225 for (auto& group : m_fragmentainerGroups) | 220 for (auto& group : m_fragmentainerGroups) |
| 226 changed = group.recalculateColumnHeight(calculationMode) || changed; | 221 changed = group.recalculateColumnHeight(calculationMode) || changed; |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 353 | 348 |
| 354 LayoutRect LayoutMultiColumnSet::flowThreadPortionRect() const | 349 LayoutRect LayoutMultiColumnSet::flowThreadPortionRect() const |
| 355 { | 350 { |
| 356 LayoutRect portionRect(LayoutUnit(), logicalTopInFlowThread(), pageLogicalWi
dth(), logicalHeightInFlowThread()); | 351 LayoutRect portionRect(LayoutUnit(), logicalTopInFlowThread(), pageLogicalWi
dth(), logicalHeightInFlowThread()); |
| 357 if (!isHorizontalWritingMode()) | 352 if (!isHorizontalWritingMode()) |
| 358 return portionRect.transposedRect(); | 353 return portionRect.transposedRect(); |
| 359 return portionRect; | 354 return portionRect; |
| 360 } | 355 } |
| 361 | 356 |
| 362 } | 357 } |
| OLD | NEW |