Changeset 90833 in webkit

Timestamp:

Jul 12, 2011 11:42:18 AM (13 years ago)

Author:

eae@chromium.org

Message:

Switch preferred width/height and columns to to new layout types
​https://bugs.webkit.org/show_bug.cgi?id=64329

Reviewed by Eric Seidel.

No new tests, no new functionality.

• rendering/LayoutTypes.h:

(WebCore::ceiledLayoutUnit):
Add ceiledLayoutUnit to go with the floored version.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::adjustRectForColumns):
(WebCore::RenderBlock::flipForWritingModeIncludingColumns):
(WebCore::RenderBlock::adjustStartEdgeForWritingModeIncludingColumns):
Rename rect version of flipForWritingModeIncludingColumns to
adjustStartEdgeForWritingModeIncludingColumns as it adjust the start edge
and does not flip the rect.

(WebCore::RenderBlock::adjustForColumns):
(WebCore::updatePreferredWidth):

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

(WebCore::RenderBox::minPreferredLogicalWidth):
(WebCore::RenderBox::maxPreferredLogicalWidth):
(WebCore::RenderBox::offsetFromContainer):
(WebCore::RenderBox::computePercentageLogicalHeight):
(WebCore::RenderBox::flipForWritingMode):
(WebCore::RenderBox::flipForWritingModeIncludingColumns):

• rendering/RenderBox.h:
• rendering/RenderListBox.cpp:

(WebCore::RenderListBox::itemBoundingBoxRect):

• rendering/RenderListBox.h:
• rendering/RenderObject.h:

(WebCore::RenderObject::minPreferredLogicalWidth):
(WebCore::RenderObject::maxPreferredLogicalWidth):
(WebCore::RenderObject::adjustForColumns):

• rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::computeReplacedLogicalWidth):
(WebCore::RenderReplaced::computeReplacedLogicalHeight):

• rendering/TableLayout.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/LayoutTypes.h (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (9 diffs)
• rendering/RenderBlock.h (modified) (2 diffs)
• rendering/RenderBox.cpp (modified) (7 diffs)
• rendering/RenderBox.h (modified) (3 diffs)
• rendering/RenderListBox.cpp (modified) (1 diff)
• rendering/RenderListBox.h (modified) (1 diff)
• rendering/RenderObject.h (modified) (2 diffs)
• rendering/RenderReplaced.cpp (modified) (2 diffs)
• rendering/TableLayout.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-12  Emil A Eklund  <eae@chromium.org>
+
+        Switch preferred width/height and columns to to new layout types
+        https://bugs.webkit.org/show_bug.cgi?id=64329
+
+        Reviewed by Eric Seidel.
+
+        No new tests, no new functionality.
+
+        * rendering/LayoutTypes.h:
+        (WebCore::ceiledLayoutUnit):
+        Add ceiledLayoutUnit to go with the floored version.
+        
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::adjustRectForColumns):
+        (WebCore::RenderBlock::flipForWritingModeIncludingColumns):
+        (WebCore::RenderBlock::adjustStartEdgeForWritingModeIncludingColumns):
+        Rename rect version of flipForWritingModeIncludingColumns to
+        adjustStartEdgeForWritingModeIncludingColumns as it adjust the start edge
+        and does not flip the rect.
+       
+        (WebCore::RenderBlock::adjustForColumns):
+        (WebCore::updatePreferredWidth):
+        * rendering/RenderBlock.h:
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::minPreferredLogicalWidth):
+        (WebCore::RenderBox::maxPreferredLogicalWidth):
+        (WebCore::RenderBox::offsetFromContainer):
+        (WebCore::RenderBox::computePercentageLogicalHeight):
+        (WebCore::RenderBox::flipForWritingMode):
+        (WebCore::RenderBox::flipForWritingModeIncludingColumns):
+        * rendering/RenderBox.h:
+        * rendering/RenderListBox.cpp:
+        (WebCore::RenderListBox::itemBoundingBoxRect):
+        * rendering/RenderListBox.h:
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::minPreferredLogicalWidth):
+        (WebCore::RenderObject::maxPreferredLogicalWidth):
+        (WebCore::RenderObject::adjustForColumns):
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::computeReplacedLogicalWidth):
+        (WebCore::RenderReplaced::computeReplacedLogicalHeight):
+        * rendering/TableLayout.h:
+
 2011-07-12  Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WebCore/rendering/LayoutTypes.h

@@ -72 +72 @@
 }
 
+inline LayoutUnit ceiledLayoutUnit(float value)
+{
+    return ceilf(value);
+}
+
 inline LayoutSize toLayoutSize(const LayoutPoint& p)
 {

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -4495 +4495 @@
 }
 
