Auto merge of #19834 - ferjm:issue-18544, r=emilio

Test for #18544 - Flow list crash - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #18544 - [X] There are tests for these changes  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19834)
servo · Jan 23, 2018 · bda560d · bda560d
2 parents 6f543d3 + 8c7e710
commit bda560d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -32655,6 +32655,12 @@
      {}
     ]
    ],
+   "css/issue_18544_flow_list_crash.html": [
+    [
+     "/_mozilla/css/issue_18544_flow_list_crash.html",
+     {}
+    ]
+   ],
    "css/matchMedia.html": [
     [
      "/_mozilla/css/matchMedia.html",
@@ -63320,6 +63326,10 @@
    "863e3c8c5ffa1627a20f51e89b7eca884ea381dd",
    "reftest"
   ],
+  "css/issue_18544_flow_list_crash.html": [
+   "9e41b681e414db9bd5f3fc75210de12a6e660c28",
+   "testharness"
+  ],
   "css/jpeg_normal.html": [
    "4e9d02f232492b55f8e6b71046b392c4dc2c9fb6",
    "reftest"

diff --git a/tests/wpt/mozilla/tests/css/issue_18544_flow_list_crash.html b/tests/wpt/mozilla/tests/css/issue_18544_flow_list_crash.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Issue 18544 - Flow list crash</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div style="position:fixed"></div>
+<script>
+  async_test(function(test) {
+    window.onload = test.step_func_done(function() {
+      document.body.children[0].style['column-count'] = 1;
+      document.body.offsetTop;
+      assert_true(true, "Did not crash");
+    });
+  });
+</script>
+