Changeset 167723 in webkit

Timestamp:

Apr 23, 2014 2:27:54 PM (10 years ago)

Author:

hyatt@apple.com

Message:

[New Multicolumn] Assertion failure in huge-column-count.html
​https://bugs.webkit.org/show_bug.cgi?id=132071

Reviewed by Dean Jackson.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::regionAtBlockOffset):
Back out this change, since it wasn't general enough.

• rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::getRegionRangeForBox):
The real issue was that this loop needed to consider the actual box
rather than starting from the parent. This was a non-issue for normal
regions (which cannot have nested flow threads), but for columns, you
have to consider the fact that the box could itself be a flow thread.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderFlowThread.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-23  David Hyatt  <hyatt@apple.com>
+
+        [New Multicolumn] Assertion failure in huge-column-count.html
+        https://bugs.webkit.org/show_bug.cgi?id=132071
+
+        Reviewed by Dean Jackson.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::regionAtBlockOffset):
+        Back out this change, since it wasn't general enough.
+
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::getRegionRangeForBox):
+        The real issue was that this loop needed to consider the actual box
+        rather than starting from the parent. This was a non-issue for normal
+        regions (which cannot have nested flow threads), but for columns, you 
+        have to consider the fact that the box could itself be a flow thread.
+
 2014-04-23  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -4829 +4829 @@
 RenderRegion* RenderBlock::regionAtBlockOffset(LayoutUnit blockOffset) const
 {
-    if (isInFlowRenderFlowThread())
-        return 0;
-
     RenderFlowThread* flowThread = flowThreadContainingBlock();
     if (!flowThread || !flowThread->hasValidRegionInfo())

trunk/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -772 +772 @@
     RenderBox* topMostUnsplittable = nullptr;
     RenderBox* cb = const_cast<RenderBox*>(box);
-    do {
+    while (!cb->isRenderFlowThread()) {
         if (cb->isUnsplittableForPagination())
             topMostUnsplittable = cb;
@@ -778 +778 @@
         cb = cb->parent()->enclosingBox();
         ASSERT(cb);
-    } while (!cb->isRenderFlowThread());
+    }
 
     if (topMostUnsplittable) {