Title: [167721] trunk/Source/WebCore
- Revision
- 167721
- Author
- commit-qu...@webkit.org
- Date
- 2014-04-23 13:54:12 -0700 (Wed, 23 Apr 2014)
Log Message
Unreviewed, rolling out r167720.
https://bugs.webkit.org/show_bug.cgi?id=132075
broke eight newmulticol tests (Requested by thorton on
#webkit).
Reverted changeset:
"[New Multicolumn] Assertion failure in huge-column-
count.html"
https://bugs.webkit.org/show_bug.cgi?id=132071
http://trac.webkit.org/changeset/167720
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (167720 => 167721)
--- trunk/Source/WebCore/ChangeLog 2014-04-23 20:01:01 UTC (rev 167720)
+++ trunk/Source/WebCore/ChangeLog 2014-04-23 20:54:12 UTC (rev 167721)
@@ -1,3 +1,18 @@
+2014-04-23 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r167720.
+ https://bugs.webkit.org/show_bug.cgi?id=132075
+
+ broke eight newmulticol tests (Requested by thorton on
+ #webkit).
+
+ Reverted changeset:
+
+ "[New Multicolumn] Assertion failure in huge-column-
+ count.html"
+ https://bugs.webkit.org/show_bug.cgi?id=132071
+ http://trac.webkit.org/changeset/167720
+
2014-04-23 David Hyatt <hy...@apple.com>
[New Multicolumn] Assertion failure in huge-column-count.html
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (167720 => 167721)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-04-23 20:01:01 UTC (rev 167720)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-04-23 20:54:12 UTC (rev 167721)
@@ -4828,6 +4828,9 @@
RenderRegion* RenderBlock::regionAtBlockOffset(LayoutUnit blockOffset) const
{
+ if (isInFlowRenderFlowThread())
+ return 0;
+
RenderFlowThread* flowThread = flowThreadContainingBlock();
if (!flowThread || !flowThread->hasValidRegionInfo())
return 0;
Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (167720 => 167721)
--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-04-23 20:01:01 UTC (rev 167720)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-04-23 20:54:12 UTC (rev 167721)
@@ -760,7 +760,7 @@
ASSERT(box);
startRegion = endRegion = nullptr;
- if (!hasValidRegionInfo() || box->isInFlowRenderFlowThread()) // We clear the ranges when we invalidate the regions.
+ if (!hasValidRegionInfo()) // We clear the ranges when we invalidate the regions.
return false;
if (getRegionRangeForBoxFromCachedInfo(box, startRegion, endRegion))
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
