| 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 |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "core/rendering/RenderMultiColumnSet.h" | 27 #include "core/rendering/RenderMultiColumnSet.h" |
| 28 | 28 |
| 29 #include "core/paint/BoxPainter.h" | |
| 30 #include "core/paint/MultiColumnSetPainter.h" | 29 #include "core/paint/MultiColumnSetPainter.h" |
| 31 #include "core/paint/ObjectPainter.h" | |
| 32 #include "core/rendering/PaintInfo.h" | |
| 33 #include "core/rendering/RenderLayer.h" | |
| 34 #include "core/rendering/RenderMultiColumnFlowThread.h" | 30 #include "core/rendering/RenderMultiColumnFlowThread.h" |
| 35 | 31 |
| 36 namespace blink { | 32 namespace blink { |
| 37 | 33 |
| 38 RenderMultiColumnSet::RenderMultiColumnSet(RenderFlowThread* flowThread) | 34 RenderMultiColumnSet::RenderMultiColumnSet(RenderFlowThread* flowThread) |
| 39 : RenderRegion(0, flowThread) | 35 : RenderRegion(0, flowThread) |
| 40 , m_columnHeight(0) | 36 , m_columnHeight(0) |
| 41 , m_maxColumnHeight(RenderFlowThread::maxLogicalHeight()) | 37 , m_maxColumnHeight(RenderFlowThread::maxLogicalHeight()) |
| 42 , m_minSpaceShortage(RenderFlowThread::maxLogicalHeight()) | 38 , m_minSpaceShortage(RenderFlowThread::maxLogicalHeight()) |
| 43 , m_minimumColumnHeight(0) | 39 , m_minimumColumnHeight(0) |
| (...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 628 | 624 |
| 629 void RenderMultiColumnSet::detachRegion() | 625 void RenderMultiColumnSet::detachRegion() |
| 630 { | 626 { |
| 631 if (m_flowThread) { | 627 if (m_flowThread) { |
| 632 m_flowThread->removeRegionFromThread(this); | 628 m_flowThread->removeRegionFromThread(this); |
| 633 m_flowThread = 0; | 629 m_flowThread = 0; |
| 634 } | 630 } |
| 635 } | 631 } |
| 636 | 632 |
| 637 } | 633 } |
| OLD | NEW |