third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h - Issue 1424913003: Don't set bogus height on new fragmentainer groups initially.

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

Issue 1424913003: Don't set bogus height on new fragmentainer groups initially. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase master Created 5 years, 1 month 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 | « third_party/WebKit/LayoutTests/fast/multicol/three-inner-rows-expected.txt ('k') | third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 #include "wtf/Allocator.h"	9 #include "wtf/Allocator.h"

10	10

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
52 LayoutUnit logicalTopInFlowThread() const { return m_logicalTopInFlowThread; }	52 LayoutUnit logicalTopInFlowThread() const { return m_logicalTopInFlowThread; }

53 void setLogicalTopInFlowThread(LayoutUnit logicalTopInFlowThread) { m_logica lTopInFlowThread = logicalTopInFlowThread; }	53 void setLogicalTopInFlowThread(LayoutUnit logicalTopInFlowThread) { m_logica lTopInFlowThread = logicalTopInFlowThread; }

54	54

55 // The bottom of our flow thread portion	55 // The bottom of our flow thread portion

56 LayoutUnit logicalBottomInFlowThread() const { return m_logicalBottomInFlowT hread; }	56 LayoutUnit logicalBottomInFlowThread() const { return m_logicalBottomInFlowT hread; }

57 void setLogicalBottomInFlowThread(LayoutUnit logicalBottomInFlowThread) { AS SERT(logicalBottomInFlowThread >= m_logicalTopInFlowThread); m_logicalBottomInFl owThread = logicalBottomInFlowThread; }	57 void setLogicalBottomInFlowThread(LayoutUnit logicalBottomInFlowThread) { AS SERT(logicalBottomInFlowThread >= m_logicalTopInFlowThread); m_logicalBottomInFl owThread = logicalBottomInFlowThread; }

58	58

59 // The height of our flow thread portion	59 // The height of our flow thread portion

60 LayoutUnit logicalHeightInFlowThread() const { return m_logicalBottomInFlowT hread - m_logicalTopInFlowThread; }	60 LayoutUnit logicalHeightInFlowThread() const { return m_logicalBottomInFlowT hread - m_logicalTopInFlowThread; }

61	61

62 bool heightIsAuto() const;

63 void resetColumnHeight();	62 void resetColumnHeight();

64 bool recalculateColumnHeight(BalancedColumnHeightCalculation calculationMode );	63 bool recalculateColumnHeight(BalancedColumnHeightCalculation calculationMode );

65	64

66 LayoutSize flowThreadTranslationAtOffset(LayoutUnit offsetInFlowThread) cons t;	65 LayoutSize flowThreadTranslationAtOffset(LayoutUnit offsetInFlowThread) cons t;

67 LayoutUnit columnLogicalTopForOffset(LayoutUnit offsetInFlowThread) const;	66 LayoutUnit columnLogicalTopForOffset(LayoutUnit offsetInFlowThread) const;

68 LayoutPoint visualPointToFlowThreadPoint(const LayoutPoint& visualPoint) con st;	67 LayoutPoint visualPointToFlowThreadPoint(const LayoutPoint& visualPoint) con st;

69 LayoutRect fragmentsBoundingBox(const LayoutRect& boundingBoxInFlowThread) c onst;	68 LayoutRect fragmentsBoundingBox(const LayoutRect& boundingBoxInFlowThread) c onst;

70	69

71 void collectLayerFragments(PaintLayerFragments&, const LayoutRect& layerBoun dingBox, const LayoutRect& dirtyRect) const;	70 void collectLayerFragments(PaintLayerFragments&, const LayoutRect& layerBoun dingBox, const LayoutRect& dirtyRect) const;

72 LayoutRect calculateOverflow() const;	71 LayoutRect calculateOverflow() const;

(...skipping 79 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
152	151

153 private:	152 private:

154 LayoutMultiColumnSet& m_columnSet;	153 LayoutMultiColumnSet& m_columnSet;

155	154

156 Vector<MultiColumnFragmentainerGroup, 1> m_groups;	155 Vector<MultiColumnFragmentainerGroup, 1> m_groups;

157 };	156 };

158	157

159 } // namespace blink	158 } // namespace blink

160	159

161 #endif // MultiColumnFragmentainerGroup_h	160 #endif // MultiColumnFragmentainerGroup_h

OLD	NEW