Changeset 90668 in webkit

Timestamp:

Jul 8, 2011 3:15:14 PM (13 years ago)

Author:

tony@chromium.org

Message:

Refactor override size to be a size rather than just an int
​https://bugs.webkit.org/show_bug.cgi?id=64195

Reviewed by David Hyatt.

Also convert to LayoutSize and LayoutUnit.

Covered by existing tests.

• rendering/RenderBox.cpp:

(WebCore::RenderBox::overrideSize): Pass in a LayoutSize.
(WebCore::RenderBox::setOverrideSize):
(WebCore::RenderBox::clearOverrideSize): New method for clearing the

override size (previous we would pass in -1)

(WebCore::RenderBox::overrideWidth):
(WebCore::RenderBox::overrideHeight):
(WebCore::RenderBox::computeLogicalWidth):
(WebCore::RenderBox::computeLogicalHeight):
(WebCore::RenderBox::computePercentageLogicalHeight):
(WebCore::RenderBox::availableLogicalHeightUsing):

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

(WebCore::gatherFlexChildrenInfo):
(WebCore::RenderDeprecatedFlexibleBox::layoutHorizontalBox):
(WebCore::RenderDeprecatedFlexibleBox::layoutVerticalBox):
(WebCore::RenderDeprecatedFlexibleBox::applyLineClamp):

• rendering/RenderTableCell.cpp:

(WebCore::RenderTableCell::setOverrideSizeFromRowHeight):

• rendering/RenderTableCell.h: Remove setOverrideSize since it was

only called in one place to clear the override size. Inline this
logic instead.

• rendering/RenderTableSection.cpp:

(WebCore::RenderTableSection::calcRowLogicalHeight):

• rendering/RenderWidget.cpp:

(WebCore::RenderWidget::destroy):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (7 diffs)
• rendering/RenderBox.h (modified) (1 diff)
• rendering/RenderDeprecatedFlexibleBox.cpp (modified) (6 diffs)
• rendering/RenderTableCell.cpp (modified) (1 diff)
• rendering/RenderTableCell.h (modified) (1 diff)
• rendering/RenderTableSection.cpp (modified) (2 diffs)
• rendering/RenderWidget.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-08  Tony Chang  <tony@chromium.org>
+
+        Refactor override size to be a size rather than just an int
+        https://bugs.webkit.org/show_bug.cgi?id=64195
+
+        Reviewed by David Hyatt.
+
+        Also convert to LayoutSize and LayoutUnit.
+
+        Covered by existing tests.
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::overrideSize): Pass in a LayoutSize.
+        (WebCore::RenderBox::setOverrideSize):
+        (WebCore::RenderBox::clearOverrideSize): New method for clearing the
+            override size (previous we would pass in -1)
+        (WebCore::RenderBox::overrideWidth):
+        (WebCore::RenderBox::overrideHeight):
+        (WebCore::RenderBox::computeLogicalWidth):
+        (WebCore::RenderBox::computeLogicalHeight):
+        (WebCore::RenderBox::computePercentageLogicalHeight):
+        (WebCore::RenderBox::availableLogicalHeightUsing):
+        * rendering/RenderBox.h:
+        * rendering/RenderDeprecatedFlexibleBox.cpp:
+        (WebCore::gatherFlexChildrenInfo):
+        (WebCore::RenderDeprecatedFlexibleBox::layoutHorizontalBox):
+        (WebCore::RenderDeprecatedFlexibleBox::layoutVerticalBox):
+        (WebCore::RenderDeprecatedFlexibleBox::applyLineClamp):
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::setOverrideSizeFromRowHeight):
+        * rendering/RenderTableCell.h: Remove setOverrideSize since it was
+            only called in one place to clear the override size.  Inline this
+            logic instead.
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::calcRowLogicalHeight):
+        * rendering/RenderWidget.cpp:
+        (WebCore::RenderWidget::destroy):
+
 2011-07-08  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -59 +59 @@
 using namespace HTMLNames;
 
-// Used by flexible boxes when flexing this element.
-typedef WTF::HashMap<const RenderBox*, int> OverrideSizeMap;
+// Used by flexible boxes when flexing this element and by table cells.
+typedef WTF::HashMap<const RenderBox*, LayoutSize> OverrideSizeMap;
 static OverrideSizeMap* gOverrideSizeMap = 0;
 
