Use tree order when z-index is the same

2023-08-10 21:13:10 +03:00 · 2017-08-09 11:52:42 +08:00
parent ed92d2354c
commit 77393074ba
36 changed files with 392 additions and 337 deletions
--- a/tests/reftests/transform/nested.html
+++ b/tests/reftests/transform/nested.html
@@ -35,8 +35,11 @@
            display: inline-block;

        }
-    </style>

+        body {
+            font-family: Arial;
+        }
+    </style>
 </head>
 <body>
 <div id="first">First level content <div id="second">with second level content <div id="third">and third level content</div>, ending second</div>, ending first</div>
--- a/tests/reftests/transform/nested.txt
+++ b/tests/reftests/transform/nested.txt
@@ -1,42 +1,42 @@
 Window: [800, 600]
 Rectangle: [0, 0, 800, 600] rgba(0,0,0,0)
 Opacity: 1
-Clip: Path (Vector(x: 8, y: 108) > Vector(x: 649, y: 108) > Vector(x: 649, y: 157) > Vector(x: 8, y: 157))
+Clip: Path (Vector(x: 8, y: 108) > Vector(x: 708, y: 108) > Vector(x: 708, y: 156) > Vector(x: 8, y: 156))
  Fill: rgb(205,92,92)
-Text: rgb(0,0,0) normal normal 400 16px Times New Roman
-  [8, 124]: First
-  [41, 124]: level
-  [76, 124]: content
-Text: rgb(0,0,0) normal normal 400 16px Times New Roman
-  [568, 124]: ,
-  [576, 124]: ending
-  [624, 124]: first
-Clip: Path (Vector(x: 653, y: 123) > Vector(x: 749, y: 123) > Vector(x: 749, y: 142) > Vector(x: 653, y: 142))
+Text: rgb(0,0,0) normal normal 400 16px Arial
+  [8, 123]: First
+  [44, 123]: level
+  [81, 123]: content
+Text: rgb(0,0,0) normal normal 400 16px Arial
+  [620, 123]: ,
+  [630, 123]: ending
+  [682, 123]: first
+Clip: Path (Vector(x: 8, y: 156) > Vector(x: 116, y: 156) > Vector(x: 116, y: 174) > Vector(x: 8, y: 174))
  Fill: rgb(188,143,143)
-Text: rgb(0,0,0) normal normal 400 16px Times New Roman
-  [653, 124]: something
-  [724, 124]: else
-Transform: (348, 132) [0.99, 0.13, -0.13, 0.99, 0, 0]
-  Clip: Path (Vector(x: 128, y: 108) > Vector(x: 568, y: 108) > Vector(x: 568, y: 157) > Vector(x: 128, y: 157))
+Text: rgb(0,0,0) normal normal 400 16px Arial
+  [8, 156]: something
+  [86, 156]: else
+Transform: (379, 132) [0.99, 0.13, -0.13, 0.99, 0, 0]
+  Clip: Path (Vector(x: 138, y: 108) > Vector(x: 621, y: 108) > Vector(x: 621, y: 156) > Vector(x: 138, y: 156))
    Fill: rgb(143,188,143)
