Changeset 41876 in webkit

Timestamp:

Mar 20, 2009 4:41:54 PM (15 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Dave Hyatt.

• fix ​https://bugs.webkit.org/show_bug.cgi?id=23739 <rdar://problem/6556371> REGRESSION (r36513): iframe isn't sized properly upon load

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::percentHeightDescendants): Added this accessor.
• rendering/RenderBlock.h:
• rendering/RenderTableSection.cpp: (WebCore::RenderTableSection::layoutRows): Extended the check for children that flex to include other descendants with percent height which is relative to the cell.

LayoutTests:

Reviewed by Dave Hyatt.

• test, updated test and results for ​https://bugs.webkit.org/show_bug.cgi?id=23739 <rdar://problem/6556371> REGRESSION (r36513): iframe isn't sized properly upon load

• fast/replaced/percent-height-in-anonymous-block-in-table.html: Added.
• fast/replaced/table-percent-height-expected.txt:
• fast/replaced/table-percent-height.html:
• platform/mac/fast/replaced/percent-height-in-anonymous-block-in-table-expected.checksum: Added.
• platform/mac/fast/replaced/percent-height-in-anonymous-block-in-table-expected.png: Added.
• platform/mac/fast/replaced/percent-height-in-anonymous-block-in-table-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table.html (added)
• LayoutTests/fast/replaced/table-percent-height-expected.txt (modified) (1 diff)
• LayoutTests/fast/replaced/table-percent-height.html (modified) (1 diff)
• LayoutTests/platform/mac/fast/replaced/percent-height-in-anonymous-block-in-table-expected.checksum (added)
• LayoutTests/platform/mac/fast/replaced/percent-height-in-anonymous-block-in-table-expected.png (added)
• LayoutTests/platform/mac/fast/replaced/percent-height-in-anonymous-block-in-table-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBlock.cpp (modified) (1 diff)
• WebCore/rendering/RenderBlock.h (modified) (1 diff)
• WebCore/rendering/RenderTableSection.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-03-20  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        - test, updated test and results for https://bugs.webkit.org/show_bug.cgi?id=23739
+          <rdar://problem/6556371> REGRESSION (r36513): iframe isn't sized properly upon load
+
+        * fast/replaced/percent-height-in-anonymous-block-in-table.html: Added.
+        * fast/replaced/table-percent-height-expected.txt:
+        * fast/replaced/table-percent-height.html:
+        * platform/mac/fast/replaced/percent-height-in-anonymous-block-in-table-expected.checksum: Added.
+        * platform/mac/fast/replaced/percent-height-in-anonymous-block-in-table-expected.png: Added.
+        * platform/mac/fast/replaced/percent-height-in-anonymous-block-in-table-expected.txt: Added.
+
 2009-03-20  Dmitry Titov  <dimich@chromium.org>
 

trunk/LayoutTests/fast/replaced/table-percent-height-expected.txt

@@ -93 +93 @@
 PASS getComputedStyleForElement(document.getElementById('input-text-100'), 'height') is '13px'
 PASS getComputedStyleForElement(document.getElementById('isindex-75'), 'width') is '142px'
-PASS getComputedStyleForElement(document.getElementById('isindex-75'), 'height') is '13px'
+PASS getComputedStyleForElement(document.getElementById('isindex-75'), 'height') is '35px'
 PASS getComputedStyleForElement(document.getElementById('isindex-100'), 'width') is '142px'
-PASS getComputedStyleForElement(document.getElementById('isindex-100'), 'height') is '13px'
+PASS getComputedStyleForElement(document.getElementById('isindex-100'), 'height') is '49px'
 PASS getComputedStyleForElement(document.getElementById('select-75'), 'width') is '68px'
 PASS getComputedStyleForElement(document.getElementById('select-75'), 'height') is '18px'

trunk/LayoutTests/fast/replaced/table-percent-height.html

@@ -100 +100 @@
 
     shouldBe("getComputedStyleForElement(document.getElementById('isindex-75'), 'width')", "'142px'");
-    shouldBe("getComputedStyleForElement(document.getElementById('isindex-75'), 'height')", "'13px'");
+    shouldBe("getComputedStyleForElement(document.getElementById('isindex-75'), 'height')", "'35px'");
     shouldBe("getComputedStyleForElement(document.getElementById('isindex-100'), 'width')", "'142px'");
-    shouldBe("getComputedStyleForElement(document.getElementById('isindex-100'), 'height')", "'13px'");
+    shouldBe("getComputedStyleForElement(document.getElementById('isindex-100'), 'height')", "'49px'");
 
     shouldBe("getComputedStyleForElement(document.getElementById('select-75'), 'width')", "'68px'");

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-03-20  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        - fix https://bugs.webkit.org/show_bug.cgi?id=23739
+          <rdar://problem/6556371> REGRESSION (r36513): iframe isn't sized properly upon load
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::percentHeightDescendants): Added this accessor.
+        * rendering/RenderBlock.h:
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::layoutRows): Extended the check for
+        children that flex to include other descendants with percent height
+        which is relative to the cell.
+
 2009-03-20  Dmitry Titov  <dimich@chromium.org>
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -2529 +2529 @@
 
     delete containerSet;
+}
+
+HashSet<RenderBox*>* RenderBlock::percentHeightDescendants() const
+{
+    return gPercentHeightDescendantsMap ? gPercentHeightDescendantsMap->get(this) : 0;
 }
 

trunk/WebCore/rendering/RenderBlock.h

@@ -132 +132 @@
     void addPercentHeightDescendant(RenderBox*);
     static void removePercentHeightDescendant(RenderBox*);
+    HashSet<RenderBox*>* percentHeightDescendants() const;
 
     virtual void positionListMarker() { }

trunk/WebCore/rendering/RenderTableSection.cpp

@@ -538 +538 @@
 
             for (RenderObject* o = cell->firstChild(); o; o = o->nextSibling()) {
-                if (!o->isText() && o->style()->height().isPercent() && (o->isReplaced() || (o->isBox() && toRenderBox(o)->scrollsOverflow()) || flexAllChildren)) {
+                if (!o->isText() && o->style()->height().isPercent() && (flexAllChildren || o->isReplaced() || (o->isBox() && toRenderBox(o)->scrollsOverflow()))) {
                     // Tables with no sections do not flex.
                     if (!o->isTable() || static_cast<RenderTable*>(o)->hasSections()) {
                         o->setNeedsLayout(true, false);
-                        cell->setChildNeedsLayout(true, false);
                         cellChildrenFlex = true;
                     }
                 }
             }
-            
+
+            if (HashSet<RenderBox*>* percentHeightDescendants = cell->percentHeightDescendants()) {
+                HashSet<RenderBox*>::iterator end = percentHeightDescendants->end();
+                for (HashSet<RenderBox*>::iterator it = percentHeightDescendants->begin(); it != end; ++it) {
+                    RenderBox* box = *it;
+                    if (!box->isReplaced() && !box->scrollsOverflow() && !flexAllChildren)
+                        continue;
+
+                    while (box != cell) {
+                        if (box->normalChildNeedsLayout())
+                            break;
+                        box->setChildNeedsLayout(true, false);
+                        box = box->containingBlock();
+                        ASSERT(box);
+                        if (!box)
+                            break;
+                    }
+                    cellChildrenFlex = true;
+                }
+            }
+
             if (cellChildrenFlex) {
+                cell->setChildNeedsLayout(true, false);
                 // Alignment within a cell is based off the calculated
                 // height, which becomes irrelevant once the cell has