-void RenderBlock::adjustRectForColumns(IntRect& r) const
+void RenderBlock::adjustRectForColumns(LayoutRect& r) const
 {
     // Just bail if we have no columns.
@@ -4504 +4504 @@
 
     // Begin with a result rect that is empty.
-    IntRect result;
+    LayoutRect result;
     
     // Determine which columns we intersect.
@@ -4511 +4511 @@
         return;
     
-    int logicalLeft = logicalLeftOffsetForContent();
-    int currLogicalOffset = 0;
+    LayoutUnit logicalLeft = logicalLeftOffsetForContent();
+    LayoutUnit currLogicalOffset = 0;
 
     for (unsigned i = 0; i < colCount; i++) {
-        IntRect colRect = columnRectAt(colInfo, i);
-        IntRect repaintRect = r;
+        LayoutRect colRect = columnRectAt(colInfo, i);
+        LayoutRect repaintRect = r;
         if (isHorizontalWritingMode()) {
-            int currXOffset = colRect.x() - logicalLeft;
+            LayoutUnit currXOffset = colRect.x() - logicalLeft;
             repaintRect.move(currXOffset, currLogicalOffset);
             currLogicalOffset -= colRect.height();
         } else {
-            int currYOffset = colRect.y() - logicalLeft;
+            LayoutUnit currYOffset = colRect.y() - logicalLeft;
             repaintRect.move(currLogicalOffset, currYOffset);
             currLogicalOffset -= colRect.width();
@@ -4533 +4533 @@
 }
 
-IntPoint RenderBlock::flipForWritingModeIncludingColumns(const IntPoint& point) const
+LayoutPoint RenderBlock::flipForWritingModeIncludingColumns(const LayoutPoint& point) const
 {
     ASSERT(hasColumns());
@@ -4539 +4539 @@
         return point;
     ColumnInfo* colInfo = columnInfo();
-    int columnLogicalHeight = colInfo->columnHeight();
-    int expandedLogicalHeight = borderBefore() + paddingBefore() + columnCount(colInfo) * columnLogicalHeight + borderAfter() + paddingAfter() + scrollbarLogicalHeight();
+    LayoutUnit columnLogicalHeight = colInfo->columnHeight();
+    LayoutUnit expandedLogicalHeight = borderBefore() + paddingBefore() + columnCount(colInfo) * columnLogicalHeight + borderAfter() + paddingAfter() + scrollbarLogicalHeight();
     if (isHorizontalWritingMode())
-        return IntPoint(point.x(), expandedLogicalHeight - point.y());
-    return IntPoint(expandedLogicalHeight - point.x(), point.y());
-}
-
-void RenderBlock::flipForWritingModeIncludingColumns(IntRect& rect) const
+        return LayoutPoint(point.x(), expandedLogicalHeight - point.y());
+    return LayoutPoint(expandedLogicalHeight - point.x(), point.y());
+}
+
+void RenderBlock::adjustStartEdgeForWritingModeIncludingColumns(LayoutRect& rect) const
 {
     ASSERT(hasColumns());
@@ -4553 +4553 @@
     
     ColumnInfo* colInfo = columnInfo();
-    int columnLogicalHeight = colInfo->columnHeight();
-    int expandedLogicalHeight = borderBefore() + paddingBefore() + columnCount(colInfo) * columnLogicalHeight + borderAfter() + paddingAfter() + scrollbarLogicalHeight();
+    LayoutUnit columnLogicalHeight = colInfo->columnHeight();
+    LayoutUnit expandedLogicalHeight = borderBefore() + paddingBefore() + columnCount(colInfo) * columnLogicalHeight + borderAfter() + paddingAfter() + scrollbarLogicalHeight();
+    
     if (isHorizontalWritingMode())
         rect.setY(expandedLogicalHeight - rect.maxY());
@@ -4561 +4562 @@
 }
 
-void RenderBlock::adjustForColumns(IntSize& offset, const IntPoint& point) const
+void RenderBlock::adjustForColumns(LayoutSize& offset, const LayoutPoint& point) const
 {
     if (!hasColumns())
@@ -4568 +4569 @@
     ColumnInfo* colInfo = columnInfo();
 
-    int logicalLeft = logicalLeftOffsetForContent();
+    LayoutUnit logicalLeft = logicalLeftOffsetForContent();
     size_t colCount = columnCount(colInfo);
-    int colLogicalWidth = colInfo->desiredColumnWidth();
-    int colLogicalHeight = colInfo->columnHeight();
+    LayoutUnit colLogicalWidth = colInfo->desiredColumnWidth();
+    LayoutUnit colLogicalHeight = colInfo->columnHeight();
 
     for (size_t i = 0; i < colCount; ++i) {
         // Compute the edges for a given column in the block progression direction.
-        IntRect sliceRect = IntRect(logicalLeft, borderBefore() + paddingBefore() + i * colLogicalHeight, colLogicalWidth, colLogicalHeight);
+        LayoutRect sliceRect = LayoutRect(logicalLeft, borderBefore() + paddingBefore() + i * colLogicalHeight, colLogicalWidth, colLogicalHeight);
         if (!isHorizontalWritingMode())
             sliceRect = sliceRect.transposedRect();
         
         // If we have a flipped blocks writing mode, then convert the column so that it's coming from the after edge (either top or left edge).
-        flipForWritingModeIncludingColumns(sliceRect);
+        adjustStartEdgeForWritingModeIncludingColumns(sliceRect);
         
-        int logicalOffset = style()->isFlippedBlocksWritingMode() ? (colCount - 1 - i) * colLogicalHeight : i * colLogicalHeight;
+        LayoutUnit logicalOffset = style()->isFlippedBlocksWritingMode() ? (colCount - 1 - i) * colLogicalHeight : i * colLogicalHeight;
 
         // Now we're in the same coordinate space as the point.  See if it is inside the rectangle.
@@ -4759 +4760 @@
 }
 
-static inline void updatePreferredWidth(int& preferredWidth, float& result)
-{
-    int snappedResult = ceilf(result);
+static inline void updatePreferredWidth(LayoutUnit& preferredWidth, float& result)
+{
+    LayoutUnit snappedResult = ceiledLayoutUnit(result);
     preferredWidth = max(snappedResult, preferredWidth);
 }

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -128 +128 @@
     virtual LayoutUnit availableLogicalWidth() const;
 
-    IntPoint flipForWritingModeIncludingColumns(const IntPoint&) const;
-    void flipForWritingModeIncludingColumns(IntRect&) const;
+    LayoutPoint flipForWritingModeIncludingColumns(const LayoutPoint&) const;
+    void adjustStartEdgeForWritingModeIncludingColumns(LayoutRect&) const;
 
     RootInlineBox* firstRootBox() const { return static_cast<RootInlineBox*>(firstLineBox()); }
@@ -150 +150 @@
     void clearTruncation();
 
-    void adjustRectForColumns(IntRect&) const;
-    virtual void adjustForColumns(IntSize&, const IntPoint&) const;
+    void adjustRectForColumns(LayoutRect&) const;
+    virtual void adjustForColumns(LayoutSize&, const LayoutPoint&) const;
 
     void addContinuationWithOutline(RenderInline*);

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -668 +668 @@
 }
 
-int RenderBox::minPreferredLogicalWidth() const
+LayoutUnit RenderBox::minPreferredLogicalWidth() const
 {
     if (preferredLogicalWidthsDirty())
@@ -676 +676 @@
 }
 
-int RenderBox::maxPreferredLogicalWidth() const
+LayoutUnit RenderBox::maxPreferredLogicalWidth() const
 {
     if (preferredLogicalWidthsDirty())
@@ -1299 +1299 @@
             if (o->hasColumns()) {
                 LayoutRect columnRect(frameRect());
-                toRenderBlock(o)->flipForWritingModeIncludingColumns(columnRect);
+                toRenderBlock(o)->adjustStartEdgeForWritingModeIncludingColumns(columnRect);
                 offset += LayoutSize(columnRect.location().x(), columnRect.location().y());
                 columnRect.moveBy(point);
@@ -1928 +1928 @@
             // table cells using percentage heights.
             result -= borderAndPaddingLogicalHeight();
-            result = max(0, result);
+            result = max<LayoutUnit>(0, result);
         }
     }
@@ -3394 +3394 @@
 }
 
-IntPoint RenderBox::flipForWritingMode(const RenderBox* child, const IntPoint& point, FlippingAdjustment adjustment) const
+LayoutPoint RenderBox::flipForWritingMode(const RenderBox* child, const LayoutPoint& point, FlippingAdjustment adjustment) const
 {
     if (!style()->isFlippedBlocksWritingMode())
@@ -3402 +3402 @@
     // the right place.
     if (isHorizontalWritingMode())
-        return IntPoint(point.x(), point.y() + height() - child->height() - child->y() - (adjustment == ParentToChildFlippingAdjustment ? child->y() : 0));
-    return IntPoint(point.x() + width() - child->width() - child->x() - (adjustment == ParentToChildFlippingAdjustment ? child->x() : 0), point.y());
+        return LayoutPoint(point.x(), point.y() + height() - child->height() - child->y() - (adjustment == ParentToChildFlippingAdjustment ? child->y() : 0));
+    return LayoutPoint(point.x() + width() - child->width() - child->x() - (adjustment == ParentToChildFlippingAdjustment ? child->x() : 0), point.y());
 }
 
@@ -3431 +3431 @@
 }
 
