Index: Source/core/rendering/RenderMultiColumnSet.h |
diff --git a/Source/core/rendering/RenderMultiColumnSet.h b/Source/core/rendering/RenderMultiColumnSet.h |
index 57b09aa1136649e8c7f6369f2307dd737150b68e..231728f626bf32f73802a6266c82e94d5dd8a61a 100644 |
--- a/Source/core/rendering/RenderMultiColumnSet.h |
+++ b/Source/core/rendering/RenderMultiColumnSet.h |
@@ -65,6 +65,8 @@ public: |
RenderMultiColumnSet* nextSiblingMultiColumnSet() const; |
+ LayoutUnit logicalHeightInFlowThread() const { return isHorizontalWritingMode() ? flowThreadPortionRect().height() : flowThreadPortionRect().width(); } |
+ |
unsigned computedColumnCount() const { return m_computedColumnCount; } |
LayoutUnit computedColumnWidth() const { return m_computedColumnWidth; } |
LayoutUnit computedColumnHeight() const { return m_computedColumnHeight; } |
@@ -106,6 +108,7 @@ public: |
private: |
RenderMultiColumnSet(RenderFlowThread*); |
+ virtual void layout() OVERRIDE; |
virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const OVERRIDE; |
virtual void paintObject(PaintInfo&, const LayoutPoint& paintOffset) OVERRIDE; |
@@ -115,8 +118,7 @@ private: |
virtual LayoutUnit pageLogicalTopForOffset(LayoutUnit offset) const OVERRIDE; |
- // FIXME: This will change once we have column sets constrained by enclosing pages, etc. |
- virtual LayoutUnit logicalHeightOfAllFlowThreadContent() const OVERRIDE { return m_computedColumnHeight; } |
+ virtual LayoutUnit logicalHeightOfAllFlowThreadContent() const OVERRIDE { return logicalHeightInFlowThread(); } |
virtual void repaintFlowThreadContent(const LayoutRect& repaintRect) const OVERRIDE; |