Changeset 143506 in webkit

Timestamp:

Feb 20, 2013 2:16:55 PM (11 years ago)

Author:

hyatt@apple.com

Message:

[New Multicolumn] Resize RenderMultiColumnSets around their columns.
​https://bugs.webkit.org/show_bug.cgi?id=110378.

Reviewed by Dirk Schulze.

Source/WebCore:

Test: fast/multicol/newmulticol/positioned-with-constrained-height.html.

• rendering/RenderBlock.h:

(RenderBlock):
Make computeOverflow public so that RenderMultiColumnFlowThread can
access it.

• rendering/RenderMultiColumnFlowThread.cpp:

(WebCore::RenderMultiColumnFlowThread::layout):
Subclass layout to recompute the overflow for RenderMultiColumnBlock
after the flow thread has finished layout. This way it can account
for changes in RenderMultiColumnSets without having to do a second
layout pass.

• rendering/RenderMultiColumnFlowThread.h:

(RenderMultiColumnFlowThread):
Override layout().

• rendering/RenderMultiColumnSet.cpp:

(WebCore::RenderMultiColumnSet::columnCount):
Clean up a comment that referred to portions as region rects still.

(WebCore::RenderMultiColumnSet::setFlowThreadPortionRect):

• rendering/RenderMultiColumnSet.h:
• rendering/RenderRegion.h:

(WebCore::RenderRegion::setFlowThreadPortionRect):
Make setFlowThreadPortionRect virtual and actually mutate the size
and position of RenderMultiColumnSets so that they enclose their
column rects.

LayoutTests:

• fast/multicol/newmulticol/positioned-with-constrained-height-expected.html: Added.
• fast/multicol/newmulticol/positioned-with-constrained-height.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/multicol/newmulticol/positioned-with-constrained-height-expected.html (added)
• LayoutTests/fast/multicol/newmulticol/positioned-with-constrained-height.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.h (modified) (1 diff)
• Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderMultiColumnFlowThread.h (modified) (1 diff)
• Source/WebCore/rendering/RenderMultiColumnSet.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderMultiColumnSet.h (modified) (1 diff)
• Source/WebCore/rendering/RenderRegion.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-20  David Hyatt  <hyatt@apple.com>
+
+        [New Multicolumn] Resize RenderMultiColumnSets around their columns.
+        https://bugs.webkit.org/show_bug.cgi?id=110378.
+
+        Reviewed by Dirk Schulze.
+
+        * fast/multicol/newmulticol/positioned-with-constrained-height-expected.html: Added.
+        * fast/multicol/newmulticol/positioned-with-constrained-height.html: Added.
+
 2013-02-20  Dirk Schulze  <krit@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-20  David Hyatt  <hyatt@apple.com>
+
+        [New Multicolumn] Resize RenderMultiColumnSets around their columns.
+        https://bugs.webkit.org/show_bug.cgi?id=110378.
+
+        Reviewed by Dirk Schulze.
+
+        Test: fast/multicol/newmulticol/positioned-with-constrained-height.html.
+
+        * rendering/RenderBlock.h:
+        (RenderBlock):
+        Make computeOverflow public so that RenderMultiColumnFlowThread can
+        access it.
+
+        * rendering/RenderMultiColumnFlowThread.cpp:
+        (WebCore::RenderMultiColumnFlowThread::layout):
+        Subclass layout to recompute the overflow for RenderMultiColumnBlock
+        after the flow thread has finished layout. This way it can account
+        for changes in RenderMultiColumnSets without having to do a second
+        layout pass.
+
+        * rendering/RenderMultiColumnFlowThread.h:
+        (RenderMultiColumnFlowThread):
+        Override layout().
+
+        * rendering/RenderMultiColumnSet.cpp:
+        (WebCore::RenderMultiColumnSet::columnCount):
+        Clean up a comment that referred to portions as region rects still.
+
+        (WebCore::RenderMultiColumnSet::setFlowThreadPortionRect):
+        * rendering/RenderMultiColumnSet.h:
+        * rendering/RenderRegion.h:
+        (WebCore::RenderRegion::setFlowThreadPortionRect):
+        Make setFlowThreadPortionRect virtual and actually mutate the size
+        and position of RenderMultiColumnSets so that they enclose their
+        column rects.
+
 2013-02-20  Dirk Schulze  <krit@webkit.org>
 

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -526 +526 @@
     void setDesiredColumnCountAndWidth(int, LayoutUnit);
 