-IntPoint RenderBox::flipForWritingModeIncludingColumns(const IntPoint& point) const
+LayoutPoint RenderBox::flipForWritingModeIncludingColumns(const LayoutPoint& point) const
 {
     if (!hasColumns() || !style()->isFlippedBlocksWritingMode())

trunk/Source/WebCore/rendering/RenderBox.h

@@ -240 +240 @@
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
 
-    virtual int minPreferredLogicalWidth() const;
-    virtual int maxPreferredLogicalWidth() const;
+    virtual LayoutUnit minPreferredLogicalWidth() const;
+    virtual LayoutUnit maxPreferredLogicalWidth() const;
 
     LayoutSize overrideSize() const;
@@ -389 +389 @@
 
     enum FlippingAdjustment { ChildToParentFlippingAdjustment, ParentToChildFlippingAdjustment };
-    IntPoint flipForWritingMode(const RenderBox* child, const IntPoint&, FlippingAdjustment) const;
+    LayoutPoint flipForWritingMode(const RenderBox* child, const LayoutPoint&, FlippingAdjustment) const;
     int flipForWritingMode(int position) const; // The offset is in the block direction (y for horizontal writing modes, x for vertical writing modes).
     IntPoint flipForWritingMode(const IntPoint&) const;
-    IntPoint flipForWritingModeIncludingColumns(const IntPoint&) const;
+    LayoutPoint flipForWritingModeIncludingColumns(const LayoutPoint&) const;
     IntSize flipForWritingMode(const IntSize&) const;
     void flipForWritingMode(IntRect&) const;
@@ -475 +475 @@
 
     // The preferred logical width of the element if it were to break its lines at every possible opportunity.
-    int m_minPreferredLogicalWidth;
+    LayoutUnit m_minPreferredLogicalWidth;
     
     // The preferred logical width of the element if it never breaks any lines at all.
-    int m_maxPreferredLogicalWidth;
+    LayoutUnit m_maxPreferredLogicalWidth;
 
     // For inline replaced elements, the inline box that owns us.

trunk/Source/WebCore/rendering/RenderListBox.cpp

@@ -255 +255 @@
 }
 
