Changeset 107160 in webkit

Timestamp:

Feb 8, 2012 5:50:05 PM (12 years ago)

Author:

hyatt@apple.com

Message:

Source/WebCore: ​https://bugs.webkit.org/show_bug.cgi?id=78157

Make multi-column layout work with line grids that are outside of the multi-column
block.

Reviewed by Dan Bernstein.

Added new tests in fast/line-grid.

• rendering/LayoutState.cpp:

(WebCore::LayoutState::LayoutState):
(WebCore::LayoutState::propagateLineGridInfo):
(WebCore::LayoutState::establishLineGrid):
(WebCore):
(WebCore::LayoutState::computeLineGridPaginationOrigin):

• rendering/LayoutState.h:

(WebCore::LayoutState::LayoutState):
(WebCore::LayoutState::lineGrid):
(WebCore::LayoutState::lineGridOffset):
(WebCore::LayoutState::lineGridPaginationOrigin):
(WebCore::LayoutState::needsBlockDirectionLocationSetBeforeLayout):
(LayoutState):

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::layoutBlockChildren):

• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::layoutInlineChildren):

• rendering/RenderView.h:

(WebCore::RenderView::pushLayoutState):

• rendering/RootInlineBox.cpp:

(WebCore::RootInlineBox::lineGridSnapAdjustment):

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

Make multi-column layout work with line grids that are outside of the multi-column
block.

Reviewed by Dan Bernstein.

• fast/line-grid/line-grid-into-columns.html: Added.
• platform/mac/fast/line-grid/line-grid-into-columns-expected.png: Added.
• platform/mac/fast/line-grid/line-grid-into-columns-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/line-grid/line-grid-into-columns.html (added)
• LayoutTests/platform/mac/fast/line-grid/line-grid-into-columns-expected.png (added)
• LayoutTests/platform/mac/fast/line-grid/line-grid-into-columns-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/LayoutState.cpp (modified) (8 diffs)
• Source/WebCore/rendering/LayoutState.h (modified) (4 diffs)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderView.h (modified) (1 diff)
• Source/WebCore/rendering/RootInlineBox.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-08  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=78157
+        
+        Make multi-column layout work with line grids that are outside of the multi-column
+        block.
+ 
+        Reviewed by Dan Bernstein.
+
+        * fast/line-grid/line-grid-into-columns.html: Added.
+        * platform/mac/fast/line-grid/line-grid-into-columns-expected.png: Added.
+        * platform/mac/fast/line-grid/line-grid-into-columns-expected.txt: Added.
+
 2012-02-08  Matt Falkenhagen  <falken@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-08  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=78157
+        
+        Make multi-column layout work with line grids that are outside of the multi-column
+        block.
+
+        Reviewed by Dan Bernstein.
+
+        Added new tests in fast/line-grid.
+
+        * rendering/LayoutState.cpp:
+        (WebCore::LayoutState::LayoutState):
+        (WebCore::LayoutState::propagateLineGridInfo):
+        (WebCore::LayoutState::establishLineGrid):
+        (WebCore):
+        (WebCore::LayoutState::computeLineGridPaginationOrigin):
+        * rendering/LayoutState.h:
+        (WebCore::LayoutState::LayoutState):
+        (WebCore::LayoutState::lineGrid):
+        (WebCore::LayoutState::lineGridOffset):
+        (WebCore::LayoutState::lineGridPaginationOrigin):
+        (WebCore::LayoutState::needsBlockDirectionLocationSetBeforeLayout):
+        (LayoutState):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::layoutBlockChildren):
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::layoutInlineChildren):
+        * rendering/RenderView.h:
+        (WebCore::RenderView::pushLayoutState):
+        * rendering/RootInlineBox.cpp:
+        (WebCore::RootInlineBox::lineGridSnapAdjustment):
+
 2012-02-08  Matthew Delaney  <mdelaney@apple.com>
 

trunk/Source/WebCore/rendering/LayoutState.cpp

