| 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 582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 593 // This looks like a spanner, but if we're inside something unbreakable or s
omething that | 593 // This looks like a spanner, but if we're inside something unbreakable or s
omething that |
| 594 // establishes a new formatting context, it's not to be treated as one. | 594 // establishes a new formatting context, it's not to be treated as one. |
| 595 for (LayoutBox* ancestor = toLayoutBox(descendant)->parentBox(); ancestor; a
ncestor = ancestor->containingBlock()) { | 595 for (LayoutBox* ancestor = toLayoutBox(descendant)->parentBox(); ancestor; a
ncestor = ancestor->containingBlock()) { |
| 596 if (ancestor->isLayoutFlowThread()) { | 596 if (ancestor->isLayoutFlowThread()) { |
| 597 ASSERT(ancestor == this); | 597 ASSERT(ancestor == this); |
| 598 return true; | 598 return true; |
| 599 } | 599 } |
| 600 if (!ancestor->isLayoutBlockFlow()) | 600 if (!ancestor->isLayoutBlockFlow()) |
| 601 return false; | 601 return false; |
| 602 const LayoutBlockFlow& ancestorBlockFlow = *toLayoutBlockFlow(ancestor); | 602 const LayoutBlockFlow& ancestorBlockFlow = *toLayoutBlockFlow(ancestor); |
| 603 if (ancestorBlockFlow.createsNewFormattingContext() || ancestorBlockFlow
.isUnsplittableForPagination()) | 603 if (ancestorBlockFlow.createsNewFormattingContext() || ancestorBlockFlow
.paginationBreakability() == ForbidBreaks) |
| 604 return false; | 604 return false; |
| 605 } | 605 } |
| 606 ASSERT_NOT_REACHED(); | 606 ASSERT_NOT_REACHED(); |
| 607 return false; | 607 return false; |
| 608 } | 608 } |
| 609 | 609 |
| 610 void LayoutMultiColumnFlowThread::addColumnSetToThread(LayoutMultiColumnSet* col
umnSet) | 610 void LayoutMultiColumnFlowThread::addColumnSetToThread(LayoutMultiColumnSet* col
umnSet) |
| 611 { | 611 { |
| 612 if (LayoutMultiColumnSet* nextSet = columnSet->nextSiblingMultiColumnSet())
{ | 612 if (LayoutMultiColumnSet* nextSet = columnSet->nextSiblingMultiColumnSet())
{ |
| 613 LayoutMultiColumnSetList::iterator it = m_multiColumnSetList.find(nextSe
t); | 613 LayoutMultiColumnSetList::iterator it = m_multiColumnSetList.find(nextSe
t); |
| (...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 935 appendNewFragmentainerGroupIfNeeded(logicalTopInFlowThreadAfterPagination); | 935 appendNewFragmentainerGroupIfNeeded(logicalTopInFlowThreadAfterPagination); |
| 936 } | 936 } |
| 937 | 937 |
| 938 void LayoutMultiColumnFlowThread::updateMinimumPageHeight(LayoutUnit offset, Lay
outUnit minHeight) | 938 void LayoutMultiColumnFlowThread::updateMinimumPageHeight(LayoutUnit offset, Lay
outUnit minHeight) |
| 939 { | 939 { |
| 940 if (LayoutMultiColumnSet* multicolSet = columnSetAtBlockOffset(offset)) | 940 if (LayoutMultiColumnSet* multicolSet = columnSetAtBlockOffset(offset)) |
| 941 multicolSet->updateMinimumColumnHeight(offset, minHeight); | 941 multicolSet->updateMinimumColumnHeight(offset, minHeight); |
| 942 } | 942 } |
| 943 | 943 |
| 944 } | 944 } |
| OLD | NEW |