use floats to represent intended fixed position, re-enable position_f…

…ixed test
servo · May 29, 2016 · 94a884b · 94a884b
1 parent d160f8c
commit 94a884b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 30 deletions.
diff --git a/tests/wpt/mozilla/meta/css/position_fixed_a.html.ini b/tests/wpt/mozilla/meta/css/position_fixed_a.html.ini
diff --git a/tests/wpt/mozilla/tests/css/position_fixed_a.html b/tests/wpt/mozilla/tests/css/position_fixed_a.html
@@ -5,6 +5,11 @@
     .container {
       display: block;
       background: blue;
+
+      /* Use font available on all hosts, instead of system font,
+         because test reference depends on dynamic sizing, and different
+         fonts change the required margins. */
+      font-family: 'Ahem';
     }
     .fixed_block {
       background: green;
@@ -26,19 +31,13 @@
       top: 100px;
       bottom: 30px;
     }
-    .stretched_fixed_block {
-      position: fixed;
-      background: black;
-      top: 100px;
-      bottom: 30px;
-    }
   </style>
   </head>
   <body>
     <div class="container">
-      <div class="fixed_block"> fixed block </div>
-      <div class="positioned_fixed_block"> positioned fixed block </div>
-      <div class="sized_fixed_block"> sized fixed block </div>
+      <div class="fixed_block"> a </div>
+      <div class="sized_fixed_block"> b </div>
+      <div class="positioned_fixed_block"> c </div>
     </div>
   </body>
 </html>
diff --git a/tests/wpt/mozilla/tests/css/position_fixed_b.html b/tests/wpt/mozilla/tests/css/position_fixed_b.html
@@ -4,40 +4,37 @@
     .container {
       display: block;
       background: blue;
+
+      font-family: 'Ahem';
     }
     .fixed_block {
       background: green;
-      position: fixed;
+      float: left;
+
+      /* Servo seems to ignore default margins when position: fixed */
+      margin-top: -8px;
     }
     .positioned_fixed_block {
       background: yellow;
-      position: fixed;
-      top: 50%;
-      right: 25px;
+      float: left;
+      margin-top: 292px;
+      margin-left: 704px;
     }
     .sized_fixed_block {
       background: red;
-      position: fixed;
       height: 50px;
       width: 50px;
-      left: 5px;
-      right: 10px;
-      top: 100px;
-      bottom: 30px;
-    }
-    .stretched_fixed_block {
-      position: fixed;
-      background: black;
-      top: 100px;
-      bottom: 30px;
+      float: left;
+      margin-top: 92px;
+      margin-left: -19px;
     }
   </style>
   </head>
   <body>
     <div class="container">
-      <div class="fixed_block"> fixed block </div>
-      <div class="positioned_fixed_block"> positioned fixed block </div>
-      <div class="sized_fixed_block"> sized fixed block </div>
+      <div class="fixed_block"> a </div>
+      <div class="sized_fixed_block"> b </div>
+      <div class="positioned_fixed_block"> c </div>
     </div>
   </body>
 </html>