Bug 1485669: Upstream the tests from bug 488725. r=dbaron
☠☠ backed out by d11f2e791af1 ☠ ☠
authorEmilio Cobos Álvarez <emilio@crisal.io>
Thu, 23 Aug 2018 15:29:01 +0200
changeset 492104 f6753d3d9db1ff69ae3a0d4f053412bbbc92e1fa
parent 492103 65b36a89443f61fda759a9398f3ee0a9270fdfdf
child 492105 254a11648e894f68968391c6e33acb7c15d4ac81
push id1815
push userffxbld-merge
push dateMon, 15 Oct 2018 10:40:45 +0000
treeherdermozilla-release@18d4c09e9378 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron
bugs1485669, 488725
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1485669: Upstream the tests from bug 488725. r=dbaron Differential Revision: https://phabricator.services.mozilla.com/D4076
layout/reftests/floats/float-nowrap-1-notref.html
layout/reftests/floats/float-nowrap-1.html
layout/reftests/floats/float-nowrap-2.html
layout/reftests/floats/float-nowrap-3-ref.html
layout/reftests/floats/float-nowrap-3.html
layout/reftests/floats/float-nowrap-4-ref.html
layout/reftests/floats/float-nowrap-4.html
layout/reftests/floats/float-nowrap-5-ref.html
layout/reftests/floats/float-nowrap-5.html
layout/reftests/floats/float-nowrap-6.html
layout/reftests/floats/float-nowrap-7.html
layout/reftests/floats/float-nowrap-8.html
layout/reftests/floats/float-nowrap-9.html
layout/reftests/floats/reftest.list
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/css/CSS2/floats/float-nowrap-1-notref.html
testing/web-platform/tests/css/CSS2/floats/float-nowrap-1.html
testing/web-platform/tests/css/CSS2/floats/float-nowrap-2.html
testing/web-platform/tests/css/CSS2/floats/float-nowrap-3-ref.html
testing/web-platform/tests/css/CSS2/floats/float-nowrap-3.html
testing/web-platform/tests/css/CSS2/floats/float-nowrap-4-ref.html
testing/web-platform/tests/css/CSS2/floats/float-nowrap-4.html
testing/web-platform/tests/css/CSS2/floats/float-nowrap-5-ref.html
testing/web-platform/tests/css/CSS2/floats/float-nowrap-5.html
testing/web-platform/tests/css/CSS2/floats/float-nowrap-6.html
testing/web-platform/tests/css/CSS2/floats/float-nowrap-7.html
testing/web-platform/tests/css/CSS2/floats/float-nowrap-8.html
testing/web-platform/tests/css/CSS2/floats/float-nowrap-9.html
deleted file mode 100644
--- a/layout/reftests/floats/float-nowrap-1-notref.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!doctype html>
-<style>
-  div {
-    width: 10ch;
-    white-space: nowrap;
-    font-family: monospace;
-  }
-  span {
-    float: right;
-    width: 5ch;
-    height: 5ch;
-    background: blue;
-  }
-</style>
-<div>
-  <span></span>
-  Some text that overflows my parent.
-</div>
deleted file mode 100644
--- a/layout/reftests/floats/float-nowrap-1.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!doctype html>
-<style>
-  div {
-    width: 10ch;
-    white-space: nowrap;
-    font-family: monospace;
-  }
-  span {
-    float: right;
-    width: 5ch;
-    height: 5ch;
-    background: blue;
-  }
-</style>
-<div>
-  Some text that overflows my parent.
-  <span></span>
-</div>
deleted file mode 100644
--- a/layout/reftests/floats/float-nowrap-2.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!doctype html>
-<style>
-  div {
-    width: 10ch;
-    white-space: nowrap;
-    font-family: monospace;
-  }
-  span {
-    float: right;
-    width: 5ch;
-    height: 5ch;
-    background: blue;
-  }
-</style>
-<div>
-  Some text that
-  <span></span>
-  overflows my parent.
-</div>
deleted file mode 100644
--- a/layout/reftests/floats/float-nowrap-3-ref.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!doctype html>
-<style>
-  div {
-    width: 10ch;
-    font-family: monospace;
-  }
-  .float {
-    float: right;
-    width: 5ch;
-    height: 5ch;
-    background: blue;
-  }
-  .nowrap {
-    white-space: nowrap;
-  }
-</style>
-<div>
-  Some
-  <span class="nowrap">
-    text that overflows my parent.
-  </span>
-  <span class="float"></span>
-</div>
deleted file mode 100644
--- a/layout/reftests/floats/float-nowrap-3.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!doctype html>
-<style>
-  div {
-    width: 10ch;
-    font-family: monospace;
-  }
-  .float {
-    float: right;
-    width: 5ch;
-    height: 5ch;
-    background: blue;
-  }
-  .nowrap {
-    white-space: nowrap;
-  }
-</style>
-<div>
-  Some
-  <span class="nowrap">
-    text that overflows <span class="float"></span> my parent.
-  </span>
-</div>
deleted file mode 100644
--- a/layout/reftests/floats/float-nowrap-4-ref.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!doctype html>
-<style>
-  div {
-    width: 10ch;
-    font-family: monospace;
-  }
-  .float {
-    float: right;
-    width: 5ch;
-    height: 5ch;
-    background: blue;
-  }
-  .nowrap {
-    white-space: nowrap;
-  }
-</style>
-<div>
-  Some
-  <span class="float"></span>
-  <span class="nowrap">
-    text that overflows my parent.
-  </span>
-</div>
deleted file mode 100644
--- a/layout/reftests/floats/float-nowrap-4.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!doctype html>
-<style>
-  div {
-    width: 10ch;
-    font-family: monospace;
-  }
-  .float {
-    float: right;
-    width: 5ch;
-    height: 5ch;
-    background: blue;
-  }
-  .nowrap {
-    white-space: nowrap;
-  }
-</style>
-<div>
-  Some
-  <span class="nowrap">
-    <span class="float"></span> text that overflows my parent.
-  </span>
-</div>
deleted file mode 100644
--- a/layout/reftests/floats/float-nowrap-5-ref.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<!doctype html>
-<div>Hello Kittie
deleted file mode 100644
--- a/layout/reftests/floats/float-nowrap-5.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!doctype html>
-<style>
-  div {
-    white-space: nowrap;
-  }
-  span {
-    float: left;
-  }
-</style>
-<div>Kittie<span>Hello&nbsp;</span>
deleted file mode 100644
--- a/layout/reftests/floats/float-nowrap-6.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!doctype html>
-<style>
-  div {
-    white-space: nowrap;
-  }
-  span {
-    float: left;
-  }
-</style>
-<div><span>Hello&nbsp;</span>Kittie
deleted file mode 100644
--- a/layout/reftests/floats/float-nowrap-7.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!doctype html>
-<style>
-  div {
-    width: 10ch;
-    white-space: nowrap;
-    font-family: monospace;
-  }
-  .nowrap {
-    white-space: nowrap;
-  }
-  .float {
-    float: right;
-    width: 5ch;
-    height: 5ch;
-    background: blue;
-  }
-</style>
-<div>
-  <span class="nowrap">S<div class="float"></div><span>ome</span> text that overflows my parent.</span>
-</div>
deleted file mode 100644
--- a/layout/reftests/floats/float-nowrap-8.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!doctype html>
-<style>
-  div {
-    width: 10ch;
-    white-space: nowrap;
-    font-family: monospace;
-  }
-  span {
-    float: right;
-    width: 5ch;
-    height: 5ch;
-    background: blue;
-  }
-</style>
-<div>
-  Some <span></span>
-  text that overflows my parent.
-</div>
deleted file mode 100644
--- a/layout/reftests/floats/float-nowrap-9.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!doctype html>
-<style>
-  div {
-    width: 10ch;
-    font-family: monospace;
-  }
-  .float {
-    float: right;
-    width: 5ch;
-    height: 5ch;
-    background: blue;
-  }
-  .nowrap {
-    white-space: nowrap;
-  }
-</style>
-<div>
-  Some
-  <span class="nowrap">
-    text <span class="float"></span> that overflows my parent.
-  </span>
-</div>
--- a/layout/reftests/floats/reftest.list
+++ b/layout/reftests/floats/reftest.list
@@ -112,18 +112,8 @@ random-if(/^Windows\x20NT\x206\.1/.test(
 == float-in-rtl-slr-3a.html float-in-rtl-slr-3-ref.html
 == float-in-rtl-slr-3b.html float-in-rtl-slr-3-ref.html
 == float-in-rtl-slr-3c.html float-in-rtl-slr-3-ref.html
 == float-in-rtl-slr-3d.html float-in-rtl-slr-3-ref.html
 == float-in-rtl-slr-4a.html float-in-rtl-slr-4-ref.html
 == float-in-rtl-slr-4b.html float-in-rtl-slr-4-ref.html
 == float-in-rtl-slr-4c.html float-in-rtl-slr-4-ref.html
 == float-in-rtl-slr-4d.html float-in-rtl-slr-4-ref.html
-!= float-nowrap-1.html float-nowrap-1-notref.html
-== float-nowrap-2.html float-nowrap-1.html
-== float-nowrap-3.html float-nowrap-3-ref.html
-!= float-nowrap-3.html float-nowrap-4.html
-== float-nowrap-4.html float-nowrap-4-ref.html
-== float-nowrap-5.html float-nowrap-5-ref.html
-== float-nowrap-6.html float-nowrap-5-ref.html
-== float-nowrap-7.html float-nowrap-1.html
-== float-nowrap-8.html float-nowrap-1.html
-== float-nowrap-9.html float-nowrap-3-ref.html
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -47778,16 +47778,100 @@
       [
        "/css/reference/ref-filled-green-100px-square-only.html",
        "=="
       ]
      ],
      {}
     ]
    ],
