Changeset 214766 in webkit

Timestamp:

Apr 3, 2017 4:03:11 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r214126 - Disable per-region boxes for multicolumn
​https://bugs.webkit.org/show_bug.cgi?id=169830

Reviewed by Zalan Bujtas.

Source/WebCore:

Test: fast/multicol/float-adjacent-to-overflow-block.html

• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::determineLogicalLeftPositionForChild):

• rendering/RenderBox.cpp:

(WebCore::RenderBox::borderBoxRectInRegion):
(WebCore::RenderBox::renderBoxRegionInfo):
Limit all of the per-region box code to RenderNamedFlowThreads.
This code should never be used by multicolumn layout.

LayoutTests:

• fast/multicol/float-adjacent-to-overflow-block-expected.html: Added.
• fast/multicol/float-adjacent-to-overflow-block.html: Added.

Location:

releases/WebKitGTK/webkit-2.16

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/multicol/float-adjacent-to-overflow-block-expected.html (added)
• LayoutTests/fast/multicol/float-adjacent-to-overflow-block.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockFlow.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderBox.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog

@@ +1 @@
+2017-03-17  Dave Hyatt  <hyatt@apple.com>
+
+        Disable per-region boxes for multicolumn
+        https://bugs.webkit.org/show_bug.cgi?id=169830
+
+        Reviewed by Zalan Bujtas.
+
+        * fast/multicol/float-adjacent-to-overflow-block-expected.html: Added.
+        * fast/multicol/float-adjacent-to-overflow-block.html: Added.
+
 2017-03-17  Zalan Bujtas  <zalan@apple.com>
 

releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog

@@ +1 @@
+2017-03-17  Dave Hyatt  <hyatt@apple.com>
+
+        Disable per-region boxes for multicolumn
+        https://bugs.webkit.org/show_bug.cgi?id=169830
+
+        Reviewed by Zalan Bujtas.
+
+        Test: fast/multicol/float-adjacent-to-overflow-block.html
+
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::determineLogicalLeftPositionForChild):
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::borderBoxRectInRegion):
+        (WebCore::RenderBox::renderBoxRegionInfo):
+        Limit all of the per-region box code to RenderNamedFlowThreads.
+        This code should never be used by multicolumn layout.
+
 2017-03-17  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -37 +37 @@
 #include "Logging.h"
 #include "RenderCombineText.h"
-#include "RenderFlowThread.h"
 #include "RenderInline.h"
 #include "RenderIterator.h"
@@ -47 +46 @@
 #include "RenderMultiColumnSet.h"
 #include "RenderNamedFlowFragment.h"
+#include "RenderNamedFlowThread.h"
 #include "RenderTableCell.h"
 #include "RenderText.h"
@@ -877 +877 @@
     // Some objects (e.g., tables, horizontal rules, overflow:auto blocks) avoid floats. They need
     // to shift over as necessary to dodge any floats that might get in the way.
-    if (child.avoidsFloats() && containsFloats() && !flowThreadContainingBlock())
+    if (child.avoidsFloats() && containsFloats() && !is<RenderNamedFlowThread>(flowThreadContainingBlock()))
         newPosition += computeStartPositionDeltaForChildAvoidingFloats(child, marginStartForChild(child));
 

releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBox.cpp

@@ -211 +211 @@
         return borderBoxRect();
 
-    RenderFlowThread* flowThread = flowThreadContainingBlock();
-    if (!flowThread)
+    auto* flowThread = flowThreadContainingBlock();
+    if (!is<RenderNamedFlowThread>(flowThread))
         return borderBoxRect();
 
@@ -2711 +2711 @@
     // support to cover all boxes.
     RenderFlowThread* flowThread = flowThreadContainingBlock();
-    if (isRenderFlowThread() || !flowThread || !canHaveBoxInfoInRegion() || flowThread->style().writingMode() != style().writingMode())
+    if (isRenderFlowThread() || !is<RenderNamedFlowThread>(flowThread) || !canHaveBoxInfoInRegion() || flowThread->style().writingMode() != style().writingMode())
         return nullptr;