Changeset 74121 in webkit

Timestamp:

Dec 15, 2010 10:10:48 AM (13 years ago)

Author:

hyatt@apple.com

Message:

Rename pageY to pageLogicalOffset, since for vertical writing modes it is an x-position rather than a
y-position.

Reviewed by Simon Fraser.

• rendering/LayoutState.cpp:

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

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

(WebCore::RenderBlock::layoutBlock):
(WebCore::RenderBlock::markForPaginationRelayoutIfNeeded):
(WebCore::RenderBlock::layoutColumns):
(WebCore::RenderBlock::setPageLogicalOffset):

• rendering/RenderBlock.h:

(WebCore::RenderBlock::pageLogicalOffset):
(WebCore::RenderBlock::RenderBlockRareData::RenderBlockRareData):

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::layoutBlock):

• rendering/RenderTable.cpp:

(WebCore::RenderTable::layout):

• rendering/RenderTableRow.cpp:

(WebCore::RenderTableRow::layout):

• rendering/RenderTableSection.cpp:

(WebCore::RenderTableSection::layoutRows):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/LayoutState.cpp (modified) (2 diffs)
• rendering/LayoutState.h (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (4 diffs)
• rendering/RenderBlock.h (modified) (3 diffs)
• rendering/RenderFlexibleBox.cpp (modified) (1 diff)
• rendering/RenderTable.cpp (modified) (1 diff)
• rendering/RenderTableRow.cpp (modified) (1 diff)
• rendering/RenderTableSection.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-15  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Rename pageY to pageLogicalOffset, since for vertical writing modes it is an x-position rather than a
+        y-position.
+
+        * rendering/LayoutState.cpp:
+        (WebCore::LayoutState::pageLogicalOffset):
+        (WebCore::LayoutState::addForcedColumnBreak):
+        * rendering/LayoutState.h:
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::layoutBlock):
+        (WebCore::RenderBlock::markForPaginationRelayoutIfNeeded):
+        (WebCore::RenderBlock::layoutColumns):
+        (WebCore::RenderBlock::setPageLogicalOffset):
+        * rendering/RenderBlock.h:
+        (WebCore::RenderBlock::pageLogicalOffset):
+        (WebCore::RenderBlock::RenderBlockRareData::RenderBlockRareData):
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::layoutBlock):
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::layout):
+        * rendering/RenderTableRow.cpp:
+        (WebCore::RenderTableRow::layout):
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::layoutRows):
+
 2010-12-13  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/WebCore/rendering/LayoutState.cpp

@@ -163 +163 @@
 }
 
-int LayoutState::pageY(int childY) const
+int LayoutState::pageLogicalOffset(int childLogicalOffset) const
 {
-    return m_layoutOffset.height() + childY - m_pageOffset.height();
+    return m_layoutOffset.height() + childLogicalOffset - m_pageOffset.height();
 }
 
@@ -172 +172 @@
     if (!m_columnInfo || m_columnInfo->columnHeight())
         return;
-    m_columnInfo->addForcedBreak(pageY(childY));
+    m_columnInfo->addForcedBreak(pageLogicalOffset(childY));
 }
 

trunk/WebCore/rendering/LayoutState.h

@@ -66 +66 @@
     bool isPaginatingColumns() const { return m_columnInfo; }
     bool isPaginated() const { return m_pageLogicalHeight || m_columnInfo; }
-    int pageY(int childY) const;
+    
+    // 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).
+    int pageLogicalOffset(int childLogicalOffset) const;
+
     void addForcedColumnBreak(int childY);
     

trunk/WebCore/rendering/RenderBlock.cpp

@@ -1245 +1245 @@
 
     if (view()->layoutState()->m_pageLogicalHeight)
-        setPageY(view()->layoutState()->pageY(y()));
+        setPageLogicalOffset(view()->layoutState()->pageLogicalOffset(y()));
 
     updateLayerTransform();
@@ -2137 +2137 @@
         return;
 
-    if (view()->layoutState()->pageLogicalHeightChanged() || (view()->layoutState()->pageLogicalHeight() && view()->layoutState()->pageY(y()) != pageY()))
+    if (view()->layoutState()->pageLogicalHeightChanged() || (view()->layoutState()->pageLogicalHeight() && view()->layoutState()->pageLogicalOffset(y()) != pageLogicalOffset()))
         setChildNeedsLayout(true, false);
 }
