Changeset 167602 in webkit

Timestamp:

Apr 21, 2014 12:05:23 PM (10 years ago)

Author:

hyatt@apple.com

Message:

Source/WebCore: [New Multicolumn] Column balancing is slow on float-multicol.html
​https://bugs.webkit.org/show_bug.cgi?id=131801

Reviewed by Enrica Casucci.

Added fast/multicol/tall-float.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::expandsToEncloseOverhangingFloats):
Make RenderFlowThreads expand to encompass floats. Also from Morten's patch for
Blink (#361551).

• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::computeOverflow):
Fix a bug where the new multi-column code was adding in overflow for floats
when it should not. This was resulting in the creation of scrollbars when none
should exist. This is my own addition.

(WebCore::RenderBlockFlow::addOverhangingFloats):
Make RenderFlowThreads and RenderRegions ignore overhanging float additions. This
comes from Morten's patch for Blink (#361551).

LayoutTests: http/tests/cache/subresource-failover-to-network.html is flaky
​https://bugs.webkit.org/show_bug.cgi?id=131936

Patch by Alexey Proskuryakov <​ap@apple.com> on 2014-04-21
Reviewed by Brady Eidson.

The test was racy, because it was unintentionally queuing TestRunner operations
twice. Also, it failed to clean up its cookie.

Rewrote to not use TestRunner queuing, making the test work in browser.

• http/tests/cache/resources/subresource-failover-to-network.cgi:
• http/tests/cache/subresource-failover-to-network.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/multicol/tall-float-expected.html (added)
• LayoutTests/fast/multicol/tall-float.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockFlow.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ -13 +13 @@
         * http/tests/cache/resources/subresource-failover-to-network.cgi:
         * http/tests/cache/subresource-failover-to-network.html:
+
+2014-04-21  David Hyatt  <hyatt@apple.com>
+
+        [New Multicolumn] Column balancing is slow on float-multicol.html
+        https://bugs.webkit.org/show_bug.cgi?id=131801
+
+        Reviewed by Enrica Casucci.
+
+        * fast/multicol/tall-float-expected.html: Added.
+        * fast/multicol/tall-float.html: Added.
 
 2014-04-21  David Hyatt  <hyatt@apple.com>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-21  David Hyatt  <hyatt@apple.com>
+
+        [New Multicolumn] Column balancing is slow on float-multicol.html
+        https://bugs.webkit.org/show_bug.cgi?id=131801
+
+        Reviewed by Enrica Casucci.
+
+        Added fast/multicol/tall-float.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::expandsToEncloseOverhangingFloats):
+        Make RenderFlowThreads expand to encompass floats. Also from Morten's patch for
+        Blink (#361551).
+
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::computeOverflow):
+        Fix a bug where the new multi-column code was adding in overflow for floats
+        when it should not. This was resulting in the creation of scrollbars when none
+        should exist. This is my own addition.
+
+        (WebCore::RenderBlockFlow::addOverhangingFloats):
+        Make RenderFlowThreads and RenderRegions ignore overhanging float additions. This
+        comes from Morten's patch for Blink (#361551).
+
 2014-04-21  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -1473 +1473 @@
 {
     return isInlineBlockOrInlineTable() || isFloatingOrOutOfFlowPositioned() || hasOverflowClip() || (parent() && parent()->isFlexibleBoxIncludingDeprecated())
-           || hasColumns() || isTableCell() || isTableCaption() || isFieldset() || isWritingModeRoot() || isRoot();
-}
-
+        || hasColumns() || isTableCell() || isTableCaption() || isFieldset() || isWritingModeRoot() || isRoot() || isRenderFlowThread();
+}
 
 LayoutUnit RenderBlock::computeStartPositionDeltaForChildAvoidingFloats(const RenderBox& child, LayoutUnit childMarginStart, RenderRegion* region)

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -1968 +1968 @@
     RenderBlock::computeOverflow(oldClientAfterEdge, recomputeFloats);
 
-    if (!hasColumns() && (recomputeFloats || isRoot() || expandsToEncloseOverhangingFloats() || hasSelfPaintingLayer()))
+    if (!hasColumns() && !multiColumnFlowThread() && (recomputeFloats || isRoot() || expandsToEncloseOverhangingFloats() || hasSelfPaintingLayer()))
         addOverflowFromFloats();
 }
@@ -2423 +2423 @@
 {
     // Prevent floats from being added to the canvas by the root element, e.g., <html>.
-    if (child.hasOverflowClip() || !child.containsFloats() || child.isRoot() || child.hasColumns() || child.isWritingModeRoot())
+    if (child.hasOverflowClip() || !child.containsFloats() || child.isRoot() || child.hasColumns() || child.isWritingModeRoot() || child.isRenderFlowThread() || child.isRenderRegion())
         return 0;