Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Side by Side Diff: Source/core/rendering/RenderMultiColumnSpannerPlaceholder.cpp

Issue 803213004: [New Multicolumn] Handle overflow inside spanners correctly. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: code review Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « LayoutTests/fast/multicol/span/overflow-on-viewport-expected.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "config.h" 5 #include "config.h"
6 #include "core/rendering/RenderMultiColumnSpannerPlaceholder.h" 6 #include "core/rendering/RenderMultiColumnSpannerPlaceholder.h"
7 7
8 namespace blink { 8 namespace blink {
9 9
10 RenderMultiColumnSpannerPlaceholder* RenderMultiColumnSpannerPlaceholder::create Anonymous(RenderStyle* parentStyle, RenderBox* rendererInFlowThread) 10 RenderMultiColumnSpannerPlaceholder* RenderMultiColumnSpannerPlaceholder::create Anonymous(RenderStyle* parentStyle, RenderBox* rendererInFlowThread)
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 { 48 {
49 ASSERT(needsLayout()); 49 ASSERT(needsLayout());
50 50
51 // Lay out the actual column-span:all element. 51 // Lay out the actual column-span:all element.
52 m_rendererInFlowThread->layoutIfNeeded(); 52 m_rendererInFlowThread->layoutIfNeeded();
53 53
54 // The spanner has now been laid out, so its height is known. Time to update the placeholder's 54 // The spanner has now been laid out, so its height is known. Time to update the placeholder's
55 // height as well, so that we take up the correct amount of space in the mul ticol container. 55 // height as well, so that we take up the correct amount of space in the mul ticol container.
56 updateLogicalHeight(); 56 updateLogicalHeight();
57 57
58 // Take the overflow from the spanner, so that it gets
59 // propagated to the multicol container and beyond.
60 m_overflow.clear();
61 addVisualOverflow(m_rendererInFlowThread->visualOverflowRect());
62 addLayoutOverflow(m_rendererInFlowThread->layoutOverflowRect());
63
58 clearNeedsLayout(); 64 clearNeedsLayout();
59 } 65 }
60 66
61 void RenderMultiColumnSpannerPlaceholder::computeLogicalHeight(LayoutUnit, Layou tUnit logicalTop, LogicalExtentComputedValues& computedValues) const 67 void RenderMultiColumnSpannerPlaceholder::computeLogicalHeight(LayoutUnit, Layou tUnit logicalTop, LogicalExtentComputedValues& computedValues) const
62 { 68 {
63 computedValues.m_extent = m_rendererInFlowThread->logicalHeight(); 69 computedValues.m_extent = m_rendererInFlowThread->logicalHeight();
64 computedValues.m_position = logicalTop; 70 computedValues.m_position = logicalTop;
65 } 71 }
66 72
67 void RenderMultiColumnSpannerPlaceholder::invalidateTreeIfNeeded(const PaintInva lidationState& paintInvalidationState) 73 void RenderMultiColumnSpannerPlaceholder::invalidateTreeIfNeeded(const PaintInva lidationState& paintInvalidationState)
(...skipping 13 matching lines...) Expand all
81 { 87 {
82 return !m_rendererInFlowThread->hasSelfPaintingLayer() && m_rendererInFlowTh read->nodeAtPoint(request, result, locationInContainer, accumulatedOffset, actio n); 88 return !m_rendererInFlowThread->hasSelfPaintingLayer() && m_rendererInFlowTh read->nodeAtPoint(request, result, locationInContainer, accumulatedOffset, actio n);
83 } 89 }
84 90
85 const char* RenderMultiColumnSpannerPlaceholder::renderName() const 91 const char* RenderMultiColumnSpannerPlaceholder::renderName() const
86 { 92 {
87 return "RenderMultiColumnSpannerPlaceholder"; 93 return "RenderMultiColumnSpannerPlaceholder";
88 } 94 }
89 95
90 } 96 }
OLDNEW
« no previous file with comments | « LayoutTests/fast/multicol/span/overflow-on-viewport-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698