| OLD | NEW | 
|    1 /* |    1 /* | 
|    2  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. |    2  * Copyright (C) 2011 Adobe Systems Incorporated. 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  * |    7  * | 
|    8  * 1. Redistributions of source code must retain the above |    8  * 1. Redistributions of source code must retain the above | 
|    9  *    copyright notice, this list of conditions and the following |    9  *    copyright notice, this list of conditions and the following | 
|   10  *    disclaimer. |   10  *    disclaimer. | 
|   11  * 2. Redistributions in binary form must reproduce the above |   11  * 2. Redistributions in binary form must reproduce the above | 
|   12  *    copyright notice, this list of conditions and the following |   12  *    copyright notice, this list of conditions and the following | 
|   13  *    disclaimer in the documentation and/or other materials |   13  *    disclaimer in the documentation and/or other materials | 
|   14  *    provided with the distribution. |   14  *    provided with the distribution. | 
|   15  * |   15  * | 
|   16  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER "AS IS" AND ANY |   16  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER "AS IS" AND ANY | 
|   17  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |   17  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 
|   18  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |   18  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 
|   19  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE |   19  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE | 
|   20  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, |   20  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, | 
|   21  * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |   21  * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 
|   22  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |   22  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 
|   23  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |   23  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
|   24  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR |   24  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR | 
|   25  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF |   25  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF | 
|   26  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |   26  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 
|   27  * SUCH DAMAGE. |   27  * SUCH DAMAGE. | 
|   28  */ |   28  */ | 
|   29  |   29  | 
|   30 #include "config.h" |  | 
|   31  |  | 
|   32 #include "core/layout/LayoutFlowThread.h" |   30 #include "core/layout/LayoutFlowThread.h" | 
|   33  |   31  | 
|   34 #include "core/layout/LayoutMultiColumnSet.h" |   32 #include "core/layout/LayoutMultiColumnSet.h" | 
|   35 #include "core/layout/LayoutView.h" |   33 #include "core/layout/LayoutView.h" | 
|   36  |   34  | 
|   37 namespace blink { |   35 namespace blink { | 
|   38  |   36  | 
|   39 LayoutFlowThread::LayoutFlowThread() |   37 LayoutFlowThread::LayoutFlowThread() | 
|   40     : LayoutBlockFlow(nullptr) |   38     : LayoutBlockFlow(nullptr) | 
|   41     , m_columnSetsInvalidated(false) |   39     , m_columnSetsInvalidated(false) | 
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  197  |  195  | 
|  198 void LayoutFlowThread::MultiColumnSetSearchAdapter::collectIfNeeded(const MultiC
     olumnSetInterval& interval) |  196 void LayoutFlowThread::MultiColumnSetSearchAdapter::collectIfNeeded(const MultiC
     olumnSetInterval& interval) | 
|  199 { |  197 { | 
|  200     if (m_result) |  198     if (m_result) | 
|  201         return; |  199         return; | 
|  202     if (interval.low() <= m_offset && interval.high() > m_offset) |  200     if (interval.low() <= m_offset && interval.high() > m_offset) | 
|  203         m_result = interval.data(); |  201         m_result = interval.data(); | 
|  204 } |  202 } | 
|  205  |  203  | 
|  206 } // namespace blink |  204 } // namespace blink | 
| OLD | NEW |