| 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 857 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 868 // as one. | 868 // as one. |
| 869 for (LayoutBox* ancestor = toLayoutBox(descendant)->parentBox(); ancestor; | 869 for (LayoutBox* ancestor = toLayoutBox(descendant)->parentBox(); ancestor; |
| 870 ancestor = ancestor->containingBlock()) { | 870 ancestor = ancestor->containingBlock()) { |
| 871 if (ancestor->isLayoutFlowThread()) { | 871 if (ancestor->isLayoutFlowThread()) { |
| 872 ASSERT(ancestor == this); | 872 ASSERT(ancestor == this); |
| 873 return true; | 873 return true; |
| 874 } | 874 } |
| 875 if (!canContainSpannerInParentFragmentationContext(*ancestor)) | 875 if (!canContainSpannerInParentFragmentationContext(*ancestor)) |
| 876 return false; | 876 return false; |
| 877 } | 877 } |
| 878 ASSERT_NOT_REACHED(); | 878 NOTREACHED(); |
| 879 return false; | 879 return false; |
| 880 } | 880 } |
| 881 | 881 |
| 882 void LayoutMultiColumnFlowThread::addColumnSetToThread( | 882 void LayoutMultiColumnFlowThread::addColumnSetToThread( |
| 883 LayoutMultiColumnSet* columnSet) { | 883 LayoutMultiColumnSet* columnSet) { |
| 884 if (LayoutMultiColumnSet* nextSet = columnSet->nextSiblingMultiColumnSet()) { | 884 if (LayoutMultiColumnSet* nextSet = columnSet->nextSiblingMultiColumnSet()) { |
| 885 LayoutMultiColumnSetList::iterator it = m_multiColumnSetList.find(nextSet); | 885 LayoutMultiColumnSetList::iterator it = m_multiColumnSetList.find(nextSet); |
| 886 ASSERT(it != m_multiColumnSetList.end()); | 886 ASSERT(it != m_multiColumnSetList.end()); |
| 887 m_multiColumnSetList.insertBefore(it, columnSet); | 887 m_multiColumnSetList.insertBefore(it, columnSet); |
| 888 } else { | 888 } else { |
| (...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1377 const { | 1377 const { |
| 1378 return MultiColumnLayoutState(m_lastSetWorkedOn); | 1378 return MultiColumnLayoutState(m_lastSetWorkedOn); |
| 1379 } | 1379 } |
| 1380 | 1380 |
| 1381 void LayoutMultiColumnFlowThread::restoreMultiColumnLayoutState( | 1381 void LayoutMultiColumnFlowThread::restoreMultiColumnLayoutState( |
| 1382 const MultiColumnLayoutState& state) { | 1382 const MultiColumnLayoutState& state) { |
| 1383 m_lastSetWorkedOn = state.columnSet(); | 1383 m_lastSetWorkedOn = state.columnSet(); |
| 1384 } | 1384 } |
| 1385 | 1385 |
| 1386 } // namespace blink | 1386 } // namespace blink |
| OLD | NEW |