@@ -4239 +4239 @@
             if (!pageLogicalHeight) {
                 int distanceBetweenBreaks = max(colInfo->maximumDistanceBetweenForcedBreaks(),
-                                                view()->layoutState()->pageY(borderTop() + paddingTop() + contentHeight()) - colInfo->forcedBreakOffset());
+                                                view()->layoutState()->pageLogicalOffset(borderTop() + paddingTop() + contentHeight()) - colInfo->forcedBreakOffset());
                 columnHeight = max(colInfo->minimumColumnHeight(), distanceBetweenBreaks);
             }
@@ -5451 +5451 @@
 }
 
-void RenderBlock::setPageY(int y)
+void RenderBlock::setPageLogicalOffset(int logicalOffset)
 {
     if (!m_rareData) {
-        if (!y)
+        if (!logicalOffset)
             return;
         m_rareData = new RenderBlockRareData(this);
     }
-    m_rareData->m_pageY = y;
+    m_rareData->m_pageLogicalOffset = logicalOffset;
 }
 

trunk/WebCore/rendering/RenderBlock.h

@@ -154 +154 @@
 
     int paginationStrut() const { return m_rareData ? m_rareData->m_paginationStrut : 0; }
-    int pageY() const { return m_rareData ? m_rareData->m_pageY : 0; }
-    void setPaginationStrut(int strut);
-    void setPageY(int y);
+    void setPaginationStrut(int);
+    
+    // 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).
+    int pageLogicalOffset() const { return m_rareData ? m_rareData->m_pageLogicalOffset : 0; }
+    void setPageLogicalOffset(int);
 
     // Accessors for logical width/height and margins in the containing block's block-flow direction.
@@ -683 +686 @@
             : m_margins(positiveMarginBeforeDefault(block), negativeMarginBeforeDefault(block), positiveMarginAfterDefault(block), negativeMarginAfterDefault(block))
             , m_paginationStrut(0)
-            , m_pageY(0)
+            , m_pageLogicalOffset(0)
         { 
         }
@@ -707 +710 @@
         MarginValues m_margins;
         int m_paginationStrut;
-        int m_pageY;
+        int m_pageLogicalOffset;
      };
 

trunk/WebCore/rendering/RenderFlexibleBox.cpp

@@ -280 +280 @@
 
     if (view()->layoutState()->pageLogicalHeight())
-        setPageY(view()->layoutState()->pageY(y()));
+        setPageLogicalOffset(view()->layoutState()->pageLogicalOffset(y()));
 
     // Update our scrollbars if we're overflow:auto/scroll/hidden now that we know if

trunk/WebCore/rendering/RenderTable.cpp

@@ -392 +392 @@
 
     if (view()->layoutState()->pageLogicalHeight())
-        setPageY(view()->layoutState()->pageY(y()));
+        setPageLogicalOffset(view()->layoutState()->pageLogicalOffset(y()));
 
     bool didFullRepaint = repainter.repaintAfterLayout();

trunk/WebCore/rendering/RenderTableRow.cpp

@@ -123 +123 @@
         if (child->isTableCell()) {
             RenderTableCell* cell = toRenderTableCell(child);
-            if (!cell->needsLayout() && paginated && view()->layoutState()->pageLogicalHeight() && view()->layoutState()->pageY(cell->y()) != cell->pageY())
+            if (!cell->needsLayout() && paginated && view()->layoutState()->pageLogicalHeight() && view()->layoutState()->pageLogicalOffset(cell->y()) != cell->pageLogicalOffset())
                 cell->setChildNeedsLayout(true, false);
 

trunk/WebCore/rendering/RenderTableSection.cpp

@@ -615 +615 @@
                 cell->setNeedsLayout(true, false);
 
-            if (!cell->needsLayout() && view()->layoutState()->pageLogicalHeight() && view()->layoutState()->pageY(cell->y()) != cell->pageY())
+            if (!cell->needsLayout() && view()->layoutState()->pageLogicalHeight() && view()->layoutState()->pageLogicalOffset(cell->y()) != cell->pageLogicalOffset())
                 cell->setChildNeedsLayout(true, false);