-IntRect RenderListBox::itemBoundingBoxRect(const IntPoint& additionalOffset, int index)
+IntRect RenderListBox::itemBoundingBoxRect(const LayoutPoint& additionalOffset, int index)
 {
     return IntRect(additionalOffset.x() + borderLeft() + paddingLeft(),

trunk/Source/WebCore/rendering/RenderListBox.h

@@ -47 +47 @@
 
     int listIndexAtOffset(int x, int y);
-    IntRect itemBoundingBoxRect(const IntPoint&, int index);
+    IntRect itemBoundingBoxRect(const LayoutPoint&, int index);
 
     bool scrollToRevealElementAtListIndex(int index);

trunk/Source/WebCore/rendering/RenderObject.h

@@ -605 +605 @@
     LayoutRect paintingRootRect(LayoutRect& topLevelRect);
 
-    virtual int minPreferredLogicalWidth() const { return 0; }
-    virtual int maxPreferredLogicalWidth() const { return 0; }
+    virtual LayoutUnit minPreferredLogicalWidth() const { return 0; }
+    virtual LayoutUnit maxPreferredLogicalWidth() const { return 0; }
 
     RenderStyle* style() const { return m_style.get(); }
@@ -670 +670 @@
     // If multiple-column layout results in applying an offset to the given point, add the same
     // offset to the given size.
-    virtual void adjustForColumns(IntSize&, const IntPoint&) const { }
+    virtual void adjustForColumns(LayoutSize&, const LayoutPoint&) const { }
 
     virtual unsigned int length() const { return 1; }

trunk/Source/WebCore/rendering/RenderReplaced.cpp

@@ -220 +220 @@
 }
 
-int RenderReplaced::computeReplacedLogicalWidth(bool includeMaxWidth) const
+LayoutUnit RenderReplaced::computeReplacedLogicalWidth(bool includeMaxWidth) const
 {
     if (style()->logicalWidth().isSpecified())
@@ -305 +305 @@
 }
 
-int RenderReplaced::computeReplacedLogicalHeight() const
+LayoutUnit RenderReplaced::computeReplacedLogicalHeight() const
 {
     // 10.5 Content height: the 'height' property: http://www.w3.org/TR/CSS21/visudet.html#propdef-height

trunk/Source/WebCore/rendering/TableLayout.h

@@ -39 +39 @@
     virtual ~TableLayout() { }
 
-    virtual void computePreferredLogicalWidths(int& minWidth, int& maxWidth) = 0;
+    virtual void computePreferredLogicalWidths(LayoutUnit& minWidth, LayoutUnit& maxWidth) = 0;
     virtual void layout() = 0;