@@ -38 +38 @@
 LayoutState::LayoutState(LayoutState* prev, RenderBox* renderer, const LayoutSize& offset, LayoutUnit pageLogicalHeight, bool pageLogicalHeightChanged, ColumnInfo* columnInfo)
     : m_columnInfo(columnInfo)
-    , m_currentLineGrid(0)
+    , m_lineGrid(0)
     , m_next(prev)
 #ifndef NDEBUG
@@ -103 +103 @@
     }
     
+    // Propagate line grid information.
+    propagateLineGridInfo(renderer);
+
     if (!m_columnInfo)
         m_columnInfo = m_next->m_columnInfo;
@@ -110 +113 @@
     m_isPaginated = m_pageLogicalHeight || m_columnInfo;
 
-    // Propagate line grid information.
-    propagateLineGridInfo(renderer);
+    if (lineGrid() && renderer->hasColumns() && renderer->style()->hasInlineColumnAxis())
+        computeLineGridPaginationOrigin(renderer);
 
     // If we have a new grid to track, then add it to our set.
@@ -126 +129 @@
     , m_pageLogicalHeightChanged(regionsChanged)
     , m_columnInfo(0)
-    , m_currentLineGrid(0)
+    , m_lineGrid(0)
     , m_next(prev)
 #ifndef NDEBUG
@@ -143 +146 @@
     , m_pageLogicalHeightChanged(false)
     , m_columnInfo(0)
-    , m_currentLineGrid(0)
+    , m_lineGrid(0)
     , m_next(0)
 #ifndef NDEBUG
@@ -214 +217 @@
         return;
 
-    m_currentLineGrid = m_next->m_currentLineGrid;
-    m_currentLineGridOffset = m_next->m_currentLineGridOffset;
+    m_lineGrid = m_next->m_lineGrid;
+    m_lineGridOffset = m_next->m_lineGridOffset;
+    m_lineGridPaginationOrigin = m_next->m_lineGridPaginationOrigin;
 }
 
