Changeset 167617 in webkit

Timestamp:

Apr 21, 2014 1:20:27 PM (10 years ago)

Author:

hyatt@apple.com

Message:

[New Multicolumn] Column set drawing under horizontal scrollbar.
​https://bugs.webkit.org/show_bug.cgi?id=131812.

Reviewed by Sam Weinig.

Source/WebCore:
Added fast/multicol/newmulticol/compare-with-old-impl/LeftToRight-tb.html.

• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::layoutBlock):
(WebCore::RenderBlockFlow::checkForPaginationLogicalHeightChange):

• rendering/RenderBlockFlow.h:

Pass in relayoutChildren as a reference boolean to checkForPaginationLogicalHeightChange.
The new columns need to be able to set it to true if the amount of available column
height ever changes, so that the RenderFlowThread and the sets get a layout call.

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::setColumnStylesFromPaginationMode):
Make sure that the pagination mode is set up with an auto column-fill specified. You
don't ever want to balance when you set a pagination mode on the RenderView.

LayoutTests:

• fast/multicol/newmulticol/compare-with-old-impl/LeftToRight-tb-expected.html: Added.
• fast/multicol/newmulticol/compare-with-old-impl/LeftToRight-tb.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/multicol/newmulticol/compare-with-old-impl/LeftToRight-tb-expected.html (added)
• LayoutTests/fast/multicol/newmulticol/compare-with-old-impl/LeftToRight-tb.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockFlow.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderBlockFlow.h (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-04-21  David Hyatt  <hyatt@apple.com>
+
+        [New Multicolumn] Column set drawing under horizontal scrollbar.
+        https://bugs.webkit.org/show_bug.cgi?id=131812.
+
+        Reviewed by Sam Weinig.
+
+        * fast/multicol/newmulticol/compare-with-old-impl/LeftToRight-tb-expected.html: Added.
+        * fast/multicol/newmulticol/compare-with-old-impl/LeftToRight-tb.html: Added.
+
 2014-04-21  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-21  David Hyatt  <hyatt@apple.com>
+
+        [New Multicolumn] Column set drawing under horizontal scrollbar.
+        https://bugs.webkit.org/show_bug.cgi?id=131812.
+
+        Reviewed by Sam Weinig.
+
+        Added fast/multicol/newmulticol/compare-with-old-impl/LeftToRight-tb.html.
+
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::layoutBlock):
+        (WebCore::RenderBlockFlow::checkForPaginationLogicalHeightChange):
+        * rendering/RenderBlockFlow.h:
+        Pass in relayoutChildren as a reference boolean to checkForPaginationLogicalHeightChange.
+        The new columns need to be able to set it to true if the amount of available column
+        height ever changes, so that the RenderFlowThread and the sets get a layout call.
+
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::setColumnStylesFromPaginationMode):
+        Make sure that the pagination mode is set up with an auto column-fill specified. You
+        don't ever want to balance when you set a pagination mode on the RenderView.
+
 2014-04-21  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -344 +344 @@
     bool pageLogicalHeightChanged = false;
     bool hasSpecifiedPageLogicalHeight = false;
-    checkForPaginationLogicalHeightChange(pageLogicalHeight, pageLogicalHeightChanged, hasSpecifiedPageLogicalHeight);
+    checkForPaginationLogicalHeightChange(relayoutChildren, pageLogicalHeight, pageLogicalHeightChanged, hasSpecifiedPageLogicalHeight);
 
     const RenderStyle& styleToUse = style();
@@ -3558 +3558 @@
 }
 
-void RenderBlockFlow::checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHeight, bool& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight)
+void RenderBlockFlow::checkForPaginationLogicalHeightChange(bool& relayoutChildren, LayoutUnit& pageLogicalHeight, bool& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight)
 {
     // If we don't use either of the two column implementations or a flow thread, then bail.
@@ -3569 +3569 @@
         computeLogicalHeight(LayoutUnit(), logicalTop(), computedValues);
         LayoutUnit columnHeight = computedValues.m_extent - borderAndPaddingLogicalHeight() - scrollbarLogicalHeight();
+        LayoutUnit oldHeightAvailable = flowThread->columnHeightAvailable();
         flowThread->setColumnHeightAvailable(std::max<LayoutUnit>(columnHeight, 0));
+        if (oldHeightAvailable != flowThread->columnHeightAvailable())
+            relayoutChildren = true;
     } else if (hasColumns()) {
         ColumnInfo* colInfo = columnInfo();

trunk/Source/WebCore/rendering/RenderBlockFlow.h

@@ -458 +458 @@
     virtual RenderObject* layoutSpecialExcludedChild(bool /*relayoutChildren*/);
 
-    void checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHeight, bool& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight);
+    void checkForPaginationLogicalHeightChange(bool& relayoutChildren, LayoutUnit& pageLogicalHeight, bool& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight);
     
     virtual void paintInlineChildren(PaintInfo&, const LayoutPoint&) override;

trunk/Source/WebCore/rendering/style/RenderStyle.cpp

@@ -1766 +1766 @@
     if (paginationMode == Pagination::Unpaginated)
         return;
-        
+    
+    setColumnFill(ColumnFillAuto);
+    
     switch (paginationMode) {
     case Pagination::LeftToRightPaginated: