diff --git a/layout/generic/ReflowInput.cpp b/layout/generic/ReflowInput.cpp index 04ee250decd6..f71569fd4f11 100644 --- a/layout/generic/ReflowInput.cpp +++ b/layout/generic/ReflowInput.cpp @@ -2652,8 +2652,9 @@ void ReflowInput::CalculateBlockSideMargins(LayoutFrameType aFrameType) { nscoord computedISizeCBWM = ComputedSize(cbWM).ISize(cbWM); if (computedISizeCBWM == NS_UNCONSTRAINEDSIZE) { // For orthogonal flows, where we found a parent orthogonal-limit - // for AvailableISize() in Init(), we'll use the same here as well. - computedISizeCBWM = availISizeCBWM; + // for AvailableISize() in Init(), we don't have meaningful sizes to + // adjust. Act like the sum is already correct (below). + return; } LAYOUT_WARN_IF_FALSE(NS_UNCONSTRAINEDSIZE != computedISizeCBWM && diff --git a/layout/reftests/w3c-css/failures.list b/layout/reftests/w3c-css/failures.list index 982a805839f0..24c3185c2c1f 100644 --- a/layout/reftests/w3c-css/failures.list +++ b/layout/reftests/w3c-css/failures.list @@ -140,21 +140,10 @@ skip css-writing-modes/abs-pos-non-replaced-icb-vlr-021.xht skip css-writing-modes/abs-pos-non-replaced-icb-vrl-020.xht # Bug 1244601 -fails css-writing-modes/block-flow-direction-slr-058.xht fails css-writing-modes/block-flow-direction-srl-057.xht fails css-writing-modes/block-flow-direction-vlr-018.xht fails css-writing-modes/block-flow-direction-vrl-017.xht -# Bug 1185430 -fails css-writing-modes/contiguous-floated-table-vlr-00?.xht -fails css-writing-modes/contiguous-floated-table-vrl-00?.xht -fails css-writing-modes/table-progression-slr-002.html -fails css-writing-modes/table-progression-srl-002.html -fails css-writing-modes/table-progression-vlr-00?.html - css-writing-modes/table-progression-vlr-001.html -fails css-writing-modes/table-progression-vrl-00?.html - css-writing-modes/table-progression-vrl-001.html - css-writing-modes/flexbox_align-items-stretch-writing-modes.html # Bug 1179952 diff --git a/layout/reftests/w3c-css/received/reftest.list b/layout/reftests/w3c-css/received/reftest.list index ee2f2f49d8fd..1500225bca22 100644 --- a/layout/reftests/w3c-css/received/reftest.list +++ b/layout/reftests/w3c-css/received/reftest.list @@ -606,7 +606,7 @@ fuzzy-if(OSX||winWidget,0-255,0-1540) == css-writing-modes/block-flow-direction- fuzzy-if(OSX||winWidget,0-255,0-1540) == css-writing-modes/block-flow-direction-slr-054.xht css-writing-modes/block-flow-direction-001-ref.xht fuzzy-if(OSX||winWidget,0-255,0-1540) == css-writing-modes/block-flow-direction-slr-055.xht css-writing-modes/block-flow-direction-001-ref.xht fuzzy-if(OSX||winWidget,0-255,0-1540) == css-writing-modes/block-flow-direction-slr-056.xht css-writing-modes/block-flow-direction-001-ref.xht -fails == css-writing-modes/block-flow-direction-slr-058.xht css-writing-modes/block-flow-direction-001-ref.xht +fuzzy-if(OSX||winWidget,0-255,0-1540) == css-writing-modes/block-flow-direction-slr-058.xht css-writing-modes/block-flow-direction-001-ref.xht fuzzy-if(OSX||winWidget,0-255,0-1540) == css-writing-modes/block-flow-direction-slr-060.xht css-writing-modes/block-flow-direction-001-ref.xht fuzzy-if(OSX||winWidget,0-255,0-1540) == css-writing-modes/block-flow-direction-slr-062.xht css-writing-modes/block-flow-direction-043-ref.xht fuzzy-if(OSX||winWidget,0-255,0-1540) == css-writing-modes/block-flow-direction-slr-063.xht css-writing-modes/block-flow-direction-043-ref.xht @@ -708,14 +708,14 @@ fuzzy-if(OSX||winWidget,0-215,0-780) == css-writing-modes/central-baseline-align == css-writing-modes/clip-rect-vrl-012.xht css-writing-modes/clip-rect-vrl-012-ref.xht == css-writing-modes/clip-rect-vrl-014.xht css-writing-modes/clip-rect-vrl-014-ref.xht == css-writing-modes/clip-rect-vrl-016.xht css-writing-modes/clip-rect-vrl-016-ref.xht -fails == css-writing-modes/contiguous-floated-table-vlr-003.xht reference/ref-filled-green-100px-square.xht -fails == css-writing-modes/contiguous-floated-table-vlr-005.xht reference/ref-filled-green-100px-square.xht -fails == css-writing-modes/contiguous-floated-table-vlr-007.xht reference/ref-filled-green-100px-square.xht -fails == css-writing-modes/contiguous-floated-table-vlr-009.xht reference/ref-filled-green-100px-square.xht -fails == css-writing-modes/contiguous-floated-table-vrl-002.xht reference/ref-filled-green-100px-square.xht -fails == css-writing-modes/contiguous-floated-table-vrl-004.xht reference/ref-filled-green-100px-square.xht -fails == css-writing-modes/contiguous-floated-table-vrl-006.xht reference/ref-filled-green-100px-square.xht -fails == css-writing-modes/contiguous-floated-table-vrl-008.xht reference/ref-filled-green-100px-square.xht +== css-writing-modes/contiguous-floated-table-vlr-003.xht reference/ref-filled-green-100px-square.xht +== css-writing-modes/contiguous-floated-table-vlr-005.xht reference/ref-filled-green-100px-square.xht +== css-writing-modes/contiguous-floated-table-vlr-007.xht reference/ref-filled-green-100px-square.xht +== css-writing-modes/contiguous-floated-table-vlr-009.xht reference/ref-filled-green-100px-square.xht +== css-writing-modes/contiguous-floated-table-vrl-002.xht reference/ref-filled-green-100px-square.xht +== css-writing-modes/contiguous-floated-table-vrl-004.xht reference/ref-filled-green-100px-square.xht +== css-writing-modes/contiguous-floated-table-vrl-006.xht reference/ref-filled-green-100px-square.xht +== css-writing-modes/contiguous-floated-table-vrl-008.xht reference/ref-filled-green-100px-square.xht == css-writing-modes/different-block-flow-dir-001.xht reference/ref-filled-green-100px-square.xht == css-writing-modes/different-block-flow-dir-002.xht reference/ref-filled-green-100px-square.xht fuzzy-if(!webrender&&OSX,255-255,200-200) fuzzy-if(winWidget,0-75,0-404) == css-writing-modes/direction-vlr-003.xht css-writing-modes/direction-vlr-003-ref.xht @@ -1041,17 +1041,17 @@ fuzzy-if(OSX||winWidget,0-110,0-1200) == css-writing-modes/table-column-order-00 fuzzy-if(winWidget,0-110,0-1200) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == css-writing-modes/table-column-order-slr-007.xht css-writing-modes/block-flow-direction-001-ref.xht fuzzy-if(OSX||winWidget,0-110,0-1200) == css-writing-modes/table-column-order-srl-006.xht css-writing-modes/block-flow-direction-001-ref.xht == css-writing-modes/table-progression-slr-001.html css-writing-modes/table-progression-slr-001-ref.html -fails == css-writing-modes/table-progression-slr-002.html css-writing-modes/table-progression-002-ref.html +== css-writing-modes/table-progression-slr-002.html css-writing-modes/table-progression-002-ref.html == css-writing-modes/table-progression-srl-001.html css-writing-modes/table-progression-001-ref.html -fails == css-writing-modes/table-progression-srl-002.html css-writing-modes/table-progression-002-ref.html +== css-writing-modes/table-progression-srl-002.html css-writing-modes/table-progression-002-ref.html == css-writing-modes/table-progression-vlr-001.html css-writing-modes/table-progression-001-ref.html -fails == css-writing-modes/table-progression-vlr-002.html css-writing-modes/table-progression-002-ref.html +== css-writing-modes/table-progression-vlr-002.html css-writing-modes/table-progression-002-ref.html == css-writing-modes/table-progression-vlr-003.html css-writing-modes/table-progression-001-ref.html -fails == css-writing-modes/table-progression-vlr-004.html css-writing-modes/table-progression-002-ref.html +== css-writing-modes/table-progression-vlr-004.html css-writing-modes/table-progression-002-ref.html == css-writing-modes/table-progression-vrl-001.html css-writing-modes/table-progression-001-ref.html -fails == css-writing-modes/table-progression-vrl-002.html css-writing-modes/table-progression-002-ref.html +== css-writing-modes/table-progression-vrl-002.html css-writing-modes/table-progression-002-ref.html == css-writing-modes/table-progression-vrl-003.html css-writing-modes/table-progression-001-ref.html -fails == css-writing-modes/table-progression-vrl-004.html css-writing-modes/table-progression-002-ref.html +== css-writing-modes/table-progression-vrl-004.html css-writing-modes/table-progression-002-ref.html fuzzy-if(!webrender&&OSX,255-255,200-200) fuzzy-if(winWidget,0-75,0-404) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == css-writing-modes/text-align-vlr-003.xht reference/ref-filled-green-100px-square.xht fuzzy-if(!webrender&&OSX,255-255,200-200) fuzzy-if(winWidget,0-75,0-404) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == css-writing-modes/text-align-vlr-005.xht reference/ref-filled-green-100px-square.xht fuzzy-if(!webrender&&OSX,255-255,200-200) fuzzy-if(winWidget,0-75,0-404) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == css-writing-modes/text-align-vlr-007.xht reference/ref-filled-green-100px-square.xht diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-058.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-058.xht.ini deleted file mode 100644 index 3df1f595f511..000000000000 --- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-058.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[block-flow-direction-slr-058.xht] - expected: FAIL diff --git a/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vlr-003.xht.ini b/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vlr-003.xht.ini deleted file mode 100644 index 65531f8e1f9d..000000000000 --- a/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vlr-003.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[contiguous-floated-table-vlr-003.xht] - expected: FAIL diff --git a/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vlr-005.xht.ini b/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vlr-005.xht.ini deleted file mode 100644 index 1d7e59f1068d..000000000000 --- a/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vlr-005.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[contiguous-floated-table-vlr-005.xht] - expected: FAIL diff --git a/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vlr-007.xht.ini b/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vlr-007.xht.ini deleted file mode 100644 index 7c7565333aa4..000000000000 --- a/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vlr-007.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[contiguous-floated-table-vlr-007.xht] - expected: FAIL diff --git a/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vlr-009.xht.ini b/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vlr-009.xht.ini deleted file mode 100644 index 4d1c661e2f93..000000000000 --- a/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vlr-009.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[contiguous-floated-table-vlr-009.xht] - expected: FAIL diff --git a/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vrl-002.xht.ini b/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vrl-002.xht.ini deleted file mode 100644 index 9f4e31066ac2..000000000000 --- a/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vrl-002.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[contiguous-floated-table-vrl-002.xht] - expected: FAIL diff --git a/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vrl-004.xht.ini b/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vrl-004.xht.ini deleted file mode 100644 index 99f806143eee..000000000000 --- a/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vrl-004.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[contiguous-floated-table-vrl-004.xht] - expected: FAIL diff --git a/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vrl-006.xht.ini b/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vrl-006.xht.ini deleted file mode 100644 index 8a07a1cda85e..000000000000 --- a/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vrl-006.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[contiguous-floated-table-vrl-006.xht] - expected: FAIL diff --git a/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vrl-008.xht.ini b/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vrl-008.xht.ini deleted file mode 100644 index 38fda3de062c..000000000000 --- a/testing/web-platform/meta/css/css-writing-modes/contiguous-floated-table-vrl-008.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[contiguous-floated-table-vrl-008.xht] - expected: FAIL diff --git a/testing/web-platform/meta/css/css-writing-modes/table-progression-slr-002.html.ini b/testing/web-platform/meta/css/css-writing-modes/table-progression-slr-002.html.ini deleted file mode 100644 index ed160a79af27..000000000000 --- a/testing/web-platform/meta/css/css-writing-modes/table-progression-slr-002.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[table-progression-slr-002.html] - expected: FAIL diff --git a/testing/web-platform/meta/css/css-writing-modes/table-progression-srl-002.html.ini b/testing/web-platform/meta/css/css-writing-modes/table-progression-srl-002.html.ini deleted file mode 100644 index 7d1125d175d4..000000000000 --- a/testing/web-platform/meta/css/css-writing-modes/table-progression-srl-002.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[table-progression-srl-002.html] - expected: FAIL diff --git a/testing/web-platform/meta/css/css-writing-modes/table-progression-vlr-002.html.ini b/testing/web-platform/meta/css/css-writing-modes/table-progression-vlr-002.html.ini deleted file mode 100644 index 681c15ca6d45..000000000000 --- a/testing/web-platform/meta/css/css-writing-modes/table-progression-vlr-002.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[table-progression-vlr-002.html] - expected: FAIL diff --git a/testing/web-platform/meta/css/css-writing-modes/table-progression-vlr-004.html.ini b/testing/web-platform/meta/css/css-writing-modes/table-progression-vlr-004.html.ini deleted file mode 100644 index ce406436eed5..000000000000 --- a/testing/web-platform/meta/css/css-writing-modes/table-progression-vlr-004.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[table-progression-vlr-004.html] - expected: FAIL diff --git a/testing/web-platform/meta/css/css-writing-modes/table-progression-vrl-002.html.ini b/testing/web-platform/meta/css/css-writing-modes/table-progression-vrl-002.html.ini deleted file mode 100644 index a271cc2db9c2..000000000000 --- a/testing/web-platform/meta/css/css-writing-modes/table-progression-vrl-002.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[table-progression-vrl-002.html] - expected: FAIL diff --git a/testing/web-platform/meta/css/css-writing-modes/table-progression-vrl-004.html.ini b/testing/web-platform/meta/css/css-writing-modes/table-progression-vrl-004.html.ini deleted file mode 100644 index 3582aa846b2f..000000000000 --- a/testing/web-platform/meta/css/css-writing-modes/table-progression-vrl-004.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[table-progression-vrl-004.html] - expected: FAIL