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

Side by Side Diff: Source/core/layout/MultiColumnFragmentainerGroup.h

Issue 1266553002: Include overflow when setting the logical flowthread bottom on the last column set. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef MultiColumnFragmentainerGroup_h 5 #ifndef MultiColumnFragmentainerGroup_h
6 #define MultiColumnFragmentainerGroup_h 6 #define MultiColumnFragmentainerGroup_h
7 7
8 #include "core/layout/LayoutMultiColumnFlowThread.h" 8 #include "core/layout/LayoutMultiColumnFlowThread.h"
9 9
10 namespace blink { 10 namespace blink {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 // The height of our flow thread portion 49 // The height of our flow thread portion
50 LayoutUnit logicalHeightInFlowThread() const { return m_logicalBottomInFlowT hread - m_logicalTopInFlowThread; } 50 LayoutUnit logicalHeightInFlowThread() const { return m_logicalBottomInFlowT hread - m_logicalTopInFlowThread; }
51 51
52 bool heightIsAuto() const; 52 bool heightIsAuto() const;
53 void resetColumnHeight(); 53 void resetColumnHeight();
54 void addContentRun(LayoutUnit endOffsetInFlowThread); 54 void addContentRun(LayoutUnit endOffsetInFlowThread);
55 void updateMinimumColumnHeight(LayoutUnit height) { m_minimumColumnHeight = std::max(height, m_minimumColumnHeight); } 55 void updateMinimumColumnHeight(LayoutUnit height) { m_minimumColumnHeight = std::max(height, m_minimumColumnHeight); }
56 void recordSpaceShortage(LayoutUnit); 56 void recordSpaceShortage(LayoutUnit);
57 bool recalculateColumnHeight(BalancedColumnHeightCalculation calculationMode ); 57 bool recalculateColumnHeight(BalancedColumnHeightCalculation calculationMode );
58 58
59 void expandToEncompassFlowThreadOverflow();
60
61 LayoutSize flowThreadTranslationAtOffset(LayoutUnit offsetInFlowThread) cons t; 59 LayoutSize flowThreadTranslationAtOffset(LayoutUnit offsetInFlowThread) cons t;
62 LayoutUnit columnLogicalTopForOffset(LayoutUnit offsetInFlowThread) const; 60 LayoutUnit columnLogicalTopForOffset(LayoutUnit offsetInFlowThread) const;
63 LayoutPoint visualPointToFlowThreadPoint(const LayoutPoint& visualPoint) con st; 61 LayoutPoint visualPointToFlowThreadPoint(const LayoutPoint& visualPoint) con st;
64 void collectLayerFragments(DeprecatedPaintLayerFragments&, const LayoutRect& layerBoundingBox, const LayoutRect& dirtyRect) const; 62 void collectLayerFragments(DeprecatedPaintLayerFragments&, const LayoutRect& layerBoundingBox, const LayoutRect& dirtyRect) const;
65 LayoutRect calculateOverflow() const; 63 LayoutRect calculateOverflow() const;
66 64
67 // The "CSS actual" value of column-count. This includes overflowing columns , if any. 65 // The "CSS actual" value of column-count. This includes overflowing columns , if any.
68 unsigned actualColumnCount() const; 66 unsigned actualColumnCount() const;
69 67
70 private: 68 private:
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 174
177 private: 175 private:
178 LayoutMultiColumnSet& m_columnSet; 176 LayoutMultiColumnSet& m_columnSet;
179 177
180 Vector<MultiColumnFragmentainerGroup, 1> m_groups; 178 Vector<MultiColumnFragmentainerGroup, 1> m_groups;
181 }; 179 };
182 180
183 } // namespace blink 181 } // namespace blink
184 182
185 #endif // MultiColumnFragmentainerGroup_h 183 #endif // MultiColumnFragmentainerGroup_h
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutMultiColumnSet.cpp ('k') | Source/core/layout/MultiColumnFragmentainerGroup.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698