| 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 446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 457 columnSet->previousSiblingMultiColumnSet(); | 457 columnSet->previousSiblingMultiColumnSet(); |
| 458 if (!previousSet) | 458 if (!previousSet) |
| 459 break; | 459 break; |
| 460 columnSet = previousSet; | 460 columnSet = previousSet; |
| 461 } | 461 } |
| 462 } else { | 462 } else { |
| 463 DCHECK(!m_columnSetsInvalidated); | 463 DCHECK(!m_columnSetsInvalidated); |
| 464 if (m_multiColumnSetList.isEmpty()) | 464 if (m_multiColumnSetList.isEmpty()) |
| 465 return nullptr; | 465 return nullptr; |
| 466 if (offset < LayoutUnit()) { | 466 if (offset < LayoutUnit()) { |
| 467 columnSet = m_multiColumnSetList.first(); | 467 columnSet = m_multiColumnSetList.front(); |
| 468 } else { | 468 } else { |
| 469 MultiColumnSetSearchAdapter adapter(offset); | 469 MultiColumnSetSearchAdapter adapter(offset); |
| 470 m_multiColumnSetIntervalTree | 470 m_multiColumnSetIntervalTree |
| 471 .allOverlapsWithAdapter<MultiColumnSetSearchAdapter>(adapter); | 471 .allOverlapsWithAdapter<MultiColumnSetSearchAdapter>(adapter); |
| 472 | 472 |
| 473 // If no set was found, the offset is in the flow thread overflow. | 473 // If no set was found, the offset is in the flow thread overflow. |
| 474 if (!adapter.result() && !m_multiColumnSetList.isEmpty()) | 474 if (!adapter.result() && !m_multiColumnSetList.isEmpty()) |
| 475 columnSet = m_multiColumnSetList.last(); | 475 columnSet = m_multiColumnSetList.last(); |
| 476 else | 476 else |
| 477 columnSet = adapter.result(); | 477 columnSet = adapter.result(); |
| (...skipping 891 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1369 const { | 1369 const { |
| 1370 return MultiColumnLayoutState(m_lastSetWorkedOn); | 1370 return MultiColumnLayoutState(m_lastSetWorkedOn); |
| 1371 } | 1371 } |
| 1372 | 1372 |
| 1373 void LayoutMultiColumnFlowThread::restoreMultiColumnLayoutState( | 1373 void LayoutMultiColumnFlowThread::restoreMultiColumnLayoutState( |
| 1374 const MultiColumnLayoutState& state) { | 1374 const MultiColumnLayoutState& state) { |
| 1375 m_lastSetWorkedOn = state.columnSet(); | 1375 m_lastSetWorkedOn = state.columnSet(); |
| 1376 } | 1376 } |
| 1377 | 1377 |
| 1378 } // namespace blink | 1378 } // namespace blink |
| OLD | NEW |