| Index: third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-002.xhtml
|
| diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-002.xhtml b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-002.xhtml
|
| index b6e21303e2d3de42dcb56a29ee3ac1ec9f681224..55a18d5b77773d03d18c1dab5aaffc508434f262 100644
|
| --- a/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-002.xhtml
|
| +++ b/third_party/WebKit/LayoutTests/imported/csswg-test/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-002.xhtml
|
| @@ -1,11 +1,11 @@
|
| <?xml version="1.0" encoding="UTF-8"?>
|
| -<!--
|
| +<!--
|
| Any copyright is dedicated to the Public Domain.
|
| http://creativecommons.org/publicdomain/zero/1.0/
|
| - -->
|
| -<!-- Testcase with flex items containing overlapping content, with
|
| +-->
|
| +<!-- Testcase with flex items containing overlapping content, with
|
| "order" and "z-index" set on some of them, to test how that affects
|
| - paint-order. -->
|
| + paint-order. -->
|
| <html xmlns="http://www.w3.org/1999/xhtml">
|
| <head>
|
| <title>CSS Test: Testing the paint-order of overlapping flex items with 'order' and 'z-index' set</title>
|
| @@ -68,7 +68,7 @@
|
| </style>
|
| </head>
|
| <body>
|
| - <!-- order not set: -->
|
| + <!-- order not set: -->
|
| <div class="flexbox">
|
| <div class="a"><div class="aKid"/></div>
|
| <div class="b"><div class="bKid"/></div>
|
| @@ -76,84 +76,98 @@
|
|
|
| <br/>
|
|
|
| - <!-- order set, but it matches content order, so it shouldn't matter: -->
|
| + <!-- order set, but it matches content order, so it shouldn't matter: -->
|
| <div class="flexbox">
|
| <div class="a on1"><div class="aKid"/></div>
|
| <div class="b"><div class="bKid"/></div>
|
| - </div><div class="flexbox">
|
| + </div
|
| + ><div class="flexbox">
|
| <div class="a o0"><div class="aKid"/></div>
|
| <div class="b"><div class="bKid"/></div>
|
| - </div><div class="flexbox">
|
| + </div
|
| + ><div class="flexbox">
|
| <div class="a o0"><div class="aKid"/></div>
|
| <div class="b o0"><div class="bKid"/></div>
|
| - </div><div class="flexbox">
|
| + </div
|
| + ><div class="flexbox">
|
| <div class="a o2"><div class="aKid"/></div>
|
| <div class="b o2"><div class="bKid"/></div>
|
| - </div><div class="flexbox">
|
| + </div
|
| + ><div class="flexbox">
|
| <div class="a"><div class="aKid"/></div>
|
| <div class="b o0"><div class="bKid"/></div>
|
| - </div><div class="flexbox">
|
| + </div
|
| + ><div class="flexbox">
|
| <div class="a"><div class="aKid"/></div>
|
| <div class="b o1"><div class="bKid"/></div>
|
| </div>
|
|
|
| <br/>
|
|
|
| - <!-- order set to reverse of content-order: -->
|
| + <!-- order set to reverse of content-order: -->
|
| <div class="flexbox">
|
| <div class="a o1"><div class="aKid"/></div>
|
| <div class="b"><div class="bKid"/></div>
|
| - </div><div class="flexbox">
|
| + </div
|
| + ><div class="flexbox">
|
| <div class="a"><div class="aKid"/></div>
|
| <div class="b on1"><div class="bKid"/></div>
|
| - </div><div class="flexbox">
|
| + </div
|
| + ><div class="flexbox">
|
| <div class="a o0"><div class="aKid"/></div>
|
| <div class="b on1"><div class="bKid"/></div>
|
| - </div><div class="flexbox">
|
| + </div
|
| + ><div class="flexbox">
|
| <div class="a o2"><div class="aKid"/></div>
|
| <div class="b o1"><div class="bKid"/></div>
|
| </div>
|
|
|
| <br/>
|
|
|
| - <!-- order set to reverse of content-order, AND with z-index set on
|
| - one or both items, but not such that it changes the paint order -->
|
| + <!-- order set to reverse of content-order, AND with z-index set on
|
| + one or both items, but not such that it changes the paint order -->
|
| <div class="flexbox">
|
| <div class="a o1 z0"><div class="aKid"/></div>
|
| <div class="b"><div class="bKid"/></div>
|
| - </div><div class="flexbox">
|
| + </div
|
| + ><div class="flexbox">
|
| <div class="a o1 z1"><div class="aKid"/></div>
|
| <div class="b"><div class="bKid"/></div>
|
| - </div><div class="flexbox">
|
| + </div
|
| + ><div class="flexbox">
|
| <div class="a o1 z0"><div class="aKid"/></div>
|
| <div class="b z0"><div class="bKid"/></div>
|
| - </div><div class="flexbox">
|
| + </div
|
| + ><div class="flexbox">
|
| <div class="a o1 z1"><div class="aKid"/></div>
|
| <div class="b z0"><div class="bKid"/></div>
|
| </div>
|
|
|
| <br/>
|
|
|
| - <!-- order set to reverse of content-order, AND with z-index set on
|
| - one or both items, in such a way that it affects paint order -->
|
| + <!-- order set to reverse of content-order, AND with z-index set on
|
| + one or both items, in such a way that it affects paint order -->
|
| <div class="flexbox">
|
| - <!-- 'a' is behind the container's border -->
|
| + <!-- 'a' is behind the container's border -->
|
| <div class="a o1 zn1"><div class="aKid"/></div>
|
| <div class="b"><div class="bKid"/></div>
|
| - </div><div class="flexbox">
|
| - <!-- 'a' and 'b' are both behind the container's border -->
|
| + </div
|
| + ><div class="flexbox">
|
| + <!-- 'a' and 'b' are both behind the container's border -->
|
| <div class="a o1 zn1"><div class="aKid"/></div>
|
| <div class="b zn1"><div class="bKid"/></div>
|
| - </div><div class="flexbox">
|
| - <!-- 'a' and 'b' are both behind the container's border,
|
| + </div
|
| + ><div class="flexbox">
|
| + <!-- 'a' and 'b' are both behind the container's border,
|
| and 'a' is behind 'b' despite coming after it in the 'order'
|
| - ordering -->
|
| + ordering-->
|
| <div class="a o1 zn2"><div class="aKid"/></div>
|
| <div class="b zn1"><div class="bKid"/></div>
|
| - </div><div class="flexbox">
|
| - <!-- 'a' and 'b' are both in front of the container's border,
|
| + </div
|
| + ><div class="flexbox">
|
| + <!-- 'a' and 'b' are both in front of the container's border,
|
| and 'a' is behind 'b' despite coming after it in the 'order'
|
| - ordering -->
|
| + ordering-->
|
| <div class="a o1 z0"><div class="aKid"/></div>
|
| <div class="b z1"><div class="bKid"/></div>
|
| </div>
|
|
|