-  Shape: rgb(255,0,0) Path (Vector(x: 128, y: 108) > Vector(x: 568, y: 108) > Vector(x: 553, y: 123) > Vector(x: 143, y: 123))
-  Shape: rgb(255,0,0) Path (Vector(x: 568, y: 108) > Vector(x: 568, y: 157) > Vector(x: 553, y: 142) > Vector(x: 553, y: 123))
-  Shape: rgb(255,0,0) Path (Vector(x: 568, y: 157) > Vector(x: 128, y: 157) > Vector(x: 143, y: 142) > Vector(x: 553, y: 142))
-  Shape: rgb(255,0,0) Path (Vector(x: 128, y: 157) > Vector(x: 128, y: 108) > Vector(x: 143, y: 123) > Vector(x: 143, y: 142))
-  Text: rgb(0,0,0) normal normal 400 16px Times New Roman
-    [143, 123]: with
-    [175, 123]: second
-    [224, 123]: level
-    [258, 123]: content
-  Text: rgb(0,0,0) normal normal 400 16px Times New Roman
-    [453, 123]: ,
-    [461, 123]: ending
-    [509, 123]: second
-  Transform: (381, 132) [0.33, -0.94, 0.94, 0.33, 0, 0]
-    Clip: Path (Vector(x: 310, y: 123) > Vector(x: 453, y: 123) > Vector(x: 453, y: 142) > Vector(x: 310, y: 142))
+  Shape: rgb(255,0,0) Path (Vector(x: 138, y: 108) > Vector(x: 621, y: 108) > Vector(x: 606, y: 123) > Vector(x: 153, y: 123))
+  Shape: rgb(255,0,0) Path (Vector(x: 621, y: 108) > Vector(x: 621, y: 156) > Vector(x: 606, y: 141) > Vector(x: 606, y: 123))
+  Shape: rgb(255,0,0) Path (Vector(x: 621, y: 156) > Vector(x: 138, y: 156) > Vector(x: 153, y: 141) > Vector(x: 606, y: 141))
+  Shape: rgb(255,0,0) Path (Vector(x: 138, y: 156) > Vector(x: 138, y: 108) > Vector(x: 153, y: 123) > Vector(x: 153, y: 141))
+  Text: rgb(0,0,0) normal normal 400 16px Arial
+    [153, 123]: with
+    [186, 123]: second
+    [242, 123]: level
+    [279, 123]: content
+  Text: rgb(0,0,0) normal normal 400 16px Arial
+    [493, 123]: ,
+    [501, 123]: ending
+    [554, 123]: second
+  Transform: (414, 132) [0.33, -0.94, 0.94, 0.33, 0, 0]
+    Clip: Path (Vector(x: 336, y: 123) > Vector(x: 493, y: 123) > Vector(x: 493, y: 141) > Vector(x: 336, y: 141))
      Fill: rgb(95,158,160)
-    Text: rgb(0,0,0) normal normal 400 16px Times New Roman
-      [310, 123]: and
-      [337, 123]: third
-      [371, 123]: level
-      [406, 123]: content
+    Text: rgb(0,0,0) normal normal 400 16px Arial
+      [336, 123]: and
+      [367, 123]: third
+      [403, 123]: level
+      [440, 123]: content
--- a/tests/reftests/transform/rotate.html
+++ b/tests/reftests/transform/rotate.html
@@ -36,7 +36,11 @@
            -o-transform: rotate(45deg);   /* Opera 10.50-12.00 */
            transform:rotate(45deg);
        }
-    </style
+
+        body {
+            font-family: Arial;
+        }
+    </style>
 </head>
 <body>
 <div class="container">
--- a/tests/reftests/transform/translate.html
+++ b/tests/reftests/transform/translate.html
@@ -36,8 +36,11 @@
            display: inline-block;
            padding: 10px;
        }
-    </style>

+        body {
+            font-family: Arial;
+        }
+    </style>
 </head>
 <body>
 <div id="first">First level content <div id="second">with second level content <div id="third">and third level content</div>, ending second</div>, ending first</div>
--- a/tests/reftests/transform/translate.txt
+++ b/tests/reftests/transform/translate.txt
@@ -1,37 +1,37 @@
 Window: [800, 600]
 Rectangle: [0, 0, 800, 600] rgba(0,0,0,0)
 Opacity: 1
-Clip: Path (Vector(x: 8, y: 108) > Vector(x: 699, y: 108) > Vector(x: 699, y: 207) > Vector(x: 8, y: 207))
+Clip: Path (Vector(x: 8, y: 108) > Vector(x: 758, y: 108) > Vector(x: 758, y: 206) > Vector(x: 8, y: 206))
  Fill: rgb(205,92,92)
-Text: rgb(0,0,0) normal normal 400 16px Times New Roman
+Text: rgb(0,0,0) normal normal 400 16px Arial
  [18, 148]: First
