Changeset 95855 in webkit

Timestamp:

Sep 23, 2011 1:25:11 PM (13 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=68719

Push through multiple regions when an object doesn't fit in any of them. Unlike with pages and
columns, when regions have a non-uniform height, we may need to push through multiple regions
in order to find one that fits.

Added an optimization for quickly noticing if regions do have a uniform height so that we can
treat them like columns and pages if so.

Also fixed the end line matchup to properly null out endLine when no next line box exists. The new
layout tests I wrote to cover this feature exposed this crasher, so fixing it in order to land
the new tests.

Reviewed by Anders Carlsson.

Source/WebCore:

Added new tests in fast/regions.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::adjustForUnsplittableChild):
(WebCore::RenderBlock::pushToNextPageWithMinimumLogicalHeight):
(WebCore::RenderBlock::adjustLinePositionForPagination):

• rendering/RenderBlock.h:
• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::matchedEndLine):

• rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::RenderFlowThread):
(WebCore::RenderFlowThread::layout):

• rendering/RenderFlowThread.h:

LayoutTests:

• fast/regions/webkit-flow-float-pushed-to-last-region.html: Added.
• fast/regions/webkit-flow-float-unable-to-push.html: Added.
• platform/mac/fast/regions/webkit-flow-float-pushed-to-last-region-expected.png: Added.
• platform/mac/fast/regions/webkit-flow-float-pushed-to-last-region-expected.txt: Added.
• platform/mac/fast/regions/webkit-flow-float-unable-to-push-expected.png: Added.
• platform/mac/fast/regions/webkit-flow-float-unable-to-push-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/webkit-flow-float-pushed-to-last-region.html (added)
• LayoutTests/fast/regions/webkit-flow-float-unable-to-push.html (added)
• LayoutTests/platform/mac/fast/regions/webkit-flow-float-pushed-to-last-region-expected.png (added)
• LayoutTests/platform/mac/fast/regions/webkit-flow-float-pushed-to-last-region-expected.txt (added)
• LayoutTests/platform/mac/fast/regions/webkit-flow-float-unable-to-push-expected.png (added)
• LayoutTests/platform/mac/fast/regions/webkit-flow-float-unable-to-push-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderBlock.h (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderFlowThread.cpp (modified) (4 diffs)
• Source/WebCore/rendering/RenderFlowThread.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-23  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=68719
+        
+        Push through multiple regions when an object doesn't fit in any of them. Unlike with pages and
+        columns, when regions have a non-uniform height, we may need to push through multiple regions
+        in order to find one that fits.
+        
+        Added an optimization for quickly noticing if regions do have a uniform height so that we can
+        treat them like columns and pages if so.
+
+        Also fixed the end line matchup to properly null out endLine when no next line box exists. The new
+        layout tests I wrote to cover this feature exposed this crasher, so fixing it in order to land
+        the new tests.
+
+        Reviewed by Anders Carlsson.
+
+        * fast/regions/webkit-flow-float-pushed-to-last-region.html: Added.
+        * fast/regions/webkit-flow-float-unable-to-push.html: Added.
+        * platform/mac/fast/regions/webkit-flow-float-pushed-to-last-region-expected.png: Added.
+        * platform/mac/fast/regions/webkit-flow-float-pushed-to-last-region-expected.txt: Added.
+        * platform/mac/fast/regions/webkit-flow-float-unable-to-push-expected.png: Added.
+        * platform/mac/fast/regions/webkit-flow-float-unable-to-push-expected.txt: Added.
+
 2011-09-23  Konstantin Scheglov  <scheglov@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-23  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=68719
+        
+        Push through multiple regions when an object doesn't fit in any of them. Unlike with pages and
+        columns, when regions have a non-uniform height, we may need to push through multiple regions
+        in order to find one that fits.
+        
+        Added an optimization for quickly noticing if regions do have a uniform height so that we can
+        treat them like columns and pages if so.
+
+        Also fixed the end line matchup to properly null out endLine when no next line box exists. The new
+        layout tests I wrote to cover this feature exposed this crasher, so fixing it in order to land
+        the new tests.
+
+        Reviewed by Anders Carlsson.
+
+        Added new tests in fast/regions.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::adjustForUnsplittableChild):
+        (WebCore::RenderBlock::pushToNextPageWithMinimumLogicalHeight):
+        (WebCore::RenderBlock::adjustLinePositionForPagination):
+        * rendering/RenderBlock.h:
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::matchedEndLine):
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::RenderFlowThread):
+        (WebCore::RenderFlowThread::layout):
+        * rendering/RenderFlowThread.h:
+
 2011-09-23  Konstantin Scheglov  <scheglov@google.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -6229 +6229 @@
         layoutState->m_columnInfo->updateMinimumColumnHeight(childLogicalHeight);
     LayoutUnit pageLogicalHeight = pageLogicalHeightForOffset(logicalOffset);