+   "css/CSS2/floats/float-nowrap-2.html": [
+    [
+     "/css/CSS2/floats/float-nowrap-2.html",
+     [
+      [
+       "/css/CSS2/floats/float-nowrap-1.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/floats/float-nowrap-3.html": [
+    [
+     "/css/CSS2/floats/float-nowrap-3.html",
+     [
+      [
+       "/css/CSS2/floats/float-nowrap-3-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/floats/float-nowrap-5.html": [
+    [
+     "/css/CSS2/floats/float-nowrap-5.html",
+     [
+      [
+       "/css/CSS2/floats/float-nowrap-5-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/floats/float-nowrap-6.html": [
+    [
+     "/css/CSS2/floats/float-nowrap-6.html",
+     [
+      [
+       "/css/CSS2/floats/float-nowrap-5-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/floats/float-nowrap-7.html": [
+    [
+     "/css/CSS2/floats/float-nowrap-7.html",
+     [
+      [
+       "/css/CSS2/floats/float-nowrap-1.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/floats/float-nowrap-8.html": [
+    [
+     "/css/CSS2/floats/float-nowrap-8.html",
+     [
+      [
+       "/css/CSS2/floats/float-nowrap-1.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/floats/float-nowrap-9.html": [
+    [
+     "/css/CSS2/floats/float-nowrap-9.html",
+     [
+      [
+       "/css/CSS2/floats/float-nowrap-3-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/CSS2/floats/floated-table-wider-than-specified.html": [
     [
      "/css/CSS2/floats/floated-table-wider-than-specified.html",
      [
       [
        "/css/reference/ref-filled-green-200px-square.html",
        "=="
       ]
@@ -189488,16 +189572,52 @@
        "=="
       ]
      ],
      {}
     ]
    ]
   },
   "reftest_node": {
+   "css/CSS2/floats/float-nowrap-1.html": [
+    [
+     "/css/CSS2/floats/float-nowrap-1.html",
+     [
+      [
+       "/css/CSS2/floats/float-nowrap-1-notref.html",
+       "!="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/floats/float-nowrap-3-ref.html": [
+    [
+     "/css/CSS2/floats/float-nowrap-3-ref.html",
+     [
+      [
+       "/css/CSS2/floats/float-nowrap-4.html",
+       "!="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/floats/float-nowrap-4.html": [
+    [
+     "/css/CSS2/floats/float-nowrap-4.html",
+     [
+      [
+       "/css/CSS2/floats/float-nowrap-4-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/CSS2/floats/floats-placement-vertical-004-ref.xht": [
     [
      "/css/CSS2/floats/floats-placement-vertical-004-ref.xht",
      [
       [
        "/css/CSS2/floats/floats-placement-vertical-004-ref2.xht",
        "=="
       ]
@@ -227039,16 +227159,31 @@
      {}
     ]
    ],
    "css/CSS2/floats-clear/support/test-tr.png": [
     [
      {}
     ]
    ],
+   "css/CSS2/floats/float-nowrap-1-notref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/CSS2/floats/float-nowrap-4-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/CSS2/floats/float-nowrap-5-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/CSS2/floats/floats-in-table-caption-001-ref.html": [
     [
      {}
     ]
    ],
    "css/CSS2/floats/floats-line-wrap-shifted-001-ref.html": [
     [
      {}
@@ -475857,16 +475992,68 @@
   "css/CSS2/floats-clear/support/test-tl.png": [
    "f6ac0ef7e8f6e192c9c26239884bf92b13cf67b8",
    "support"
   ],
   "css/CSS2/floats-clear/support/test-tr.png": [
    "59843ae54b64f6ce4f7e616d4be491c911ea84cf",
    "support"
   ],
+  "css/CSS2/floats/float-nowrap-1-notref.html": [
+   "90eb8ef0501371ed2bac0d9a5d834f389f6df7cc",
+   "support"
+  ],
+  "css/CSS2/floats/float-nowrap-1.html": [
+   "e9bd0db6fec826573204e1e1b0a0a96ca0db8204",
+   "reftest_node"
+  ],
+  "css/CSS2/floats/float-nowrap-2.html": [
+   "a20ebee2e17969ebc2a3cc4c564268b2d9b460c7",
+   "reftest"
+  ],
+  "css/CSS2/floats/float-nowrap-3-ref.html": [
+   "a7d1a0b3a5d054a5d729d6c39e05a2226d023698",
+   "reftest_node"
+  ],
+  "css/CSS2/floats/float-nowrap-3.html": [
+   "68be2ca43749459ef5e89ee5e4e5413e208fdc97",
+   "reftest"
+  ],
+  "css/CSS2/floats/float-nowrap-4-ref.html": [
+   "bcc45773c03ba4014569442509b82beac79ff1c3",
+   "support"
+  ],
+  "css/CSS2/floats/float-nowrap-4.html": [
+   "3df6dcc3a8fdd9397322f2bc2ce182a1b66da9af",
+   "reftest_node"
+  ],
+  "css/CSS2/floats/float-nowrap-5-ref.html": [
+   "61ec5b6e4a4413eedeedf452f49200dac57d1efc",
+   "support"
+  ],
+  "css/CSS2/floats/float-nowrap-5.html": [
+   "e3dd4f2092e13f5326f2724ae24e63d418d17930",
+   "reftest"
+  ],
+  "css/CSS2/floats/float-nowrap-6.html": [
+   "480421e65b0d537835899bc0ad24cc6abe6f2c2e",
+   "reftest"
+  ],
+  "css/CSS2/floats/float-nowrap-7.html": [
+   "81f43c1770f07113e685395143b331fcaf4c79a1",
+   "reftest"
+  ],
+  "css/CSS2/floats/float-nowrap-8.html": [
+   "bd066e4f94566395a78e7ac757c91f611257dfa9",
+   "reftest"
+  ],
+  "css/CSS2/floats/float-nowrap-9.html": [
+   "f16e798ab48ffbdf25e25b50d33791503dd299f2",
+   "reftest"
+  ],
   "css/CSS2/floats/floated-table-wider-than-specified.html": [
    "f93d50e43dd3eb49d5c8964200b7fe4ebb5bd6c8",
    "reftest"
   ],
   "css/CSS2/floats/floats-in-table-caption-001-ref.html": [
    "bf02b993c455a7630c4508b7bb5e0efdebde5f47",
    "support"
   ],
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/floats/float-nowrap-1-notref.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<title>CSS Test Reference</title>
+<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel="author" href="https://www.mozilla.org" title="Mozilla">
+<style>
+  div {
+    width: 10ch;
+    white-space: nowrap;
+    font-family: monospace;
+  }
+  span {
+    float: right;
+    width: 5ch;
+    height: 5ch;
+    background: blue;
+  }
+</style>
+<div>
+  <span></span>
+  Some text that overflows my parent.
+</div>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/floats/float-nowrap-1.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<title>CSS Test: Floats in nowrap context</title>
+<link rel="help" href="https://drafts.csswg.org/css2/visuren.html#float-position">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=488725">
+<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel="author" href="https://www.mozilla.org" title="Mozilla">
+<link rel="mismatch" href="float-nowrap-1-notref.html">
+<style>
+  div {
+    width: 10ch;
+    white-space: nowrap;
+    font-family: monospace;
+  }
+  span {
+    float: right;
+    width: 5ch;
+    height: 5ch;
+    background: blue;
+  }
+</style>
+<div>
+  Some text that overflows my parent.
+  <span></span>
+</div>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/floats/float-nowrap-2.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<title>CSS Test: Floats in nowrap context</title>
+<link rel="help" href="https://drafts.csswg.org/css2/visuren.html#float-position">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=488725">
+<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel="author" href="https://www.mozilla.org" title="Mozilla">
+<link rel="match" href="float-nowrap-1.html">
+<style>
+  div {
+    width: 10ch;
+    white-space: nowrap;
+    font-family: monospace;
+  }
+  span {
+    float: right;
+    width: 5ch;
+    height: 5ch;
+    background: blue;
+  }
+</style>
+<div>
+  Some text that
+  <span></span>
+  overflows my parent.
+</div>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/floats/float-nowrap-3-ref.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<title>CSS Test: Floats in nowrap context</title>
+<link rel="help" href="https://drafts.csswg.org/css2/visuren.html#float-position">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=488725">
+<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel="author" href="https://www.mozilla.org" title="Mozilla">
+<link rel="mismatch" href="float-nowrap-4.html">
+<style>
+  div {
+    width: 10ch;
+    font-family: monospace;
+  }
+  .float {
+    float: right;
+    width: 5ch;
+    height: 5ch;
+    background: blue;
+  }
+  .nowrap {
+    white-space: nowrap;
+  }
+</style>
+<div>
+  Some
+  <span class="nowrap">
+    text that overflows my parent.
+  </span>
+  <span class="float"></span>
+</div>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/floats/float-nowrap-3.html
@@ -0,0 +1,28 @@
+<!doctype html>
+<title>CSS Test: Floats in nowrap context</title>
+<link rel="help" href="https://drafts.csswg.org/css2/visuren.html#float-position">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=488725">
+<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel="author" href="https://www.mozilla.org" title="Mozilla">
+<link rel="match" href="float-nowrap-3-ref.html">
+<style>
+  div {
+    width: 10ch;
+    font-family: monospace;
+  }
+  .float {
+    float: right;
+    width: 5ch;
+    height: 5ch;
+    background: blue;
+  }
+  .nowrap {
+    white-space: nowrap;
+  }
+</style>
+<div>
+  Some
+  <span class="nowrap">
+    text that overflows <span class="float"></span> my parent.
+  </span>
+</div>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/floats/float-nowrap-4-ref.html
@@ -0,0 +1,26 @@
+<!doctype html>
+<title>CSS Test Reference</title>
+<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel="author" href="https://www.mozilla.org" title="Mozilla">
+<style>
+  div {
+    width: 10ch;
+    font-family: monospace;
+  }
+  .float {
+    float: right;
+    width: 5ch;
+    height: 5ch;
+    background: blue;
+  }
+  .nowrap {
+    white-space: nowrap;
+  }
+</style>
+<div>
+  Some
+  <span class="float"></span>
+  <span class="nowrap">
+    text that overflows my parent.
+  </span>
+</div>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/floats/float-nowrap-4.html
@@ -0,0 +1,28 @@
+<!doctype html>
+<title>CSS Test: Floats in nowrap context</title>
+<link rel="help" href="https://drafts.csswg.org/css2/visuren.html#float-position">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=488725">
+<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel="author" href="https://www.mozilla.org" title="Mozilla">
+<link rel="match" href="float-nowrap-4-ref.html">
+<style>
+  div {
+    width: 10ch;
+    font-family: monospace;
+  }
+  .float {
+    float: right;
+    width: 5ch;
+    height: 5ch;
+    background: blue;
+  }
+  .nowrap {
+    white-space: nowrap;
+  }
+</style>
+<div>
+  Some
+  <span class="nowrap">
+    <span class="float"></span> text that overflows my parent.
+  </span>
+</div>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/floats/float-nowrap-5-ref.html
@@ -0,0 +1,5 @@
+<!doctype html>
+<title>CSS Test Reference</title>
+<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel="author" href="https://www.mozilla.org" title="Mozilla">
+<div>Hello Kittie
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/floats/float-nowrap-5.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<title>CSS Test: Floats in nowrap context</title>
+<link rel="help" href="https://drafts.csswg.org/css2/visuren.html#float-position">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=488725">
+<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel="author" href="https://www.mozilla.org" title="Mozilla">
+<link rel="match" href="float-nowrap-5-ref.html">
+<style>
+  div {
+    white-space: nowrap;
+  }
+  span {
+    float: left;
+  }
+</style>
+<div>Kittie<span>Hello&nbsp;</span>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/floats/float-nowrap-6.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<title>CSS Test: Floats in nowrap context</title>
+<link rel="help" href="https://drafts.csswg.org/css2/visuren.html#float-position">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=488725">
+<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel="author" href="https://www.mozilla.org" title="Mozilla">
+<link rel="match" href="float-nowrap-5-ref.html">
+<style>
+  div {
+    white-space: nowrap;
+  }
+  span {
+    float: left;
+  }
+</style>
+<div><span>Hello&nbsp;</span>Kittie
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/floats/float-nowrap-7.html
@@ -0,0 +1,26 @@
+<!doctype html>
+<title>CSS Test: Floats in nowrap context</title>
+<link rel="help" href="https://drafts.csswg.org/css2/visuren.html#float-position">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=488725">
+<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel="author" href="https://www.mozilla.org" title="Mozilla">
+<link rel="match" href="float-nowrap-1.html">
+<style>
+  div {
+    width: 10ch;
+    white-space: nowrap;
+    font-family: monospace;
+  }
+  .nowrap {
+    white-space: nowrap;
+  }
+  .float {
+    float: right;
+    width: 5ch;
+    height: 5ch;
+    background: blue;
+  }
+</style>
+<div>
+  <span class="nowrap">S<div class="float"></div><span>ome</span> text that overflows my parent.</span>
+</div>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/floats/float-nowrap-8.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<title>CSS Test: Floats in nowrap context</title>
+<link rel="help" href="https://drafts.csswg.org/css2/visuren.html#float-position">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=488725">
+<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel="author" href="https://www.mozilla.org" title="Mozilla">
+<link rel="match" href="float-nowrap-1.html">
+<style>
+  div {
+    width: 10ch;
+    white-space: nowrap;
+    font-family: monospace;
+  }
+  span {
+    float: right;
+    width: 5ch;
+    height: 5ch;
+    background: blue;
+  }
+</style>
+<div>
+  Some <span></span>
+  text that overflows my parent.
+</div>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/CSS2/floats/float-nowrap-9.html
@@ -0,0 +1,28 @@
+<!doctype html>
+<title>CSS Test: Floats in nowrap context</title>
+<link rel="help" href="https://drafts.csswg.org/css2/visuren.html#float-position">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=488725">
+<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel="author" href="https://www.mozilla.org" title="Mozilla">
+<link rel="match" href="float-nowrap-3-ref.html">
+<style>
+  div {
+    width: 10ch;
+    font-family: monospace;
+  }
+  .float {
+    float: right;
+    width: 5ch;
+    height: 5ch;
+    background: blue;
+  }
+  .nowrap {
+    white-space: nowrap;
+  }
+</style>
+<div>
+  Some
+  <span class="nowrap">
+    text <span class="float"></span> that overflows my parent.
+  </span>
+</div>