-  [51, 148]: level
-  [86, 148]: content
-Text: rgb(0,0,0) normal normal 400 16px Times New Roman
-  [608, 148]: ,
-  [616, 148]: ending
-  [664, 148]: first
-Transform: (373, 157) [1, 0, 0, 1, 125, 0]
-  Clip: Path (Vector(x: 138, y: 118) > Vector(x: 608, y: 118) > Vector(x: 608, y: 197) > Vector(x: 138, y: 197))
+  [54, 148]: level
+  [91, 148]: content
+Text: rgb(0,0,0) normal normal 400 16px Arial
+  [660, 148]: ,
+  [670, 148]: ending
+  [722, 148]: first
+Transform: (404, 157) [1, 0, 0, 1, 125, 0]
+  Clip: Path (Vector(x: 148, y: 118) > Vector(x: 661, y: 118) > Vector(x: 661, y: 196) > Vector(x: 148, y: 196))
    Fill: rgb(143,188,143)
-  Shape: rgb(255,0,0) Path (Vector(x: 138, y: 118) > Vector(x: 608, y: 118) > Vector(x: 598, y: 128) > Vector(x: 148, y: 128))
-  Shape: rgb(255,0,0) Path (Vector(x: 608, y: 118) > Vector(x: 608, y: 197) > Vector(x: 598, y: 187) > Vector(x: 598, y: 128))
-  Shape: rgb(255,0,0) Path (Vector(x: 608, y: 197) > Vector(x: 138, y: 197) > Vector(x: 148, y: 187) > Vector(x: 598, y: 187))
-  Shape: rgb(255,0,0) Path (Vector(x: 138, y: 197) > Vector(x: 138, y: 118) > Vector(x: 148, y: 128) > Vector(x: 148, y: 187))
-  Text: rgb(0,0,0) normal normal 400 16px Times New Roman
-    [158, 148]: with
-    [190, 148]: second
-    [238, 148]: level
-    [274, 148]: content
-  Text: rgb(0,0,0) normal normal 400 16px Times New Roman
-    [488, 148]: ,
-    [496, 148]: ending
-    [544, 148]: second
-  Transform: (425, 188) [1, 0, 0, 1, 100, -25]
-    Clip: Path (Vector(x: 325, y: 138) > Vector(x: 488, y: 138) > Vector(x: 488, y: 177) > Vector(x: 325, y: 177))
+  Shape: rgb(255,0,0) Path (Vector(x: 148, y: 118) > Vector(x: 661, y: 118) > Vector(x: 651, y: 128) > Vector(x: 158, y: 128))
+  Shape: rgb(255,0,0) Path (Vector(x: 661, y: 118) > Vector(x: 661, y: 196) > Vector(x: 651, y: 186) > Vector(x: 651, y: 128))
+  Shape: rgb(255,0,0) Path (Vector(x: 661, y: 196) > Vector(x: 148, y: 196) > Vector(x: 158, y: 186) > Vector(x: 651, y: 186))
+  Shape: rgb(255,0,0) Path (Vector(x: 148, y: 196) > Vector(x: 148, y: 118) > Vector(x: 158, y: 128) > Vector(x: 158, y: 186))
+  Text: rgb(0,0,0) normal normal 400 16px Arial
+    [168, 148]: with
+    [201, 148]: second
+    [257, 148]: level
+    [294, 148]: content
+  Text: rgb(0,0,0) normal normal 400 16px Arial
+    [527, 148]: ,
+    [537, 148]: ending
+    [589, 148]: second
+  Transform: (451, 188) [1, 0, 0, 1, 100, -25]
+    Clip: Path (Vector(x: 351, y: 138) > Vector(x: 528, y: 138) > Vector(x: 528, y: 176) > Vector(x: 351, y: 176))
      Fill: rgb(95,158,160)
-    Text: rgb(0,0,0) normal normal 400 16px Times New Roman
-      [335, 148]: and
-      [362, 148]: third
-      [396, 148]: level
-      [431, 148]: content
+    Text: rgb(0,0,0) normal normal 400 16px Arial
+      [361, 148]: and
+      [392, 148]: third
+      [428, 148]: level
+      [465, 148]: content