Source/core/rendering/RenderMultiColumnFlowThread.h - Issue 266973005: Remove RenderFlowThread::initialLogicalWidth().

Side by Side Diff: Source/core/rendering/RenderMultiColumnFlowThread.h

Issue 266973005: Remove RenderFlowThread::initialLogicalWidth(). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebase master Created 6 years, 7 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/RenderFlowThread.cpp ('k') | Source/core/rendering/RenderMultiColumnFlowThread.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2012 Apple Inc. All rights reserved.	2 * Copyright (C) 2012 Apple Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 75 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
86 bool computeColumnCountAndWidth();	86 bool computeColumnCountAndWidth();

87 bool recalculateColumnHeights();	87 bool recalculateColumnHeights();

88	88

89 private:	89 private:

90 RenderMultiColumnFlowThread();	90 RenderMultiColumnFlowThread();

91	91

92 virtual const char* renderName() const OVERRIDE;	92 virtual const char* renderName() const OVERRIDE;

93 virtual void addRegionToThread(RenderRegion*) OVERRIDE;	93 virtual void addRegionToThread(RenderRegion*) OVERRIDE;

94 virtual void willBeRemovedFromTree() OVERRIDE;	94 virtual void willBeRemovedFromTree() OVERRIDE;

95 virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logic alTop, LogicalExtentComputedValues&) const OVERRIDE;	95 virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logic alTop, LogicalExtentComputedValues&) const OVERRIDE;

96 virtual LayoutUnit initialLogicalWidth() const OVERRIDE;	96 virtual void updateLogicalWidth() OVERRIDE FINAL;

97 virtual void layout() OVERRIDE FINAL;	97 virtual void layout() OVERRIDE FINAL;

98 virtual void setPageBreak(LayoutUnit offset, LayoutUnit spaceShortage) OVERR IDE;	98 virtual void setPageBreak(LayoutUnit offset, LayoutUnit spaceShortage) OVERR IDE;

99 virtual void updateMinimumPageHeight(LayoutUnit offset, LayoutUnit minHeight ) OVERRIDE;	99 virtual void updateMinimumPageHeight(LayoutUnit offset, LayoutUnit minHeight ) OVERRIDE;

100 virtual RenderRegion* regionAtBlockOffset(LayoutUnit) const OVERRIDE;	100 virtual RenderRegion* regionAtBlockOffset(LayoutUnit) const OVERRIDE;

101 virtual bool addForcedRegionBreak(LayoutUnit, RenderObject* breakChild, bool isBefore, LayoutUnit* offsetBreakAdjustment = 0) OVERRIDE;	101 virtual bool addForcedRegionBreak(LayoutUnit, RenderObject* breakChild, bool isBefore, LayoutUnit* offsetBreakAdjustment = 0) OVERRIDE;

102 virtual bool isPageLogicalHeightKnown() const OVERRIDE;	102 virtual bool isPageLogicalHeightKnown() const OVERRIDE;

103	103

104 unsigned m_columnCount; // The used value of column-count	104 unsigned m_columnCount; // The used value of column-count

105 LayoutUnit m_columnWidth; // The used value of column-width	105 LayoutUnit m_columnWidth; // The used value of column-width

106 LayoutUnit m_columnHeightAvailable; // Total height available to columns, or 0 if auto.	106 LayoutUnit m_columnHeightAvailable; // Total height available to columns, or 0 if auto.

107 bool m_inBalancingPass; // Set when relayouting for column balancing.	107 bool m_inBalancingPass; // Set when relayouting for column balancing.

108 bool m_needsColumnHeightsRecalculation; // Set when we need to recalculate t he column set heights after layout.	108 bool m_needsColumnHeightsRecalculation; // Set when we need to recalculate t he column set heights after layout.

109 };	109 };

110	110

111 } // namespace WebCore	111 } // namespace WebCore

112	112

113 #endif // RenderMultiColumnFlowThread_h	113 #endif // RenderMultiColumnFlowThread_h

114	114

OLD	NEW