+public:
     void computeOverflow(LayoutUnit oldClientAfterEdge, bool recomputeFloats = false);
+protected:
     virtual void addOverflowFromChildren();
     void addOverflowFromFloats();

trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp

@@ -27 +27 @@
 #include "RenderMultiColumnFlowThread.h"
 
+#include "RenderMultiColumnBlock.h"
+
 namespace WebCore {
 
@@ -50 +52 @@
 }
 
+void RenderMultiColumnFlowThread::layout()
+{
+    RenderFlowThread::layout();
+    
+    // Now that flow thread portions have been determined, we may have changed the dimensions of some of our multi-column sets.
+    // We need to make the RenderMultiColumnBlock recompute its overflow because some of these sets may be spilling out of the
+    // block.
+    RenderMultiColumnBlock* colBlock = toRenderMultiColumnBlock(parent());
+    if (!colBlock)
+        return;
+    colBlock->computeOverflow(colBlock->clientLogicalBottom());
 }
+
+}

trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h

@@ -39 +39 @@
 private:
     virtual const char* renderName() const OVERRIDE;
+    virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const OVERRIDE;
     
-    virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const OVERRIDE;
+    virtual void layout() OVERRIDE;
 };
 

trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp

@@ -32 +32 @@
 #include "RenderMultiColumnFlowThread.h"
 
-using std::min;
-using std::max;
+using namespace std;
 
 namespace WebCore {
@@ -112 +111 @@
         return 0;
     
-    // Our region rect determines our column count. We have as many columns as needed to fit all the content.
+    // Our portion rect determines our column count. We have as many columns as needed to fit all the content.
     LayoutUnit logicalHeightInColumns = flowThread()->isHorizontalWritingMode() ? flowThreadPortionRect().height() : flowThreadPortionRect().width();
     return ceil(static_cast<float>(logicalHeightInColumns) / computedColumnHeight());
@@ -211 +210 @@
 }
 
+void RenderMultiColumnSet::setFlowThreadPortionRect(const LayoutRect& rect)
+{
+    RenderRegion::setFlowThreadPortionRect(rect);
+    
+    // Mutate the dimensions of the column set once our flow portion is set if the flow portion has more columns
+    // than can fit inside our current dimensions.
+    unsigned colCount = columnCount();
+    if (!colCount)
+        return;
+    
+    LayoutUnit colGap = columnGap();
+    LayoutUnit minimumContentLogicalWidth = colCount * computedColumnWidth() + (colCount - 1) * colGap;
+    LayoutUnit currentContentLogicalWidth = contentLogicalWidth();
+    LayoutUnit delta = max(LayoutUnit(), minimumContentLogicalWidth - currentContentLogicalWidth);
+    if (!delta)
+        return;
+
+    // Increase our logical width by the delta.
+    setLogicalWidth(logicalWidth() + delta);
+    
+    // Shift our position left by the delta if we are RTL.
+    if (!style()->isLeftToRightDirection())
+        setLogicalLeft(logicalLeft() - delta);
+}
+
 void RenderMultiColumnSet::paintObject(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {

trunk/Source/WebCore/rendering/RenderMultiColumnSet.h

@@ -119 +119 @@
     LayoutRect flowThreadPortionRectAt(unsigned index) const;
     LayoutRect flowThreadPortionOverflowRect(const LayoutRect& flowThreadPortion, unsigned index, unsigned colCount, LayoutUnit colGap) const;
+    virtual void setFlowThreadPortionRect(const LayoutRect&) OVERRIDE;
     
     unsigned columnIndexAtOffset(LayoutUnit) const;

trunk/Source/WebCore/rendering/RenderRegion.h

@@ -51 +51 @@
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
 
-    void setFlowThreadPortionRect(const LayoutRect& rect) { m_flowThreadPortionRect = rect; }
+    virtual void setFlowThreadPortionRect(const LayoutRect& rect) { m_flowThreadPortionRect = rect; }
     LayoutRect flowThreadPortionRect() const { return m_flowThreadPortionRect; }
     LayoutRect flowThreadPortionOverflowRect() const;