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

Unified Diff: Source/core/rendering/RenderMultiColumnFlowThread.h

Issue 792803002: [New Multicolumn] Layout support for column-span:all. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@347325-placeholder
Patch Set: Code review. If there are no sets, return early. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderLayer.cpp ('k') | Source/core/rendering/RenderMultiColumnFlowThread.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderMultiColumnFlowThread.h
diff --git a/Source/core/rendering/RenderMultiColumnFlowThread.h b/Source/core/rendering/RenderMultiColumnFlowThread.h
index 778325cd72897ef4782696a28c23443465a22701..6e26cf4d63eae310abf3d2dc174a370bf2d0cdea 100644
--- a/Source/core/rendering/RenderMultiColumnFlowThread.h
+++ b/Source/core/rendering/RenderMultiColumnFlowThread.h
@@ -137,7 +137,6 @@ public:
unsigned columnCount() const { return m_columnCount; }
LayoutUnit columnHeightAvailable() const { return m_columnHeightAvailable; }
void setColumnHeightAvailable(LayoutUnit available) { m_columnHeightAvailable = available; }
- virtual bool heightIsAuto() const { return !columnHeightAvailable() || multiColumnBlockFlow()->style()->columnFill() == ColumnFillBalance; }
bool progressionIsInline() const { return m_progressionIsInline; }
virtual LayoutSize columnOffset(const LayoutPoint&) const override final;
@@ -145,6 +144,8 @@ public:
// Do we need to set a new width and lay out?
virtual bool needsNewWidth() const;
+ virtual RenderMultiColumnSet* columnSetAtBlockOffset(LayoutUnit) const override final;
+
void layoutColumns(bool relayoutChildren, SubtreeLayoutScope&);
bool recalculateColumnHeights();
@@ -164,16 +165,21 @@ private:
virtual const char* renderName() const override;
virtual void addRegionToThread(RenderMultiColumnSet*) override;
virtual void willBeRemovedFromTree() override;
+ virtual LayoutUnit skipColumnSpanner(RenderBox*, LayoutUnit logicalTopInFlowThread) override;
virtual void flowThreadDescendantWasInserted(RenderObject*) override;
virtual void flowThreadDescendantWillBeRemoved(RenderObject*) override;
virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
virtual void updateLogicalWidth() override;
virtual void setPageBreak(LayoutUnit offset, LayoutUnit spaceShortage) override;
virtual void updateMinimumPageHeight(LayoutUnit offset, LayoutUnit minHeight) override;
- virtual RenderMultiColumnSet* columnSetAtBlockOffset(LayoutUnit) const override;
virtual bool addForcedRegionBreak(LayoutUnit, RenderObject* breakChild, bool isBefore, LayoutUnit* offsetBreakAdjustment = 0) override;
virtual bool isPageLogicalHeightKnown() const override;
+ // The last set we worked on. It's not to be used as the "current set". The concept of a
+ // "current set" is difficult, since layout may jump back and forth in the tree, due to wrong
+ // top location estimates (due to e.g. margin collapsing), and possibly for other reasons.
+ RenderMultiColumnSet* m_lastSetWorkedOn;
+
unsigned m_columnCount; // The used value of column-count
LayoutUnit m_columnHeightAvailable; // Total height available to columns, or 0 if auto.
bool m_inBalancingPass; // Set when relayouting for column balancing.
« no previous file with comments | « Source/core/rendering/RenderLayer.cpp ('k') | Source/core/rendering/RenderMultiColumnFlowThread.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698