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

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

Issue 16943008: Column balancing support in the region based multicol implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 6 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/RenderFlowThread.h ('k') | Source/core/rendering/RenderMultiColumnBlock.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderMultiColumnBlock.h
diff --git a/Source/core/rendering/RenderMultiColumnBlock.h b/Source/core/rendering/RenderMultiColumnBlock.h
index 1dfaf232e9ed4f93b0dc4bc6064d9193b9c5cfeb..c4e3cdc4d310a44407907edfe5e2635eb1ef463c 100644
--- a/Source/core/rendering/RenderMultiColumnBlock.h
+++ b/Source/core/rendering/RenderMultiColumnBlock.h
@@ -37,15 +37,14 @@ class RenderMultiColumnBlock FINAL : public RenderBlock {
public:
RenderMultiColumnBlock(Element*);
- LayoutUnit columnHeight() const { return m_columnHeight; }
- void setColumnHeight(LayoutUnit columnHeight) { m_columnHeight = columnHeight; }
+ LayoutUnit columnHeightAvailable() const { return m_columnHeightAvailable; }
LayoutUnit columnWidth() const { return m_columnWidth; }
unsigned columnCount() const { return m_columnCount; }
RenderMultiColumnFlowThread* flowThread() const { return m_flowThread; }
- bool requiresBalancing() const { return m_requiresBalancing; }
+ bool requiresBalancing() const { return !m_columnHeightAvailable; }
private:
virtual bool isRenderMultiColumnBlock() const { return true; }
@@ -70,8 +69,8 @@ private:
unsigned m_columnCount; // The default column count/width that are based off our containing block width. These values represent only the default,
LayoutUnit m_columnWidth; // since a multi-column block that is split across variable width pages or regions will have different column counts and widths in each.
// These values will be cached (eventually) for multi-column blocks.
- LayoutUnit m_columnHeight; // The current column height.
- bool m_requiresBalancing; // Whether or not the block specified any kind of logical height. We have to balance by default if it didn't.
+ LayoutUnit m_columnHeightAvailable; // Total height available to columns, or 0 if auto.
+ bool m_inBalancingPass; // Set when relayouting for column balancing.
};
inline RenderMultiColumnBlock* toRenderMultiColumnBlock(RenderObject* object)
« no previous file with comments | « Source/core/rendering/RenderFlowThread.h ('k') | Source/core/rendering/RenderMultiColumnBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698