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

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

Issue 1241703005: Make sure that no column rows get negative flow thread portion heights. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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 26 matching lines...) Expand all
37 LayoutUnit logicalHeight() const { return m_columnHeight; } 37 LayoutUnit logicalHeight() const { return m_columnHeight; }
38 38
39 LayoutSize offsetFromColumnSet() const; 39 LayoutSize offsetFromColumnSet() const;
40 40
41 // The top of our flow thread portion 41 // The top of our flow thread portion
42 LayoutUnit logicalTopInFlowThread() const { return m_logicalTopInFlowThread; } 42 LayoutUnit logicalTopInFlowThread() const { return m_logicalTopInFlowThread; }
43 void setLogicalTopInFlowThread(LayoutUnit logicalTopInFlowThread) { m_logica lTopInFlowThread = logicalTopInFlowThread; } 43 void setLogicalTopInFlowThread(LayoutUnit logicalTopInFlowThread) { m_logica lTopInFlowThread = logicalTopInFlowThread; }
44 44
45 // The bottom of our flow thread portion 45 // The bottom of our flow thread portion
46 LayoutUnit logicalBottomInFlowThread() const { return m_logicalBottomInFlowT hread; } 46 LayoutUnit logicalBottomInFlowThread() const { return m_logicalBottomInFlowT hread; }
47 void setLogicalBottomInFlowThread(LayoutUnit logicalBottomInFlowThread) { m_ logicalBottomInFlowThread = logicalBottomInFlowThread; } 47 void setLogicalBottomInFlowThread(LayoutUnit logicalBottomInFlowThread) { AS SERT(logicalBottomInFlowThread >= m_logicalTopInFlowThread); m_logicalBottomInFl owThread = logicalBottomInFlowThread; }
48 48
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 );
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 173
174 private: 174 private:
175 LayoutMultiColumnSet& m_columnSet; 175 LayoutMultiColumnSet& m_columnSet;
176 176
177 Vector<MultiColumnFragmentainerGroup, 1> m_groups; 177 Vector<MultiColumnFragmentainerGroup, 1> m_groups;
178 }; 178 };
179 179
180 } // namespace blink 180 } // namespace blink
181 181
182 #endif // MultiColumnFragmentainerGroup_h 182 #endif // MultiColumnFragmentainerGroup_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698