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

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

Issue 879483002: [New Multicolumn] Intrinsic/preferred logical width calculation for spanners. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: final 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 | « Source/core/rendering/RenderMultiColumnSpannerPlaceholder.h ('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 static void copyMarginProperties(RenderStyle* placeholderStyle, const RenderStyl e* spannerStyle) 10 static void copyMarginProperties(RenderStyle* placeholderStyle, const RenderStyl e* spannerStyle)
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 if (m_rendererInFlowThread) 46 if (m_rendererInFlowThread)
47 m_rendererInFlowThread->clearSpannerPlaceholder(); 47 m_rendererInFlowThread->clearSpannerPlaceholder();
48 RenderBox::willBeRemovedFromTree(); 48 RenderBox::willBeRemovedFromTree();
49 } 49 }
50 50
51 bool RenderMultiColumnSpannerPlaceholder::needsPreferredWidthsRecalculation() co nst 51 bool RenderMultiColumnSpannerPlaceholder::needsPreferredWidthsRecalculation() co nst
52 { 52 {
53 return m_rendererInFlowThread->needsPreferredWidthsRecalculation(); 53 return m_rendererInFlowThread->needsPreferredWidthsRecalculation();
54 } 54 }
55 55
56 LayoutUnit RenderMultiColumnSpannerPlaceholder::minPreferredLogicalWidth() const
57 {
58 return m_rendererInFlowThread->minPreferredLogicalWidth();
59 }
60
61 LayoutUnit RenderMultiColumnSpannerPlaceholder::maxPreferredLogicalWidth() const
62 {
63 return m_rendererInFlowThread->maxPreferredLogicalWidth();
64 }
65
56 void RenderMultiColumnSpannerPlaceholder::layout() 66 void RenderMultiColumnSpannerPlaceholder::layout()
57 { 67 {
58 ASSERT(needsLayout()); 68 ASSERT(needsLayout());
59 69
60 // Lay out the actual column-span:all element. 70 // Lay out the actual column-span:all element.
61 m_rendererInFlowThread->layoutIfNeeded(); 71 m_rendererInFlowThread->layoutIfNeeded();
62 72
63 // The spanner has now been laid out, so its height is known. Time to update the placeholder's 73 // The spanner has now been laid out, so its height is known. Time to update the placeholder's
64 // height as well, so that we take up the correct amount of space in the mul ticol container. 74 // height as well, so that we take up the correct amount of space in the mul ticol container.
65 updateLogicalHeight(); 75 updateLogicalHeight();
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 { 108 {
99 return !m_rendererInFlowThread->hasSelfPaintingLayer() && m_rendererInFlowTh read->nodeAtPoint(request, result, locationInContainer, accumulatedOffset, actio n); 109 return !m_rendererInFlowThread->hasSelfPaintingLayer() && m_rendererInFlowTh read->nodeAtPoint(request, result, locationInContainer, accumulatedOffset, actio n);
100 } 110 }
101 111
102 const char* RenderMultiColumnSpannerPlaceholder::renderName() const 112 const char* RenderMultiColumnSpannerPlaceholder::renderName() const
103 { 113 {
104 return "RenderMultiColumnSpannerPlaceholder"; 114 return "RenderMultiColumnSpannerPlaceholder";
105 } 115 }
106 116
107 } 117 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderMultiColumnSpannerPlaceholder.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698