From fcc7ecef8ee95ba3776cfa3b1de30101c30432aa Mon Sep 17 00:00:00 2001 From: Rune Lillesveen Date: Wed, 31 Jan 2018 14:29:35 -0800 Subject: [PATCH] Do not skip out-of-flow boxes merging anonymous flex items. A misread of the spec made us skip out-of-flow boxes merging anonymous flex items. Only merge anonymous flex items which are truly box siblings. Adjusted the wpt tests accordingly. Fwiw, Firefox nightly now passes all of wpt/css/css-flexbox/anonymous-* Bug: 788379, 806151 Change-Id: I124740e5d2150becdcc03ded26773a69607e0bbb Reviewed-on: https://chromium-review.googlesource.com/895283 Reviewed-by: Christian Biesinger Commit-Queue: Rune Lillesveen Cr-Commit-Position: refs/heads/master@{#533440} --- css/css-flexbox/anonymous-flex-item-004.html | 8 ++++---- css/css-flexbox/anonymous-flex-item-005.html | 10 ++++++---- css/css-flexbox/anonymous-flex-item-006.html | 8 ++++---- css/css-flexbox/anonymous-flex-item-split-ref.html | 7 +++++++ 4 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 css/css-flexbox/anonymous-flex-item-split-ref.html diff --git a/css/css-flexbox/anonymous-flex-item-004.html b/css/css-flexbox/anonymous-flex-item-004.html index 471fce3680e1cc..a3dfbc3e4d020a 100644 --- a/css/css-flexbox/anonymous-flex-item-004.html +++ b/css/css-flexbox/anonymous-flex-item-004.html @@ -1,8 +1,8 @@ -CSS Flexbox Test: Flex item - contiguous text runs - position:absolute +CSS Flexbox Test: Flex item - non-contiguous text runs - position:absolute - -

There should be a space between "two" and "words" below.

-
two words
+ +

The words "Two" and "lines" should not be on the same line.

+
Two lines
diff --git a/css/css-flexbox/anonymous-flex-item-005.html b/css/css-flexbox/anonymous-flex-item-005.html index c4a75e5000bc19..a7de7b7a8546bf 100644 --- a/css/css-flexbox/anonymous-flex-item-005.html +++ b/css/css-flexbox/anonymous-flex-item-005.html @@ -1,12 +1,14 @@ -CSS Flexbox Test: Flex item - contiguous text runs - position:absolute dynamic +CSS Flexbox Test: Flex item - non-contiguous text runs - position:absolute dynamic - -

There should be a space between "two" and "words" below.

-
two words
+ +

The words "Two" and "lines" should not be on the same line.

+
Two lines
diff --git a/css/css-flexbox/anonymous-flex-item-006.html b/css/css-flexbox/anonymous-flex-item-006.html index 8544618efa4078..6320b814294cdb 100644 --- a/css/css-flexbox/anonymous-flex-item-006.html +++ b/css/css-flexbox/anonymous-flex-item-006.html @@ -1,12 +1,12 @@ -CSS Flexbox Test: Flex item - contiguous text runs - position:absolute and node removal +CSS Flexbox Test: Flex item - non-contiguous text runs - position:absolute and node removal - + -

There should be a space between "two" and "words" below.

-
two words
+

The words "Two" and "lines" should not be on the same line.

+
Two lines