@@ -221 +225 @@
 {
     // First check to see if this grid has been established already.
-    if (m_currentLineGrid) {
-        if (m_currentLineGrid->style()->lineGrid() == block->style()->lineGrid())
+    if (m_lineGrid) {
+        if (m_lineGrid->style()->lineGrid() == block->style()->lineGrid())
             return;
-        RenderBlock* currentGrid = m_currentLineGrid;
+        RenderBlock* currentGrid = m_lineGrid;
         for (LayoutState* currentState = m_next; currentState; currentState = currentState->m_next) {
-            if (currentState->m_currentLineGrid == currentGrid)
+            if (currentState->m_lineGrid == currentGrid)
                 continue;
-            currentGrid = currentState->m_currentLineGrid;
+            currentGrid = currentState->m_lineGrid;
             if (!currentGrid)
                 break;
             if (currentGrid->style()->lineGrid() == block->style()->lineGrid()) {
-                m_currentLineGrid = currentGrid;
-                m_currentLineGridOffset = currentState->m_currentLineGridOffset;
+                m_lineGrid = currentGrid;
+                m_lineGridOffset = currentState->m_lineGridOffset;
                 return;
             }
@@ -240 +244 @@
     
     // We didn't find an already-established grid with this identifier. Our render object establishes the grid.
-    m_currentLineGrid = block;
-    m_currentLineGridOffset = m_layoutOffset; 
+    m_lineGrid = block;
+    m_lineGridOffset = m_layoutOffset; 
+}
+
+void LayoutState::computeLineGridPaginationOrigin(RenderBox* renderer)
+{
+    // We need to cache a line grid pagination origin so that we understand how to reset the line grid
+    // at the top of each column.
+    // Get the current line grid and offset.
+    if (!lineGrid() || lineGrid()->style()->writingMode() != renderer->style()->writingMode())
+        return;
+
+    // Get the hypothetical line box used to establish the grid.
+    RootInlineBox* lineGridBox = lineGrid()->lineGridBox();
+    if (!lineGridBox)
+        return;
+    
+    bool isHorizontalWritingMode = lineGrid()->isHorizontalWritingMode();
+
+    LayoutUnit lineGridBlockOffset = isHorizontalWritingMode ? lineGridOffset().height() : lineGridOffset().width();
+
+    // Now determine our position on the grid. Our baseline needs to be adjusted to the nearest baseline multiple
+    // as established by the line box.
+    // FIXME: Need to handle crazy line-box-contain values that cause the root line box to not be considered. I assume
+    // the grid should honor line-box-contain.
+    LayoutUnit gridLineHeight = lineGridBox->lineBottomWithLeading() - lineGridBox->lineTopWithLeading();
+    if (!gridLineHeight)
+        return;
+
+    LayoutUnit firstLineTopWithLeading = lineGridBlockOffset + lineGridBox->lineTopWithLeading();
+    
+    if (isPaginated() && pageLogicalHeight()) {
+        LayoutUnit pageLogicalTop = renderer->isHorizontalWritingMode() ? m_pageOffset.height() : m_pageOffset.width();
+        if (pageLogicalTop > firstLineTopWithLeading) {
+            // Shift to the next highest line grid multiple past the page logical top. Cache the delta
+            // between this new value and the page logical top as the pagination origin.
+            LayoutUnit remainder = (pageLogicalTop - firstLineTopWithLeading) % gridLineHeight;
+            LayoutUnit paginationDelta = gridLineHeight - remainder;
+            if (isHorizontalWritingMode)
+                m_lineGridPaginationOrigin.setHeight(paginationDelta);
+            else
+                m_lineGridPaginationOrigin.setWidth(paginationDelta);
+        }
+    }
 }
 

trunk/Source/WebCore/rendering/LayoutState.h

@@ -49 +49 @@
         , m_pageLogicalHeightChanged(false)
         , m_columnInfo(0)
-        , m_currentLineGrid(0)
+        , m_lineGrid(0)
         , m_next(0)
 #ifndef NDEBUG
@@ -82 +82 @@
     bool pageLogicalHeightChanged() const { return m_pageLogicalHeightChanged; }
 
-    RenderBlock* currentLineGrid() const { return m_currentLineGrid; }
-    LayoutSize currentLineGridOffset() const { return m_currentLineGridOffset; }
+    RenderBlock* lineGrid() const { return m_lineGrid; }
+    LayoutSize lineGridOffset() const { return m_lineGridOffset; }
+    LayoutSize lineGridPaginationOrigin() const { return m_lineGridPaginationOrigin; }
 
     LayoutSize layoutOffset() const { return m_layoutOffset; }
 
-    bool needsBlockDirectionLocationSetBeforeLayout() const { return m_currentLineGrid || (m_isPaginated && m_pageLogicalHeight); }
+    bool needsBlockDirectionLocationSetBeforeLayout() const { return m_lineGrid || (m_isPaginated && m_pageLogicalHeight); }
 
 private:
@@ -95 +96 @@
     void propagateLineGridInfo(RenderBox*);
     void establishLineGrid(RenderBlock*);
+
+    void computeLineGridPaginationOrigin(RenderBox*);
 
 public:
@@ -120 +123 @@
 
     // The current line grid that we're snapping to and the offset of the start of the grid.
-    RenderBlock* m_currentLineGrid;
-    LayoutSize m_currentLineGridOffset;
-    
+    RenderBlock* m_lineGrid;
+    LayoutSize m_lineGridOffset;
+    LayoutSize m_lineGridPaginationOrigin;
+
     LayoutState* m_next;
 #ifndef NDEBUG

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -2023 +2023 @@
     
     // Lay out our hypothetical grid line as though it occurs at the top of the block.
-    if (view()->layoutState()->currentLineGrid() == this)
+    if (view()->layoutState()->lineGrid() == this)
         layoutLineGridBox();
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -1451 +1451 @@
     
     // Lay out our hypothetical grid line as though it occurs at the top of the block.
-    if (view()->layoutState() && view()->layoutState()->currentLineGrid() == this)
+    if (view()->layoutState() && view()->layoutState()->lineGrid() == this)
         layoutLineGridBox();
 

trunk/Source/WebCore/rendering/RenderView.h

@@ -209 +209 @@
         // We push LayoutState even if layoutState is disabled because it stores layoutDelta too.
         if (!doingFullRepaint() || m_layoutState->isPaginated() || renderer->hasColumns() || renderer->inRenderFlowThread()
-            || m_layoutState->currentLineGrid() || (renderer->style()->lineGrid() != RenderStyle::initialLineGrid() && renderer->isBlockFlow())) {
+            || m_layoutState->lineGrid() || (renderer->style()->lineGrid() != RenderStyle::initialLineGrid() && renderer->isBlockFlow())) {
             m_layoutState = new (renderArena()) LayoutState(m_layoutState, renderer, offset, pageHeight, pageHeightChanged, colInfo);
             return true;

trunk/Source/WebCore/rendering/RootInlineBox.cpp

@@ -336 +336 @@
     // Get the current line grid and offset.
     LayoutState* layoutState = block()->view()->layoutState();
-    RenderBlock* lineGrid = layoutState->currentLineGrid();
-    LayoutSize lineGridOffset = layoutState->currentLineGridOffset();
+    RenderBlock* lineGrid = layoutState->lineGrid();
+    LayoutSize lineGridOffset = layoutState->lineGridOffset();
     if (!lineGrid || lineGrid->style()->writingMode() != block()->style()->writingMode())
         return 0;
@@ -360 +360 @@
     LayoutUnit lineGridFontHeight = lineGridBox->logicalHeight();
     LayoutUnit firstTextTop = lineGridBlockOffset + lineGridBox->logicalTop();
+    LayoutUnit firstLineTopWithLeading = lineGridBlockOffset + lineGridBox->lineTopWithLeading();
     LayoutUnit firstBaselinePosition = firstTextTop + lineGridFontAscent;
 
@@ -365 +366 @@
     LayoutUnit currentFontAscent = block()->style()->fontMetrics().ascent(baselineType());
     LayoutUnit currentBaselinePosition = currentTextTop + currentFontAscent;
+
+    LayoutUnit lineGridPaginationOrigin = isHorizontal() ? layoutState->lineGridPaginationOrigin().height() : layoutState->lineGridPaginationOrigin().width();
 
     // If we're paginated, see if we're on a page after the first one. If so, the grid resets on subsequent pages.
@@ -370 +373 @@
     LayoutUnit pageLogicalTop = 0;
     if (layoutState->isPaginated() && layoutState->pageLogicalHeight()) {
-        pageLogicalTop = block()->pageLogicalTopForOffset(logicalTop() + delta);
-        if (pageLogicalTop > firstTextTop)
-            firstTextTop = pageLogicalTop + lineGridBox->logicalTop() - lineGrid->borderBefore() - lineGrid->paddingBefore();
+        pageLogicalTop = block()->pageLogicalTopForOffset(lineTopWithLeading() + delta);
+        if (pageLogicalTop > firstLineTopWithLeading)
+            firstTextTop = pageLogicalTop + lineGridBox->logicalTop() - lineGrid->borderBefore() - lineGrid->paddingBefore() + lineGridPaginationOrigin;
     }
 
@@ -406 +409 @@
         return result;
     
-    // We may have shifted to a new page. We need to do a re-snap when that happens.
-    LayoutUnit newPageLogicalTop = block()->pageLogicalTopForOffset(logicalTop() + result);
+    // We may end up shifted to a new page. We need to do a re-snap when that happens.
+    LayoutUnit newPageLogicalTop = block()->pageLogicalTopForOffset(lineBottomWithLeading() + result);
     if (newPageLogicalTop == pageLogicalTop)
         return result;
     
     // Put ourselves at the top of the next page to force a snap onto the new grid established by that page.
-    return lineGridSnapAdjustment(newPageLogicalTop - (blockOffset + logicalTop()));
+    return lineGridSnapAdjustment(newPageLogicalTop - (blockOffset + lineTopWithLeading()));
 }