-    if (!pageLogicalHeight || (childLogicalHeight > pageLogicalHeight && !view()->hasRenderFlowThread()))
+    bool hasUniformPageLogicalHeight = !view()->hasRenderFlowThread() || view()->currentRenderFlowThread()->regionsHaveUniformLogicalHeight();
+    if (!pageLogicalHeight || (hasUniformPageLogicalHeight && childLogicalHeight > pageLogicalHeight))
         return logicalOffset;
     LayoutUnit remainingLogicalHeight = pageRemainingLogicalHeightForOffset(logicalOffset);
-    if (remainingLogicalHeight < childLogicalHeight)
+    if (remainingLogicalHeight < childLogicalHeight) {
+        if (!hasUniformPageLogicalHeight && !pushToNextPageWithMinimumLogicalHeight(remainingLogicalHeight, logicalOffset, childLogicalHeight))
+            return logicalOffset;
         return logicalOffset + remainingLogicalHeight;
+    }
     return logicalOffset;
+}
+
+bool RenderBlock::pushToNextPageWithMinimumLogicalHeight(LayoutUnit& adjustment, LayoutUnit logicalOffset, LayoutUnit minimumLogicalHeight) const
+{
+    bool checkedRegion = false;
+    for (LayoutUnit pageLogicalHeight = pageLogicalHeightForOffset(logicalOffset + adjustment); pageLogicalHeight;
+         pageLogicalHeight = pageLogicalHeightForOffset(logicalOffset + adjustment)) {
+         if (minimumLogicalHeight <= pageLogicalHeight)
+            return true;
+         adjustment += pageLogicalHeight;
+         checkedRegion = true;
+    }
+    return !checkedRegion;
 }
 
@@ -6268 +6285 @@
     lineBox->setPaginationStrut(0);
     LayoutUnit pageLogicalHeight = pageLogicalHeightForOffset(logicalOffset);
