Changeset 117484 in webkit

Timestamp:

May 17, 2012 1:01:50 PM (12 years ago)

Author:

mitz@apple.com

Message:

In vertical writing modes, pagination may split a line after a block shifts
​https://bugs.webkit.org/show_bug.cgi?id=86763

Reviewed by Sam Weinig.

Source/WebCore:

Test: fast/multicol/pageLogicalOffset-vertical.html

LayoutState::pageLogicalOffset() was returning bogus results in vertical writing modes,
because it was always using physical heights. Changed it to take a RenderBox and use its
writing mode to choose between heights and widths.

• rendering/LayoutState.cpp:

(WebCore::LayoutState::pageLogicalOffset):
(WebCore::LayoutState::addForcedColumnBreak):

• rendering/LayoutState.h:

(LayoutState):

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::layoutBlock):
(WebCore::RenderBlock::markForPaginationRelayoutIfNeeded):
(WebCore::RenderBlock::layoutColumns):
(WebCore::RenderBlock::applyBeforeBreak):
(WebCore::RenderBlock::applyAfterBreak):

• rendering/RenderDeprecatedFlexibleBox.cpp:

(WebCore::RenderDeprecatedFlexibleBox::layoutBlock):

• rendering/RenderTable.cpp:

(WebCore::RenderTable::layout):

• rendering/RenderTableRow.cpp:

(WebCore::RenderTableRow::layout):

• rendering/RenderTableSection.cpp:

(WebCore::RenderTableSection::layoutRows):

LayoutTests:

• fast/multicol/pageLogicalOffset-vertical-expected.html: Added.
• fast/multicol/pageLogicalOffset-vertical.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/multicol/pageLogicalOffset-vertical-expected.html (added)
• LayoutTests/fast/multicol/pageLogicalOffset-vertical.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/LayoutState.cpp (modified) (1 diff)
• Source/WebCore/rendering/LayoutState.h (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (5 diffs)
• Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderTable.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderTableRow.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderTableSection.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-17  Dan Bernstein  <mitz@apple.com>
+
+        In vertical writing modes, pagination may split a line after a block shifts
+        https://bugs.webkit.org/show_bug.cgi?id=86763
+
+        Reviewed by Sam Weinig.
+
+        * fast/multicol/pageLogicalOffset-vertical-expected.html: Added.
+        * fast/multicol/pageLogicalOffset-vertical.html: Added.
+
 2012-05-17  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-17  Dan Bernstein  <mitz@apple.com>
+
+        In vertical writing modes, pagination may split a line after a block shifts
+        https://bugs.webkit.org/show_bug.cgi?id=86763
+
+        Reviewed by Sam Weinig.
+
+        Test: fast/multicol/pageLogicalOffset-vertical.html
+
+        LayoutState::pageLogicalOffset() was returning bogus results in vertical writing modes,
+        because it was always using physical heights. Changed it to take a RenderBox and use its
+        writing mode to choose between heights and widths.
+
+        * rendering/LayoutState.cpp:
+        (WebCore::LayoutState::pageLogicalOffset):
+        (WebCore::LayoutState::addForcedColumnBreak):
+        * rendering/LayoutState.h:
+        (LayoutState):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::layoutBlock):
+        (WebCore::RenderBlock::markForPaginationRelayoutIfNeeded):
+        (WebCore::RenderBlock::layoutColumns):
+        (WebCore::RenderBlock::applyBeforeBreak):
+        (WebCore::RenderBlock::applyAfterBreak):
+        * rendering/RenderDeprecatedFlexibleBox.cpp:
+        (WebCore::RenderDeprecatedFlexibleBox::layoutBlock):
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::layout):
+        * rendering/RenderTableRow.cpp:
+        (WebCore::RenderTableRow::layout):
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::layoutRows):
+
 2012-05-17  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/rendering/LayoutState.cpp

@@ -197 +197 @@
 }
 
-LayoutUnit LayoutState::pageLogicalOffset(LayoutUnit childLogicalOffset) const
-{
-    return m_layoutOffset.height() + childLogicalOffset - m_pageOffset.height();
-}
-
-void LayoutState::addForcedColumnBreak(LayoutUnit childLogicalOffset)
+LayoutUnit LayoutState::pageLogicalOffset(RenderBox* child, LayoutUnit childLogicalOffset) const
+{
+    if (child->isHorizontalWritingMode())
+        return m_layoutOffset.height() + childLogicalOffset - m_pageOffset.height();
+    return m_layoutOffset.width() + childLogicalOffset - m_pageOffset.width();
+}
+
+void LayoutState::addForcedColumnBreak(RenderBox* child, LayoutUnit childLogicalOffset)
 {
     if (!m_columnInfo || m_columnInfo->columnHeight())
         return;
-    m_columnInfo->addForcedBreak(pageLogicalOffset(childLogicalOffset));
+    m_columnInfo->addForcedBreak(pageLogicalOffset(child, childLogicalOffset));
 }
 

trunk/Source/WebCore/rendering/LayoutState.h

@@ -75 +75 @@
     // The page logical offset is the object's offset from the top of the page in the page progression
     // direction (so an x-offset in vertical text and a y-offset for horizontal text).