@@ -687 +687 @@
 }
 
-int RenderBox::overrideSize() const
+LayoutSize RenderBox::overrideSize() const
 {
     if (!hasOverrideSize())
-        return -1;
+        return LayoutSize(-1, -1);
     return gOverrideSizeMap->get(this);
 }
 
-void RenderBox::setOverrideSize(int s)
-{
-    if (s == -1) {
-        if (hasOverrideSize()) {
-            setHasOverrideSize(false);
-            gOverrideSizeMap->remove(this);
-        }
-    } else {
-        if (!gOverrideSizeMap)
-            gOverrideSizeMap = new OverrideSizeMap();
-        setHasOverrideSize(true);
-        gOverrideSizeMap->set(this, s);
-    }
-}
-
-int RenderBox::overrideWidth() const
-{
-    return hasOverrideSize() ? overrideSize() : width();
-}
-
-int RenderBox::overrideHeight() const
-{
-    return hasOverrideSize() ? overrideSize() : height();
+void RenderBox::setOverrideSize(const LayoutSize& size)
+{
+    if (!gOverrideSizeMap)
+        gOverrideSizeMap = new OverrideSizeMap();
+    setHasOverrideSize(true);
+    gOverrideSizeMap->set(this, size);
+}
+
+void RenderBox::clearOverrideSize()
+{
+    if (!hasOverrideSize())
+        return;
+    setHasOverrideSize(false);
+    gOverrideSizeMap->remove(this);
+}
+
+LayoutUnit RenderBox::overrideWidth() const
+{
+    return hasOverrideSize() ? overrideSize().width() : width();
+}
+
+LayoutUnit RenderBox::overrideHeight() const
+{
+    return hasOverrideSize() ? overrideSize().height() : height();
 }
 
@@ -1555 +1556 @@
     if (hasOverrideSize() &&  parent()->style()->boxOrient() == HORIZONTAL
             && parent()->isFlexibleBox() && parent()->isFlexingChildren()) {
-        setLogicalWidth(overrideSize());
+        setLogicalWidth(overrideWidth());
         return;
     }
@@ -1769 +1770 @@
         if (hasOverrideSize() && parent()->isFlexibleBox() && parent()->style()->boxOrient() == VERTICAL
                 && parent()->isFlexingChildren())
-            h = Length(overrideSize() - borderAndPaddingLogicalHeight(), Fixed);
+            h = Length(overrideHeight() - borderAndPaddingLogicalHeight(), Fixed);
         else if (treatAsReplaced)
             h = Length(computeReplacedLogicalHeight(), Fixed);
@@ -1887 +1888 @@
     if (cb->isTableCell()) {
         if (!skippedAutoHeightContainingBlock) {
-            result = cb->overrideSize();
-            if (result == -1) {
+            if (!cb->hasOverrideSize()) {
                 // Normally we would let the cell size intrinsically, but scrolling overflow has to be
                 // treated differently, since WinIE lets scrolled overflow regions shrink as needed.
@@ -1901 +1901 @@
                 return -1;
             }
+            result = cb->overrideHeight();
             includeBorderPadding = true;
         }
@@ -2053 +2054 @@
     // height, and then when we lay out again we'll use the calculation below.
     if (isTableCell() && (h.isAuto() || h.isPercent()))
-        return overrideSize() - borderAndPaddingLogicalWidth();
+        return overrideHeight() - borderAndPaddingLogicalWidth();
 
     if (h.isPercent())

trunk/Source/WebCore/rendering/RenderBox.h

@@ -245 +245 @@
     virtual int maxPreferredLogicalWidth() const;
 
-    int overrideSize() const;
-    int overrideWidth() const;
-    int overrideHeight() const;
-    virtual void setOverrideSize(int);
+    LayoutSize overrideSize() const;
+    LayoutUnit overrideWidth() const;
+    LayoutUnit overrideHeight() const;
+    void setOverrideSize(const LayoutSize&);
+    void clearOverrideSize();
 
     virtual LayoutSize offsetFromContainer(RenderObject*, const LayoutPoint&) const;

trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp

@@ -294 +294 @@
             // We always have to lay out flexible objects again, since the flex distribution
             // may have changed, and we need to reallocate space.
-            child->setOverrideSize(-1);
+            child->clearOverrideSize();
             if (!relayoutChildren)
                 child->setChildNeedsLayout(true, false);
@@ -497 +497 @@
                             int spaceAdd = (int)(spaceAvailableThisPass * (child->style()->boxFlex()/totalFlex));
                             if (spaceAdd) {
-                                child->setOverrideSize(child->overrideWidth() + spaceAdd);
+                                child->setOverrideSize(LayoutSize(child->overrideWidth() + spaceAdd, 0));
                                 m_flexingChildren = true;
                                 relayoutChildren = true;
@@ -514 +514 @@
                         for (RenderBox* child = iterator.first(); child && groupRemainingSpace; child = iterator.next()) {
                             if (allowedChildFlex(child, expanding, i)) {
-                                child->setOverrideSize(child->overrideWidth() + spaceAdd);
+                                child->setOverrideSize(LayoutSize(child->overrideWidth() + spaceAdd, 0));
                                 m_flexingChildren = true;
                                 relayoutChildren = true;
@@ -743 +743 @@
                             int spaceAdd = (int)(spaceAvailableThisPass * (child->style()->boxFlex()/totalFlex));
                             if (spaceAdd) {
-                                child->setOverrideSize(child->overrideHeight() + spaceAdd);
+                                child->setOverrideSize(LayoutSize(0, child->overrideHeight() + spaceAdd));
                                 m_flexingChildren = true;
                                 relayoutChildren = true;
@@ -760 +760 @@
                         for (RenderBox* child = iterator.first(); child && groupRemainingSpace; child = iterator.next()) {
                             if (allowedChildFlex(child, expanding, i)) {
-                                child->setOverrideSize(child->overrideHeight() + spaceAdd);
+                                child->setOverrideSize(LayoutSize(0, child->overrideHeight() + spaceAdd));
                                 m_flexingChildren = true;
                                 relayoutChildren = true;
@@ -874 +874 @@
 
         child->setChildNeedsLayout(true, false);
-        child->setOverrideSize(newHeight);
+        child->setOverrideSize(LayoutSize(0, newHeight));
         m_flexingChildren = true;
         child->layoutIfNeeded();
         m_flexingChildren = false;
-        child->setOverrideSize(-1);
+        child->clearOverrideSize();
 
         // FIXME: For now don't support RTL.

trunk/Source/WebCore/rendering/RenderTableCell.cpp

@@ -213 +213 @@
 }
 
-void RenderTableCell::setOverrideSize(int size)
+void RenderTableCell::setOverrideSizeFromRowHeight(int rowHeight)
 {
     clearIntrinsicPadding();
-    RenderBlock::setOverrideSize(size);
-}
-    
-void RenderTableCell::setOverrideSizeFromRowHeight(int rowHeight)
-{
-    clearIntrinsicPadding();
-    RenderBlock::setOverrideSize(max(0, rowHeight - borderBefore() - paddingBefore() - borderAfter() - paddingAfter()));
+    RenderBlock::setOverrideSize(LayoutSize(0, max(0, rowHeight - borderBefore() - paddingBefore() - borderAfter() - paddingAfter())));
 }
 

trunk/Source/WebCore/rendering/RenderTableCell.h

@@ -120 +120 @@
     virtual int paddingAfter(bool includeIntrinsicPadding = true) const;
 
-    virtual void setOverrideSize(int);
     void setOverrideSizeFromRowHeight(int);
 

trunk/Source/WebCore/rendering/RenderTableSection.cpp

@@ -336 +336 @@
             int indx = max(r - cell->rowSpan() + 1, 0);
 
-            if (cell->overrideSize() != -1) {
+            if (cell->hasOverrideSize()) {
                 if (!statePusher.didPush()) {
                     // Technically, we should also push state for the row, but since
@@ -342 +342 @@
                     statePusher.push(this, IntSize(x(), y()));
                 }
-                cell->setOverrideSize(-1);
+                cell->clearIntrinsicPadding();
+                cell->clearOverrideSize();
                 cell->setChildNeedsLayout(true, false);
                 cell->layoutIfNeeded();

trunk/Source/WebCore/rendering/RenderWidget.cpp

@@ -140 +140 @@
     // removes from override size map
     if (hasOverrideSize())
-        setOverrideSize(-1);
+        clearOverrideSize();
 
     if (style() && (style()->logicalHeight().isPercent() || style()->logicalMinHeight().isPercent() || style()->logicalMaxHeight().isPercent()))