| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h" | 5 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h" |
| 6 | 6 |
| 7 namespace blink { | 7 namespace blink { |
| 8 | 8 |
| 9 static void copyMarginProperties(ComputedStyle& placeholderStyle, const Computed
Style& spannerStyle) | 9 static void copyMarginProperties(ComputedStyle& placeholderStyle, const Computed
Style& spannerStyle) |
| 10 { | 10 { |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 | 105 |
| 106 // Lay out the actual column-span:all element. | 106 // Lay out the actual column-span:all element. |
| 107 m_layoutObjectInFlowThread->layoutIfNeeded(); | 107 m_layoutObjectInFlowThread->layoutIfNeeded(); |
| 108 | 108 |
| 109 // The spanner has now been laid out, so its height is known. Time to update
the placeholder's | 109 // The spanner has now been laid out, so its height is known. Time to update
the placeholder's |
| 110 // height as well, so that we take up the correct amount of space in the mul
ticol container. | 110 // height as well, so that we take up the correct amount of space in the mul
ticol container. |
| 111 updateLogicalHeight(); | 111 updateLogicalHeight(); |
| 112 | 112 |
| 113 // Take the overflow from the spanner, so that it gets | 113 // Take the overflow from the spanner, so that it gets |
| 114 // propagated to the multicol container and beyond. | 114 // propagated to the multicol container and beyond. |
| 115 m_overflow.clear(); | 115 m_overflow.reset(); |
| 116 addContentsVisualOverflow(m_layoutObjectInFlowThread->visualOverflowRect()); | 116 addContentsVisualOverflow(m_layoutObjectInFlowThread->visualOverflowRect()); |
| 117 addLayoutOverflow(m_layoutObjectInFlowThread->layoutOverflowRect()); | 117 addLayoutOverflow(m_layoutObjectInFlowThread->layoutOverflowRect()); |
| 118 | 118 |
| 119 clearNeedsLayout(); | 119 clearNeedsLayout(); |
| 120 } | 120 } |
| 121 | 121 |
| 122 void LayoutMultiColumnSpannerPlaceholder::computeLogicalHeight(LayoutUnit, Layou
tUnit logicalTop, LogicalExtentComputedValues& computedValues) const | 122 void LayoutMultiColumnSpannerPlaceholder::computeLogicalHeight(LayoutUnit, Layou
tUnit logicalTop, LogicalExtentComputedValues& computedValues) const |
| 123 { | 123 { |
| 124 computedValues.m_extent = m_layoutObjectInFlowThread->logicalHeight(); | 124 computedValues.m_extent = m_layoutObjectInFlowThread->logicalHeight(); |
| 125 computedValues.m_position = logicalTop; | 125 computedValues.m_position = logicalTop; |
| (...skipping 12 matching lines...) Expand all Loading... |
| 138 if (!m_layoutObjectInFlowThread->hasSelfPaintingLayer()) | 138 if (!m_layoutObjectInFlowThread->hasSelfPaintingLayer()) |
| 139 m_layoutObjectInFlowThread->paint(paintInfo, paintOffset); | 139 m_layoutObjectInFlowThread->paint(paintInfo, paintOffset); |
| 140 } | 140 } |
| 141 | 141 |
| 142 bool LayoutMultiColumnSpannerPlaceholder::nodeAtPoint(HitTestResult& result, con
st HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, H
itTestAction action) | 142 bool LayoutMultiColumnSpannerPlaceholder::nodeAtPoint(HitTestResult& result, con
st HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, H
itTestAction action) |
| 143 { | 143 { |
| 144 return !m_layoutObjectInFlowThread->hasSelfPaintingLayer() && m_layoutObject
InFlowThread->nodeAtPoint(result, locationInContainer, accumulatedOffset, action
); | 144 return !m_layoutObjectInFlowThread->hasSelfPaintingLayer() && m_layoutObject
InFlowThread->nodeAtPoint(result, locationInContainer, accumulatedOffset, action
); |
| 145 } | 145 } |
| 146 | 146 |
| 147 } // namespace blink | 147 } // namespace blink |
| OLD | NEW |