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 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
307 } | 307 } |
308 | 308 |
309 DCHECK(!PreviousSibling()); | 309 DCHECK(!PreviousSibling()); |
310 DCHECK(!NextSibling()); | 310 DCHECK(!NextSibling()); |
311 | 311 |
312 // Finally we can promote all flow thread's children. Before we move them to | 312 // Finally we can promote all flow thread's children. Before we move them to |
313 // the flow thread's container, we need to unregister the flow thread, so that | 313 // the flow thread's container, we need to unregister the flow thread, so that |
314 // they aren't just re-added again to the flow thread that we're trying to | 314 // they aren't just re-added again to the flow thread that we're trying to |
315 // empty. | 315 // empty. |
316 multicol_container->ResetMultiColumnFlowThread(); | 316 multicol_container->ResetMultiColumnFlowThread(); |
317 MoveAllChildrenTo(multicol_container, true); | 317 MoveAllChildrenIncludingFloatsTo(multicol_container, true); |
318 | 318 |
319 // We used to manually nuke the line box tree here, but that should happen | 319 // We used to manually nuke the line box tree here, but that should happen |
320 // automatically when moving children around (the code above). | 320 // automatically when moving children around (the code above). |
321 DCHECK(!FirstLineBox()); | 321 DCHECK(!FirstLineBox()); |
322 | 322 |
323 Destroy(); | 323 Destroy(); |
324 } | 324 } |
325 | 325 |
326 LayoutUnit LayoutMultiColumnFlowThread::MaxColumnLogicalHeight() const { | 326 LayoutUnit LayoutMultiColumnFlowThread::MaxColumnLogicalHeight() const { |
327 if (column_height_available_) { | 327 if (column_height_available_) { |
(...skipping 1062 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1390 const { | 1390 const { |
1391 return MultiColumnLayoutState(last_set_worked_on_); | 1391 return MultiColumnLayoutState(last_set_worked_on_); |
1392 } | 1392 } |
1393 | 1393 |
1394 void LayoutMultiColumnFlowThread::RestoreMultiColumnLayoutState( | 1394 void LayoutMultiColumnFlowThread::RestoreMultiColumnLayoutState( |
1395 const MultiColumnLayoutState& state) { | 1395 const MultiColumnLayoutState& state) { |
1396 last_set_worked_on_ = state.ColumnSet(); | 1396 last_set_worked_on_ = state.ColumnSet(); |
1397 } | 1397 } |
1398 | 1398 |
1399 } // namespace blink | 1399 } // namespace blink |
OLD | NEW |