-    if (!pageLogicalHeight || (lineHeight > pageLogicalHeight && !renderView->hasRenderFlowThread()))
+    bool hasUniformPageLogicalHeight = !view()->hasRenderFlowThread() || view()->currentRenderFlowThread()->regionsHaveUniformLogicalHeight();
+    if (!pageLogicalHeight || (hasUniformPageLogicalHeight && lineHeight > pageLogicalHeight))
         return;
     const bool includeBoundaryPoint = false;
     LayoutUnit remainingLogicalHeight = pageRemainingLogicalHeightForOffset(logicalOffset, includeBoundaryPoint);
     if (remainingLogicalHeight < lineHeight) {
+        // If we have a non-uniform page height, then we have to shift further possibly.
+        if (!hasUniformPageLogicalHeight && !pushToNextPageWithMinimumLogicalHeight(remainingLogicalHeight, logicalOffset, lineHeight))
+            return;
         LayoutUnit totalLogicalHeight = lineHeight + max<LayoutUnit>(0, logicalOffset);
-        if (lineBox == firstRootBox() && totalLogicalHeight < pageLogicalHeight && !isPositioned() && !isTableCell())
+        LayoutUnit pageLogicalHeightAtNewOffset = hasUniformPageLogicalHeight ? pageLogicalHeight : pageLogicalHeightForOffset(logicalOffset + remainingLogicalHeight);
+        if (lineBox == firstRootBox() && totalLogicalHeight < pageLogicalHeightAtNewOffset && !isPositioned() && !isTableCell())
             setPaginationStrut(remainingLogicalHeight + max<LayoutUnit>(0, logicalOffset));
         else {

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -825 +825 @@
     LayoutUnit pageLogicalHeightForOffset(LayoutUnit offset) const;
     LayoutUnit pageRemainingLogicalHeightForOffset(LayoutUnit offset, bool includeBoundaryPoint = true) const;
+    bool pushToNextPageWithMinimumLogicalHeight(LayoutUnit& adjustment, LayoutUnit logicalOffset, LayoutUnit minimumLogicalHeight) const;
 
     LayoutUnit adjustForUnsplittableChild(RenderBox* child, LayoutUnit logicalOffset, bool includeMargins = false); // If the child is unsplittable and can't fit on the current page, return the top of the next page/column.

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -1615 +1615 @@
             bool matched = false;
             RootInlineBox* result = line->nextRootBox();
+            layoutState.setEndLine(result);
             if (result) {
                 layoutState.setEndLineLogicalTop(line->lineBottomWithLeading());
-                layoutState.setEndLine(result);
                 matched = checkPaginationAndFloatsAtEndLine(layoutState);
             }

trunk/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -49 +49 @@
     , m_regionsInvalidated(false)
     , m_regionsHaveUniformLogicalWidth(true)
+    , m_regionsHaveUniformLogicalHeight(true)
     , m_regionFittingDisableCount(0)
 {
@@ -307 +308 @@
         m_hasValidRegions = false;
         m_regionsHaveUniformLogicalWidth = true;
+        m_regionsHaveUniformLogicalHeight = true;
         LayoutUnit previousRegionLogicalWidth = 0;
+        LayoutUnit previousRegionLogicalHeight = 0;
         if (hasRegions()) {
             int logicalHeight = 0;
@@ -319 +322 @@
                 
                 LayoutUnit regionLogicalWidth;
+                LayoutUnit regionLogicalHeight;
 
                 IntRect regionRect;
@@ -325 +329 @@
                     logicalHeight += regionRect.height();
                     regionLogicalWidth = region->contentWidth();
+                    regionLogicalHeight = region->contentHeight();
                 } else {
                     regionRect = IntRect(logicalHeight, 0, region->contentWidth(), region->contentHeight());
                     logicalHeight += regionRect.width();
                     regionLogicalWidth = region->contentHeight();
+                    regionLogicalHeight = region->contentWidth();
                 }
 
                 if (!m_hasValidRegions)
                     m_hasValidRegions = true;
-                else if (m_regionsHaveUniformLogicalWidth && previousRegionLogicalWidth != regionLogicalWidth)
-                    m_regionsHaveUniformLogicalWidth = false;
+                else {
+                    if (m_regionsHaveUniformLogicalWidth && previousRegionLogicalWidth != regionLogicalWidth)
+                        m_regionsHaveUniformLogicalWidth = false;
+                    if (m_regionsHaveUniformLogicalHeight && previousRegionLogicalHeight != regionLogicalHeight)
+                        m_regionsHaveUniformLogicalHeight = false;
+                }
 
                 previousRegionLogicalWidth = regionLogicalWidth;

trunk/Source/WebCore/rendering/RenderFlowThread.h

@@ -107 +107 @@
 
     bool regionsHaveUniformLogicalWidth() const { return m_regionsHaveUniformLogicalWidth; }
-    
+    bool regionsHaveUniformLogicalHeight() const { return m_regionsHaveUniformLogicalHeight; }
+
     RenderRegion* mapFromFlowToRegion(TransformState&) const;
 
@@ -141 +142 @@
     bool m_regionsInvalidated;
     bool m_regionsHaveUniformLogicalWidth;
+    bool m_regionsHaveUniformLogicalHeight;
     unsigned m_regionFittingDisableCount;
 };