| 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 862 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 873 return false; | 873 return false; |
| 874 } | 874 } |
| 875 | 875 |
| 876 void LayoutMultiColumnFlowThread::addColumnSetToThread( | 876 void LayoutMultiColumnFlowThread::addColumnSetToThread( |
| 877 LayoutMultiColumnSet* columnSet) { | 877 LayoutMultiColumnSet* columnSet) { |
| 878 if (LayoutMultiColumnSet* nextSet = columnSet->nextSiblingMultiColumnSet()) { | 878 if (LayoutMultiColumnSet* nextSet = columnSet->nextSiblingMultiColumnSet()) { |
| 879 LayoutMultiColumnSetList::iterator it = m_multiColumnSetList.find(nextSet); | 879 LayoutMultiColumnSetList::iterator it = m_multiColumnSetList.find(nextSet); |
| 880 ASSERT(it != m_multiColumnSetList.end()); | 880 ASSERT(it != m_multiColumnSetList.end()); |
| 881 m_multiColumnSetList.insertBefore(it, columnSet); | 881 m_multiColumnSetList.insertBefore(it, columnSet); |
| 882 } else { | 882 } else { |
| 883 m_multiColumnSetList.add(columnSet); | 883 m_multiColumnSetList.insert(columnSet); |
| 884 } | 884 } |
| 885 } | 885 } |
| 886 | 886 |
| 887 void LayoutMultiColumnFlowThread::willBeRemovedFromTree() { | 887 void LayoutMultiColumnFlowThread::willBeRemovedFromTree() { |
| 888 // Detach all column sets from the flow thread. Cannot destroy them at this | 888 // Detach all column sets from the flow thread. Cannot destroy them at this |
| 889 // point, since they are siblings of this object, and there may be pointers to | 889 // point, since they are siblings of this object, and there may be pointers to |
| 890 // this object's sibling somewhere further up on the call stack. | 890 // this object's sibling somewhere further up on the call stack. |
| 891 for (LayoutMultiColumnSet* columnSet = firstMultiColumnSet(); columnSet; | 891 for (LayoutMultiColumnSet* columnSet = firstMultiColumnSet(); columnSet; |
| 892 columnSet = columnSet->nextSiblingMultiColumnSet()) | 892 columnSet = columnSet->nextSiblingMultiColumnSet()) |
| 893 columnSet->detachFromFlowThread(); | 893 columnSet->detachFromFlowThread(); |
| (...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1370 const { | 1370 const { |
| 1371 return MultiColumnLayoutState(m_lastSetWorkedOn); | 1371 return MultiColumnLayoutState(m_lastSetWorkedOn); |
| 1372 } | 1372 } |
| 1373 | 1373 |
| 1374 void LayoutMultiColumnFlowThread::restoreMultiColumnLayoutState( | 1374 void LayoutMultiColumnFlowThread::restoreMultiColumnLayoutState( |
| 1375 const MultiColumnLayoutState& state) { | 1375 const MultiColumnLayoutState& state) { |
| 1376 m_lastSetWorkedOn = state.columnSet(); | 1376 m_lastSetWorkedOn = state.columnSet(); |
| 1377 } | 1377 } |
| 1378 | 1378 |
| 1379 } // namespace blink | 1379 } // namespace blink |
| OLD | NEW |