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" | 29 #include "core/paint/BoxPainter.h" |
| 30 #include "core/paint/ObjectPainter.h" |
30 #include "core/rendering/PaintInfo.h" | 31 #include "core/rendering/PaintInfo.h" |
31 #include "core/rendering/RenderLayer.h" | 32 #include "core/rendering/RenderLayer.h" |
32 #include "core/rendering/RenderMultiColumnFlowThread.h" | 33 #include "core/rendering/RenderMultiColumnFlowThread.h" |
33 | 34 |
34 namespace blink { | 35 namespace blink { |
35 | 36 |
36 RenderMultiColumnSet::RenderMultiColumnSet(RenderFlowThread* flowThread) | 37 RenderMultiColumnSet::RenderMultiColumnSet(RenderFlowThread* flowThread) |
37 : RenderRegion(0, flowThread) | 38 : RenderRegion(0, flowThread) |
38 , m_columnHeight(0) | 39 , m_columnHeight(0) |
39 , m_maxColumnHeight(RenderFlowThread::maxLogicalHeight()) | 40 , m_maxColumnHeight(RenderFlowThread::maxLogicalHeight()) |
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
476 currLogicalLeftOffset -= (inlineDirectionSize + colGap); | 477 currLogicalLeftOffset -= (inlineDirectionSize + colGap); |
477 } | 478 } |
478 | 479 |
479 // Now paint the column rule. | 480 // Now paint the column rule. |
480 if (i < colCount - 1) { | 481 if (i < colCount - 1) { |
481 LayoutUnit ruleLeft = isHorizontalWritingMode() ? paintOffset.x() +
ruleLogicalLeft - ruleThickness / 2 + ruleAdd : paintOffset.x() + borderLeft() +
paddingLeft(); | 482 LayoutUnit ruleLeft = isHorizontalWritingMode() ? paintOffset.x() +
ruleLogicalLeft - ruleThickness / 2 + ruleAdd : paintOffset.x() + borderLeft() +
paddingLeft(); |
482 LayoutUnit ruleRight = isHorizontalWritingMode() ? ruleLeft + ruleTh
ickness : ruleLeft + contentWidth(); | 483 LayoutUnit ruleRight = isHorizontalWritingMode() ? ruleLeft + ruleTh
ickness : ruleLeft + contentWidth(); |
483 LayoutUnit ruleTop = isHorizontalWritingMode() ? paintOffset.y() + b
orderTop() + paddingTop() : paintOffset.y() + ruleLogicalLeft - ruleThickness /
2 + ruleAdd; | 484 LayoutUnit ruleTop = isHorizontalWritingMode() ? paintOffset.y() + b
orderTop() + paddingTop() : paintOffset.y() + ruleLogicalLeft - ruleThickness /
2 + ruleAdd; |
484 LayoutUnit ruleBottom = isHorizontalWritingMode() ? ruleTop + conten
tHeight() : ruleTop + ruleThickness; | 485 LayoutUnit ruleBottom = isHorizontalWritingMode() ? ruleTop + conten
tHeight() : ruleTop + ruleThickness; |
485 IntRect pixelSnappedRuleRect = pixelSnappedIntRectFromEdges(ruleLeft
, ruleTop, ruleRight, ruleBottom); | 486 IntRect pixelSnappedRuleRect = pixelSnappedIntRectFromEdges(ruleLeft
, ruleTop, ruleRight, ruleBottom); |
486 drawLineForBoxSide(paintInfo.context, pixelSnappedRuleRect.x(), pixe
lSnappedRuleRect.y(), pixelSnappedRuleRect.maxX(), pixelSnappedRuleRect.maxY(),
boxSide, ruleColor, ruleStyle, 0, 0, antialias); | 487 ObjectPainter::drawLineForBoxSide(paintInfo.context, pixelSnappedRul
eRect.x(), pixelSnappedRuleRect.y(), pixelSnappedRuleRect.maxX(), pixelSnappedRu
leRect.maxY(), boxSide, ruleColor, ruleStyle, 0, 0, antialias); |
487 } | 488 } |
488 | 489 |
489 ruleLogicalLeft = currLogicalLeftOffset; | 490 ruleLogicalLeft = currLogicalLeftOffset; |
490 } | 491 } |
491 } | 492 } |
492 | 493 |
493 void RenderMultiColumnSet::paintInvalidationForFlowThreadContent(const LayoutRec
t& paintInvalidationRect) const | 494 void RenderMultiColumnSet::paintInvalidationForFlowThreadContent(const LayoutRec
t& paintInvalidationRect) const |
494 { | 495 { |
495 // Figure out the start and end columns and only check within that range so
that we don't walk the | 496 // Figure out the start and end columns and only check within that range so
that we don't walk the |
496 // entire column set. Put the paint invalidation rect into flow thread coord
inates by flipping it first. | 497 // entire column set. Put the paint invalidation rect into flow thread coord
inates by flipping it first. |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
685 | 686 |
686 void RenderMultiColumnSet::detachRegion() | 687 void RenderMultiColumnSet::detachRegion() |
687 { | 688 { |
688 if (m_flowThread) { | 689 if (m_flowThread) { |
689 m_flowThread->removeRegionFromThread(this); | 690 m_flowThread->removeRegionFromThread(this); |
690 m_flowThread = 0; | 691 m_flowThread = 0; |
691 } | 692 } |
692 } | 693 } |
693 | 694 |
694 } | 695 } |
OLD | NEW |