| Index: Source/core/rendering/RenderMultiColumnSet.h
|
| diff --git a/Source/core/rendering/RenderMultiColumnSet.h b/Source/core/rendering/RenderMultiColumnSet.h
|
| index a1f6eae2070b2e07fb69f558b03fc3cd8154ac16..f021512e990333ad417403edcb0931adf3b4e9b4 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; }
|
| @@ -110,6 +112,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;
|
| @@ -119,8 +122,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;
|
|
|
|
|