-    LayoutUnit pageLogicalOffset(LayoutUnit childLogicalOffset) const;
+    LayoutUnit pageLogicalOffset(RenderBox*, LayoutUnit childLogicalOffset) const;
 
-    void addForcedColumnBreak(LayoutUnit childLogicalOffset);
+    void addForcedColumnBreak(RenderBox*, LayoutUnit childLogicalOffset);
     
     LayoutUnit pageLogicalHeight() const { return m_pageLogicalHeight; }

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -1519 +1519 @@
 
     if (renderView->layoutState()->m_pageLogicalHeight)
-        setPageLogicalOffset(renderView->layoutState()->pageLogicalOffset(logicalTop()));
+        setPageLogicalOffset(renderView->layoutState()->pageLogicalOffset(this, logicalTop()));
 
     updateLayerTransform();
@@ -2531 +2531 @@
         return;
 
-    if (view()->layoutState()->pageLogicalHeightChanged() || (view()->layoutState()->pageLogicalHeight() && view()->layoutState()->pageLogicalOffset(logicalTop()) != pageLogicalOffset()))
+    if (view()->layoutState()->pageLogicalHeightChanged() || (view()->layoutState()->pageLogicalHeight() && view()->layoutState()->pageLogicalOffset(this, logicalTop()) != pageLogicalOffset()))
         setChildNeedsLayout(true, MarkOnlyThis);
 }
@@ -4991 +4991 @@
             if (!pageLogicalHeight) {
                 LayoutUnit distanceBetweenBreaks = max<LayoutUnit>(colInfo->maximumDistanceBetweenForcedBreaks(),
-                                                                   view()->layoutState()->pageLogicalOffset(borderBefore() + paddingBefore() + contentLogicalHeight()) - colInfo->forcedBreakOffset());
+                                                                   view()->layoutState()->pageLogicalOffset(this, borderBefore() + paddingBefore() + contentLogicalHeight()) - colInfo->forcedBreakOffset());
                 columnHeight = max(colInfo->minimumColumnHeight(), distanceBetweenBreaks);
             }
@@ -6655 +6655 @@
     if (checkBeforeAlways && inNormalFlow(child) && hasNextPage(logicalOffset, IncludePageBoundary)) {
         if (checkColumnBreaks)
-            view()->layoutState()->addForcedColumnBreak(logicalOffset);
+            view()->layoutState()->addForcedColumnBreak(child, logicalOffset);
         return nextPageLogicalTop(logicalOffset, IncludePageBoundary);
     }
@@ -6672 +6672 @@
         marginInfo.setMarginAfterQuirk(true); // Cause margins to be discarded for any following content.
         if (checkColumnBreaks)
-            view()->layoutState()->addForcedColumnBreak(logicalOffset);
+            view()->layoutState()->addForcedColumnBreak(child, logicalOffset);
         return nextPageLogicalTop(logicalOffset, IncludePageBoundary);
     }

trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp

@@ -302 +302 @@
 
     if (view()->layoutState()->pageLogicalHeight())
-        setPageLogicalOffset(view()->layoutState()->pageLogicalOffset(logicalTop()));
+        setPageLogicalOffset(view()->layoutState()->pageLogicalOffset(this, logicalTop()));
 
     // Update our scrollbars if we're overflow:auto/scroll/hidden now that we know if

trunk/Source/WebCore/rendering/RenderTable.cpp

@@ -457 +457 @@
 
     if (view()->layoutState()->pageLogicalHeight())
-        setPageLogicalOffset(view()->layoutState()->pageLogicalOffset(logicalTop()));
+        setPageLogicalOffset(view()->layoutState()->pageLogicalOffset(this, logicalTop()));
 
     bool didFullRepaint = repainter.repaintAfterLayout();

trunk/Source/WebCore/rendering/RenderTableRow.cpp

@@ -149 +149 @@
         if (child->isTableCell()) {
             RenderTableCell* cell = toRenderTableCell(child);
-            if (!cell->needsLayout() && paginated && view()->layoutState()->pageLogicalHeight() && view()->layoutState()->pageLogicalOffset(cell->logicalTop()) != cell->pageLogicalOffset())
+            if (!cell->needsLayout() && paginated && view()->layoutState()->pageLogicalHeight() && view()->layoutState()->pageLogicalOffset(cell, cell->logicalTop()) != cell->pageLogicalOffset())
                 cell->setChildNeedsLayout(true, MarkOnlyThis);
 

trunk/Source/WebCore/rendering/RenderTableSection.cpp

@@ -663 +663 @@
                 cell->setNeedsLayout(true, MarkOnlyThis);
 
-            if (!cell->needsLayout() && view()->layoutState()->pageLogicalHeight() && view()->layoutState()->pageLogicalOffset(cell->logicalTop()) != cell->pageLogicalOffset())
+            if (!cell->needsLayout() && view()->layoutState()->pageLogicalHeight() && view()->layoutState()->pageLogicalOffset(cell, cell->logicalTop()) != cell->pageLogicalOffset())
                 cell->setChildNeedsLayout(true, MarkOnlyThis);