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 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
388 if (!previousSet) | 388 if (!previousSet) |
389 break; | 389 break; |
390 columnSet = previousSet; | 390 columnSet = previousSet; |
391 } | 391 } |
392 return columnSet; | 392 return columnSet; |
393 } | 393 } |
394 | 394 |
395 ASSERT(!m_columnSetsInvalidated); | 395 ASSERT(!m_columnSetsInvalidated); |
396 if (m_multiColumnSetList.isEmpty()) | 396 if (m_multiColumnSetList.isEmpty()) |
397 return nullptr; | 397 return nullptr; |
398 if (offset <= 0) | 398 if (offset < LayoutUnit()) |
399 return m_multiColumnSetList.first(); | 399 return m_multiColumnSetList.first(); |
400 | 400 |
401 MultiColumnSetSearchAdapter adapter(offset); | 401 MultiColumnSetSearchAdapter adapter(offset); |
402 m_multiColumnSetIntervalTree.allOverlapsWithAdapter<MultiColumnSetSearchAdap
ter>(adapter); | 402 m_multiColumnSetIntervalTree.allOverlapsWithAdapter<MultiColumnSetSearchAdap
ter>(adapter); |
403 | 403 |
404 // If no set was found, the offset is in the flow thread overflow. | 404 // If no set was found, the offset is in the flow thread overflow. |
405 if (!adapter.result() && !m_multiColumnSetList.isEmpty()) | 405 if (!adapter.result() && !m_multiColumnSetList.isEmpty()) |
406 return m_multiColumnSetList.last(); | 406 return m_multiColumnSetList.last(); |
407 return adapter.result(); | 407 return adapter.result(); |
408 } | 408 } |
(...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1051 { | 1051 { |
1052 return MultiColumnLayoutState(m_lastSetWorkedOn); | 1052 return MultiColumnLayoutState(m_lastSetWorkedOn); |
1053 } | 1053 } |
1054 | 1054 |
1055 void LayoutMultiColumnFlowThread::restoreMultiColumnLayoutState(const MultiColum
nLayoutState& state) | 1055 void LayoutMultiColumnFlowThread::restoreMultiColumnLayoutState(const MultiColum
nLayoutState& state) |
1056 { | 1056 { |
1057 m_lastSetWorkedOn = state.columnSet(); | 1057 m_lastSetWorkedOn = state.columnSet(); |
1058 } | 1058 } |
1059 | 1059 |
1060 } // namespace blink | 1060 } // namespace blink |
OLD | NEW |