Changeset 135741 in webkit

Timestamp:

Nov 26, 2012, 11:07:20 AM (12 years ago)

Author:

jchaffraix@webkit.org

Message:

RenderBox::computePercentageLogicalHeight should use containingBlockLogicalWidthForContent
​https://bugs.webkit.org/show_bug.cgi?id=103075

Reviewed by Ojan Vafai.

Source/WebCore:

Using the containing block's content logical block was working for most renderers but 2 renderers
were special and were broken in orthogonal writing modes:

• captions as they override containingBlockLogicalWidthForContent to return the table's logical width.
• multi-column renderers as they override availableLogicalWidth to constrain the child to the column logical width.

By switching to containingBlockLogicalWidthForContent, we got those 2 cases covered.

Tests: fast/multicol/fixed-column-percent-logical-height-orthogonal-writing-mode.html

fast/table/caption-orthogonal-writing-mode-sizing.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::computePercentageLogicalHeight):
Updated the function to track which renderer's containing block we use and call
containingBlockLogicalWidthForContent on it.

LayoutTests:

• fast/multicol/fixed-column-percent-logical-height-orthogonal-writing-mode-expected.txt: Added.
• fast/multicol/fixed-column-percent-logical-height-orthogonal-writing-mode.html: Added.
• fast/table/caption-orthogonal-writing-mode-sizing-expected.txt: Added.
• fast/table/caption-orthogonal-writing-mode-sizing.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/multicol/fixed-column-percent-logical-height-orthogonal-writing-mode-expected.txt (added)
• LayoutTests/fast/multicol/fixed-column-percent-logical-height-orthogonal-writing-mode.html (added)
• LayoutTests/fast/table/caption-orthogonal-writing-mode-sizing-expected.txt (added)
• LayoutTests/fast/table/caption-orthogonal-writing-mode-sizing.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-11-26  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        RenderBox::computePercentageLogicalHeight should use containingBlockLogicalWidthForContent
+        https://bugs.webkit.org/show_bug.cgi?id=103075
+
+        Reviewed by Ojan Vafai.
+
+        * fast/multicol/fixed-column-percent-logical-height-orthogonal-writing-mode-expected.txt: Added.
+        * fast/multicol/fixed-column-percent-logical-height-orthogonal-writing-mode.html: Added.
+        * fast/table/caption-orthogonal-writing-mode-sizing-expected.txt: Added.
+        * fast/table/caption-orthogonal-writing-mode-sizing.html: Added.
+
 2012-11-26  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-26  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        RenderBox::computePercentageLogicalHeight should use containingBlockLogicalWidthForContent
+        https://bugs.webkit.org/show_bug.cgi?id=103075
+
+        Reviewed by Ojan Vafai.
+
+        Using the containing block's content logical block was working for most renderers but 2 renderers
+        were special and were broken in orthogonal writing modes:
+        - captions as they override containingBlockLogicalWidthForContent to return the table's logical width.
+        - multi-column renderers as they override availableLogicalWidth to constrain the child to the column logical width.
+
+        By switching to containingBlockLogicalWidthForContent, we got those 2 cases covered.
+
+        Tests: fast/multicol/fixed-column-percent-logical-height-orthogonal-writing-mode.html
+               fast/table/caption-orthogonal-writing-mode-sizing.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computePercentageLogicalHeight):
+        Updated the function to track which renderer's containing block we use and call
+        containingBlockLogicalWidthForContent on it.
+
 2012-11-26  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -2195 +2195 @@
     bool skippedAutoHeightContainingBlock = false;
     RenderBlock* cb = containingBlock();
+    const RenderBox* containingBlockChild = this;
     LayoutUnit rootMarginBorderPaddingHeight = 0;
     while (!cb->isRenderView() && skipContainingBlockForPercentHeightCalculation(cb)) {
@@ -2200 +2201 @@
             rootMarginBorderPaddingHeight += cb->marginBefore() + cb->marginAfter() + cb->borderAndPaddingLogicalHeight();
         skippedAutoHeightContainingBlock = true;
+        containingBlockChild = cb;
         cb = cb->containingBlock();
         cb->addPercentHeightDescendant(const_cast<RenderBox*>(this));
@@ -2215 +2217 @@
 
     if (isHorizontalWritingMode() != cb->isHorizontalWritingMode())
-        availableHeight = cb->contentLogicalWidth();
+        availableHeight = containingBlockChild->containingBlockLogicalWidthForContent();
     else if (cb->isTableCell()) {
         if (!skippedAutoHeightContainingBlock) {