diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 2bac0b7768c..64fdd0967f4 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -54231,6 +54231,18 @@
      {}
     ]
    ],
+   "css/CSS2/linebox/fractional-line-height.html": [
+    [
+     "/css/CSS2/linebox/fractional-line-height.html",
+     [
+      [
+       "/css/reference/nothing.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/CSS2/linebox/inline-box-001.xht": [
     [
      "/css/CSS2/linebox/inline-box-001.xht",
@@ -213646,6 +213658,311 @@
      {}
     ]
    ],
+   "cookies/http-state/resources/cookie-http-state-template.js": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/cookie-setter.py": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/debugging-single-test.html.py-str": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/iframe-content-pushing.js": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/iframe-expectation-doc.html.py-str": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0001-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0001-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0002-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0002-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0003-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0003-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0004-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0004-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0005-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0005-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0006-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0006-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0007-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0007-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0008-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0008-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0009-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0009-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0010-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0010-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0011-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0011-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0012-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0012-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0013-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0013-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0014-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0014-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0015-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0015-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0016-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0016-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0017-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0017-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0018-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0018-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0019-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0019-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0020-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0020-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0021-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0021-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0022-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0022-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0023-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0023-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0024-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0024-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0025-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0025-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0026-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0026-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0027-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0027-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0028-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/0028-test": [
+    [
+     {}
+    ]
+   ],
    "cookies/resources/echo-cookie.html": [
     [
      {}
@@ -235616,6 +235933,11 @@
      {}
     ]
    ],
+   "css/css-align/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "css/css-align/content-distribution/place-content-shorthand-007-ref.html": [
     [
      {}
@@ -306139,6 +306461,12 @@
      {}
     ]
    ],
+   "apng/supported-in-source-type.html": [
+    [
+     "/apng/supported-in-source-type.html",
+     {}
+    ]
+   ],
    "audio-output/HTMLMediaElement-sinkId-idl.html": [
     [
      "/audio-output/HTMLMediaElement-sinkId-idl.html",
@@ -310519,6 +310847,12 @@
      {}
     ]
    ],
+   "cookies/http-state/all-tests.html": [
+    [
+     "/cookies/http-state/all-tests.html",
+     {}
+    ]
+   ],
    "cookies/meta-blocked.html": [
     [
      "/cookies/meta-blocked.html",
@@ -314617,6 +314951,12 @@
      {}
     ]
    ],
+   "css/css-tables/width-distribution/td-with-subpixel-padding.html": [
+    [
+     "/css/css-tables/width-distribution/td-with-subpixel-padding.html",
+     {}
+    ]
+   ],
    "css/css-text-decor/text-decoration-serialization.tentative.html": [
     [
      "/css/css-text-decor/text-decoration-serialization.tentative.html",
@@ -316033,6 +316373,24 @@
      {}
     ]
    ],
+   "css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-indexed-getter-setter.html": [
+    [
+     "/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-indexed-getter-setter.html",
+     {}
+    ]
+   ],
+   "css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-iterable.html": [
+    [
+     "/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-iterable.html",
+     {}
+    ]
+   ],
+   "css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-length.html": [
+    [
+     "/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-length.html",
+     {}
+    ]
+   ],
    "css/css-typed-om/stylevalue-subclasses/cssUnparsedValue.html": [
     [
      "/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue.html",
@@ -316045,6 +316403,12 @@
      {}
     ]
    ],
+   "css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue-variable.html": [
+    [
+     "/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue-variable.html",
+     {}
+    ]
+   ],
    "css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue.html": [
     [
      "/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue.html",
@@ -399826,6 +400190,10 @@
    "b9ba0287c92e5dbda1dc207ab45e9c90e8618878",
    "reftest"
   ],
+  "apng/supported-in-source-type.html": [
+   "32cf112fb1dcb4e7ec3c91bdf5bd6b976a1e4eac",
+   "testharness"
+  ],
   "audio-output/HTMLMediaElement-sinkId-idl.html": [
    "8f37d8d2fc1cb9b5ad0d85234f733f534f4f0db8",
    "testharness"
@@ -421486,6 +421854,254 @@
    "1949878db1be4093ec8d9595710f9fd8887434ba",
    "support"
   ],
+  "cookies/http-state/all-tests.html": [
+   "4e030633623184b3e5705d312294412b96f28bf7",
+   "testharness"
+  ],
+  "cookies/http-state/resources/cookie-http-state-template.js": [
+   "2e096943b9071f912adf4b3fec3ecae8e6b68118",
+   "support"
+  ],
+  "cookies/http-state/resources/cookie-setter.py": [
+   "693d8ec6f340275e978db3ad9a8472c411ac733f",
+   "support"
+  ],
+  "cookies/http-state/resources/debugging-single-test.html.py-str": [
+   "654fd1e28ddb80d348177156be6891a69151bf35",
+   "support"
+  ],
+  "cookies/http-state/resources/iframe-content-pushing.js": [
+   "fbc5db2860aeda6f40ab030860ef0cad4269b623",
+   "support"
+  ],
+  "cookies/http-state/resources/iframe-expectation-doc.html.py-str": [
+   "75d7f676ea34a2de323a5e21fd0311fc6af10559",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0001-expected": [
+   "2017a6b45d4929c7f8ebbbaca36331cc11199f88",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0001-test": [
+   "39267fb59abc334f248787ad0b90fdb335b6d978",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0002-expected": [
+   "2017a6b45d4929c7f8ebbbaca36331cc11199f88",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0002-test": [
+   "831c8e90ead0291ffe36a82f0ada40c9a1b39f7f",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0003-expected": [
+   "6e46add5a20aed330c75fc95a727647a6a62085c",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0003-test": [
+   "10a97fd3dd221dc3681a548e166ff81d70623d85",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0004-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0004-test": [
+   "ca5e6a3fef1d281d2658efbb49a1d3d93cff5383",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0005-expected": [
+   "2017a6b45d4929c7f8ebbbaca36331cc11199f88",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0005-test": [
+   "21f309bbef82b8f40db76d4b2c16a70d7c48fa3d",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0006-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0006-test": [
+   "d65ef234d4b769ded714a2954f9911c231921e08",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0007-expected": [
+   "2017a6b45d4929c7f8ebbbaca36331cc11199f88",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0007-test": [
+   "6781b00cb8db2d51bcdea7f3e3898d2bf71a18ad",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0008-expected": [
+   "2017a6b45d4929c7f8ebbbaca36331cc11199f88",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0008-test": [
+   "e144c22f6b0f015e42bc99b7ede7533f88009a79",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0009-expected": [
+   "2017a6b45d4929c7f8ebbbaca36331cc11199f88",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0009-test": [
+   "6cc31bc3fadd075bc3df42200559a1c384b5954c",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0010-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0010-test": [
+   "8938cf5aeef5a84828a41424154e23d77503a7c2",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0011-expected": [
+   "2017a6b45d4929c7f8ebbbaca36331cc11199f88",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0011-test": [
+   "bb5a0e5a6cb4884e4161fa3aaef85f5c889aa2c3",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0012-expected": [
+   "2017a6b45d4929c7f8ebbbaca36331cc11199f88",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0012-test": [
+   "50f6b17f8663140ef6a8da5b0b808ddb75de3ff6",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0013-expected": [
+   "94ac42babde7e098c5a3b1a5b967a482661d34d9",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0013-test": [
+   "cfbaa5ec1434f310a2307f31384c5c802a41dcee",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0014-expected": [
+   "63b44fb34e929499aa6e7e10107ba42bed4bf102",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0014-test": [
+   "1bba693282c7a6cd8a8189e42f2223f664b70bc3",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0015-expected": [
+   "969c588efb9bed6d834836ab8c7154615981fcaf",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0015-test": [
+   "44b7c98589eb8c93ffb0d4b8410f683d789c3403",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0016-expected": [
+   "f6871163355cbcf80d33619af177c6dc6947d2f1",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0016-test": [
+   "21ce5420b2802c9a2c60c7f8cd4aa82b466cd6db",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0017-expected": [
+   "12081e8a1edca7056df86a2abd6156790ce00318",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0017-test": [
+   "e7816075c82788cd1de25dec77fb7ff1929f0d74",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0018-expected": [
+   "fa5f92ce177b11fc1b8df81abd75cc2d7feaa591",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0018-test": [
+   "27baa279199e4dd31a3008e59591ea4655c925cd",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0019-expected": [
+   "c72660a2dea4cc06221857e79d722cd656b7c797",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0019-test": [
+   "c43d87e073450f63b89a8b95603fd9b2f1c78c77",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0020-expected": [
+   "55019e1af5182dc7641f6ea731a65781ba7f6410",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0020-test": [
+   "280ee9a2f25bc8b68e6120e92199e8586a4b2095",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0021-expected": [
+   "55019e1af5182dc7641f6ea731a65781ba7f6410",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0021-test": [
+   "35805d1fb83bfbf179dc6ae01d7dfc0fab959f6b",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0022-expected": [
+   "4241a551c571283d8a8f5077351db5dc3f068dd6",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0022-test": [
+   "a22c4427ded3c9ee5b3bb8abf8c2f8d035a5df04",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0023-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0023-test": [
+   "b0e7f6e71e828d978b9cba6b78666313db236ac9",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0024-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0024-test": [
+   "eb071d44c0344f5a227f2fa5eebf0111a8a49683",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0025-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0025-test": [
+   "36a5c1062a93f924ee4db79cd8e4caa3df38c48e",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0026-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0026-test": [
+   "b0e7f6e71e828d978b9cba6b78666313db236ac9",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0027-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0027-test": [
+   "d5d8e8d85183b6665438a42c14c17e56724ff0c7",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0028-expected": [
+   "b0e7f6e71e828d978b9cba6b78666313db236ac9",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/0028-test": [
+   "b0e7f6e71e828d978b9cba6b78666313db236ac9",
+   "support"
+  ],
   "cookies/meta-blocked.html": [
    "1ece2f38a340ff4ff4713ada5568281d0e1c5be2",
    "testharness"
@@ -445542,6 +446158,10 @@
    "7d267cb188014a18688e13806e095706f3f2d937",
    "reftest"
   ],
+  "css/CSS2/linebox/fractional-line-height.html": [
+   "d883c6dbf79c1da2c7a9a2261ec19eb6fc546082",
+   "reftest"
+  ],
   "css/CSS2/linebox/inline-box-001-ref.xht": [
    "55eee0833d9596605cb10d6bccfaedbe6f784027",
    "support"
@@ -480978,6 +481598,10 @@
    "7390f245c6f208a1d1f1a6548d6f7f0185decedb",
    "visual"
   ],
+  "css/css-align/OWNERS": [
+   "93058c59bbb33b95dc3ca53757a13c34994c7d3a",
+   "support"
+  ],
   "css/css-align/content-distribution/parse-align-content-001.html": [
    "5f85c7e0760de399e2bbff0d27bcbe48b52f6ab0",
    "testharness"
@@ -508274,6 +508898,10 @@
    "9eeb49d2d78c3f81825de0d9e24de2a097275175",
    "testharness"
   ],
+  "css/css-tables/width-distribution/td-with-subpixel-padding.html": [
+   "b93845c332e5153c8a28085303b165d3c96f984e",
+   "testharness"
+  ],
   "css/css-tables/zero-rowspan-001-ref.html": [
    "b7886acdf8a380f85ebbcab0ded1e927fd509600",
    "support"
@@ -520726,16 +521354,32 @@
    "700fae462f258404f3d0b8fad290613fc1929e1d",
    "testharness"
   ],
+  "css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-indexed-getter-setter.html": [
+   "49fe1442d98ad498f3e0e6ce497a6f1ee6e62c31",
+   "testharness"
+  ],
+  "css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-iterable.html": [
+   "d91a7d0e8ee2cc40fa1b2747bee392a2cc2deae2",
+   "testharness"
+  ],
+  "css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-length.html": [
+   "592897dad11ef8c6aa6ad42b9d779421cdda1a5c",
+   "testharness"
+  ],
   "css/css-typed-om/stylevalue-subclasses/cssUnparsedValue.html": [
-   "46d36ae2dc68f3f3f1cee5d85cb5f496b7c3fa67",
+   "c6dc634947afd7b84a6feda270ebac6ac2fa29c7",
    "testharness"
   ],
   "css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue-invalid.html": [
-   "ba012ace40e63718694a8cd91ba74039787ff666",
+   "89a261a071b9719cb44a03d9cdbf2e8f869b2c23",
+   "testharness"
+  ],
+  "css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue-variable.html": [
+   "b089be0bb5186c545f432b48c38abed458437129",
    "testharness"
   ],
   "css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue.html": [
-   "25b5d1108e4030ad8420a271bfaa85ce68d8bf59",
+   "dbf9e28846ef3246dabc72ef2266871393f6187a",
    "testharness"
   ],
   "css/css-typed-om/stylevalue-subclasses/numeric-objects/add-two-types.tentative.html": [
@@ -525827,99 +526471,99 @@
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-slr-043.xht": [
-   "2572d212eb7b0ee8cf8c8e64998a9f6510fbb5c8",
+   "468a21488cb4ec0f053f00899e566a548e21a823",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-slr-047.xht": [
-   "8cff518b35a454ab79e535cbaa3f2681467852bf",
+   "05eec73fe552650ff14ca9b5e09b74968f1c8599",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-slr-048.xht": [
-   "3c4168a6b7a4394e79332fc44fd6ce2ed4bb4d05",
+   "43dcb63d597c67fc6b14f156c171679a3786b8d3",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-slr-050.xht": [
-   "2743c4da7bcf425c7a64eb830812e556793399ec",
+   "6c15357d7652f8ba6cd2ff875f6b36eb09763324",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-slr-054.xht": [
-   "02abde8b92072855802e6c62b00c2f80e879d837",
+   "9d57811c44d407987958dceac6ffb9a9d4b39989",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-slr-055.xht": [
-   "dcdc9e8b53066918921fcd3344cc01e63b949e57",
+   "efaef29e1503416ed9b28bb5e3168d8de17398cf",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-slr-056.xht": [
-   "ffc2b5d2cf95ecb2c34f87c8f5d1fac272f5dce2",
+   "e9a66eec637e2f341d1ad14fcdcd0de19fb6a653",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-slr-058.xht": [
-   "911b15f6f34dadc694fb616d8d407a9b8d9f6c04",
+   "9cccfb1b3f67046b5a983636378f702d9a41195c",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-slr-060.xht": [
-   "bbc062eab7ed6255f6003dd3854a425b3924c00f",
+   "83d909644b4cb17d1226d9ddbabeb7d57e9e87f1",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-slr-062.xht": [
-   "b6aad0e119a3c1c7b499f9c6bc7c995f27c67af5",
+   "8a8b2aab628ccf23c8ccd4af5afe2ad1b9fa62c3",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-slr-063.xht": [
-   "e0b04531c577ba0a981b8924821fae549ebd1929",
+   "1578a394039a7f94e50b8c77c595a9d30a4b2440",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-slr-066.xht": [
-   "7ed377a5bdeea3febd2ce9dd7a9c026309fad9a5",
+   "c9e1b47e57e577657314b5cd0238f2af7df10528",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-srl-042.xht": [
-   "a744d2956897aa50b9cdd40c02b11095fac033d7",
+   "27278ea5ee212762f084cbd7611ef7e656ac78af",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-srl-045.xht": [
-   "3b6989eeb0d72be091178857e943a07d8ebd8222",
+   "be9b0a91886920b908e926178107931414dc53f3",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-srl-046.xht": [
-   "1538cbe4469bf4ad7a76ddbb6b8dca0bbf66b677",
+   "0146a4ab943bd9fb93fadb6dbefbc2b061a97ed9",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-srl-049.xht": [
-   "ebb14e798a8130602aca276ea0a38630dec8d34e",
+   "a26dd15a464d684d2a87482e907089b704464ef2",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-srl-051.xht": [
-   "4e09e05cf6a050eb0f14005cc30a1265cdb77965",
+   "0883264754854ac8ece45750d009d3a20775a060",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-srl-052.xht": [
-   "efb981070ffcf1a36b585629f9280d24a4027e1c",
+   "1e6b03e2b281645ebf6765bd00b3f647f3deb2aa",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-srl-053.xht": [
-   "435c9bbece00e10a9c014d83f0f98ecc9b916d33",
+   "124fac2b2d256a256ff30da3ff0a19aef367e937",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-srl-057.xht": [
-   "f9cf903b644bdb5bed3cd528e4c1767373608109",
+   "8ee56fb9e1b864628665b00aec48f6f103682727",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-srl-059.xht": [
-   "195cc7d500300a9694ff11107bb4185fec28c386",
+   "cc664535dce2cc996e577bc11da72d54e17e43b0",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-srl-061.xht": [
-   "1b94eba25c014f6e170f988bd6a122b923a60d74",
+   "d9a28ec7b30504a79411a9b1394e71fa1af106d6",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-srl-064.xht": [
-   "22f96cf894b72203395395406e8fbeeca623e3c3",
+   "94679f337417313d58dcc3f51c4f6c10f32fdb80",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-srl-065.xht": [
-   "10c9d6885cce53c90767914e3e1e02a69ba60809",
+   "69eae3eebfe5f92588f04589972ac026869ed0c0",
    "reftest"
   ],
   "css/css-writing-modes/block-flow-direction-vlr-003.xht": [
@@ -526715,19 +527359,19 @@
    "reftest"
   ],
   "css/css-writing-modes/form-controls-slr-004.xht": [
-   "efba29b2412dceccd9d80b864c3083dc0ca3bab4",
+   "5913b5c624e76dd88b60c4483a7508d9ee1acdfd",
    "visual"
   ],
   "css/css-writing-modes/form-controls-slr-005.xht": [
-   "f3879665cf517981289235d53183f865e7edc96d",
+   "f8580b2937e0723953124a5d3ad5211d193b98a8",
    "visual"
   ],
   "css/css-writing-modes/form-controls-srl-004.xht": [
-   "33e6c1685b8e7050b0177eaf289587a370a22788",
+   "4add739342cfad21e3c8181f4879b0ef81969823",
    "visual"
   ],
   "css/css-writing-modes/form-controls-srl-005.xht": [
-   "ad7e8fa2e34412a97f993bdf500bf1ab92468618",
+   "610192f804eaf3e8aa8ec6ffe32e373f5121182f",
    "visual"
   ],
   "css/css-writing-modes/form-controls-vlr-004.xht": [
@@ -526755,7 +527399,7 @@
    "reftest"
   ],
   "css/css-writing-modes/full-width-003.html": [
-   "a2b545c155e7d0de06558de5eb9255a06a7b623b",
+   "3c894f12a91dc9ec795da1d1ce9af343f4056e4f",
    "reftest"
   ],
   "css/css-writing-modes/height-width-inline-non-replaced-vlr-003.xht": [
@@ -526855,11 +527499,11 @@
    "support"
   ],
   "css/css-writing-modes/inline-block-alignment-slr-009.xht": [
-   "bb08c9b4dc7d43e21ba06ed8d627a83f3fe88195",
+   "f4b234caea1eb70e611105f489162a5e15c8b2ab",
    "reftest"
   ],
   "css/css-writing-modes/inline-block-alignment-srl-008.xht": [
-   "e5a69f570eaf4ae8301497f368ca28c56ae37f64",
+   "752dcce21012f2160340755cf2e61e07c9af0401",
    "reftest"
   ],
   "css/css-writing-modes/inline-replaced-vlr-003.xht": [
@@ -526915,75 +527559,75 @@
    "reftest"
   ],
   "css/css-writing-modes/line-box-direction-slr-043.xht": [
-   "261b7ba2d63953ed9683203fb645c7a61d5ee69c",
+   "fc746d13200941edbb5768005fce9da1b6f027da",
    "reftest"
   ],
   "css/css-writing-modes/line-box-direction-slr-047.xht": [
-   "4e79c976242cfa75a176c0cada39d01e5c78ad85",
+   "199beaf9ce8b56dea37c3de62d90622325b8dcc6",
    "reftest"
   ],
   "css/css-writing-modes/line-box-direction-slr-048.xht": [
-   "68d1ea51fd4fc739b34c552d51f2fe7d1353d623",
+   "b3cdb4f8b8e3f6a87a0c7d0ed22c1f88e043b8b4",
    "reftest"
   ],
   "css/css-writing-modes/line-box-direction-slr-050.xht": [
-   "e344509f83e8218038c33bc57afa4098415723c2",
+   "403ab8916ad7a46fcab2f89cd00341f5aba37951",
    "reftest"
   ],
   "css/css-writing-modes/line-box-direction-slr-053.xht": [
-   "0a110aed9cf0daca3726b0e4f3f9dfaec9717531",
+   "ad831477dbe515ff69af28835bbf02ef52b7fd78",
    "reftest"
   ],
   "css/css-writing-modes/line-box-direction-slr-054.xht": [
-   "d3f34a9fbcdf4829b89fe5d234f0fcdb790f69e2",
+   "5b40e37df4b14d673b18caf49b6585db8b929b0a",
    "reftest"
   ],
   "css/css-writing-modes/line-box-direction-slr-056.xht": [
-   "7b4fee06564e1fbfbafd265a86169f0fed808189",
+   "7d22bd9249e1a57b911aeb9152005b762294aa3f",
    "reftest"
   ],
   "css/css-writing-modes/line-box-direction-slr-058.xht": [
-   "b440c7611ba17503cf554743fcaa9b8fda4645bd",
+   "55b25b7f033bb947af20a050c898df46ce90fce1",
    "reftest"
   ],
   "css/css-writing-modes/line-box-direction-slr-060.xht": [
-   "5b70316c9b4fb6966ca6be60383510c551031754",
+   "424ac86428fe16aab5d838593b7c3ecd2d9e2eea",
    "reftest"
   ],
   "css/css-writing-modes/line-box-direction-srl-042.xht": [
-   "37802011406dd698ba6ca84fadafd41c80fe5219",
+   "3dd8e07bb61570b91c9752d86a441b48adbd73f5",
    "reftest"
   ],
   "css/css-writing-modes/line-box-direction-srl-045.xht": [
-   "359d4e903bc5c9900afe137bf04f845c5343c58f",
+   "efaa79a5ef835c105167bdf77a3d706812421a23",
    "reftest"
   ],
   "css/css-writing-modes/line-box-direction-srl-046.xht": [
-   "f9f0ab3c9c737042296d1ce42815dfd47b2ca1c2",
+   "cd31562a8364cf6e577c00c34919b0e5aa1ae964",
    "reftest"
   ],
   "css/css-writing-modes/line-box-direction-srl-049.xht": [
-   "b193a9a935b1676d7589bc8c1d8970f50a60df81",
+   "ef4bb25f2bb85fb85a12c82a51a84523cb0d621c",
    "reftest"
   ],
   "css/css-writing-modes/line-box-direction-srl-051.xht": [
-   "aee21a5a74b20866c88ed013246ebb9f75ff3abb",
+   "eebeb3a4e949de579028555257d7b9101fa766a7",
    "reftest"
   ],
   "css/css-writing-modes/line-box-direction-srl-052.xht": [
-   "c3391087560a125cea050895827a92f2f4146dd7",
+   "d835e7576a419bb70f4215d87c17d8ab8fc719b5",
    "reftest"
   ],
   "css/css-writing-modes/line-box-direction-srl-055.xht": [
-   "a3bd03f28860f8918f41fd6e265d02cf266cbd80",
+   "45bd2391e3aecb1dafe25e8ee8c799aaf65e5b28",
    "reftest"
   ],
   "css/css-writing-modes/line-box-direction-srl-057.xht": [
-   "0f2ce06eaddcaea0bce8150960e7559ebb950160",
+   "1b7a10cb7b12ee4e86d6dc3e4cd0af1d52d2e78f",
    "reftest"
   ],
   "css/css-writing-modes/line-box-direction-srl-059.xht": [
-   "fe8eefd194242a82cdcdc6eff35a120b64273863",
+   "1eb4e84ae0649a0a08cfc1b4f5bc0b58c8816046",
    "reftest"
   ],
   "css/css-writing-modes/line-box-direction-vlr-003.xht": [
@@ -527419,11 +528063,11 @@
    "reftest"
   ],
   "css/css-writing-modes/outline-inline-slr-005.xht": [
-   "288265613525071c968c1dcdf5321a316e6c7e3a",
+   "16186c35b27f203ebc933dd709616485ee9d9c20",
    "visual"
   ],
   "css/css-writing-modes/outline-inline-srl-004.xht": [
-   "edd7d159627dfa8f0dd4a7f8495ad9337ab340c9",
+   "133ce7d9f80f6348c3b31371bca5411e059da107",
    "visual"
   ],
   "css/css-writing-modes/outline-inline-vlr-003.xht": [
@@ -527531,11 +528175,11 @@
    "manual"
   ],
   "css/css-writing-modes/page-flow-direction-slr-005.xht": [
-   "403dc532d7767e83bb95901dcb52e0f76e430c7f",
+   "8201313e778d8e5131309e0c9754a62bb7bcf894",
    "manual"
   ],
   "css/css-writing-modes/page-flow-direction-srl-004.xht": [
-   "b9d1556c197d048482c80232527c837e2e4a4cf8",
+   "b7079a0dd1cc46e8252deff8a3b08e0915ea5a31",
    "manual"
   ],
   "css/css-writing-modes/percent-margin-vlr-003.xht": [
@@ -528131,19 +528775,19 @@
    "visual"
   ],
   "css/css-writing-modes/row-progression-slr-023.xht": [
-   "e67bf87a273fe2adf826e9c9027124223cb85467",
+   "521760bfe32e1bfc2847cad41374adfb3364189f",
    "reftest"
   ],
   "css/css-writing-modes/row-progression-slr-029.xht": [
-   "ff69b7bc92bf0170456c7571377ae8f926022825",
+   "c0e02776d0e1197ad46fed136c030dcfc2f200cd",
    "reftest"
   ],
   "css/css-writing-modes/row-progression-srl-022.xht": [
-   "066a4e77a127b462c0acf5605310bc55158a0855",
+   "cce1619834bebde3142f253f51f7213547fc2a3c",
    "reftest"
   ],
   "css/css-writing-modes/row-progression-srl-028.xht": [
-   "f9c36aee12493a18571fb71faee27d25ce438e8f",
+   "69273bece274aeb003d7b2c8161c49ee0707c551",
    "reftest"
   ],
   "css/css-writing-modes/row-progression-vlr-003.xht": [
@@ -528159,7 +528803,7 @@
    "reftest"
   ],
   "css/css-writing-modes/row-progression-vlr-009.xht": [
-   "8afc2dba356e13db199c7ad74c2e3feeb0fc71db",
+   "f64e3c38517f2ed06ef2aceb54271ebb816dde1e",
    "reftest"
   ],
   "css/css-writing-modes/row-progression-vrl-002.xht": [
@@ -529599,11 +530243,11 @@
    "reftest"
   ],
   "css/css-writing-modes/table-column-order-slr-007.xht": [
-   "ce7897d71baa58c00c3a4dea8130709d37a56c3d",
+   "497d991283082dbe537a50648678f95c05d5482c",
    "reftest"
   ],
   "css/css-writing-modes/table-column-order-srl-006.xht": [
-   "82f1efc4262858013fa4446ac162b949f9a0abdd",
+   "19751b05f2d9f4bdbba1282e4b31cddfca4b87e0",
    "reftest"
   ],
   "css/css-writing-modes/table-progression-001-ref.html": [
@@ -529619,19 +530263,19 @@
    "support"
   ],
   "css/css-writing-modes/table-progression-slr-001.html": [
-   "136acff6e0c7e9ad1fc02b0c2ec56d86fe3b2334",
+   "4e103df8bfa38417fc30d883061bd53e2b9b269c",
    "reftest"
   ],
   "css/css-writing-modes/table-progression-slr-002.html": [
-   "091e6f5ca213532c2933f54bcf3f1ce2b6e6ac14",
+   "601c9bfde09243ae6f228ef7c50c4e74f82a02e0",
    "reftest"
   ],
   "css/css-writing-modes/table-progression-srl-001.html": [
-   "81bb9759b21250d322ed5b35306bc279c65dbac7",
+   "3d16b996d03fc8852ce293d2b74c1bc48ec468d2",
    "reftest"
   ],
   "css/css-writing-modes/table-progression-srl-002.html": [
-   "8db7922b0c7faadfed55ae21041a7a4945b472b0",
+   "3f34be40a6e47e76ea05047d67a3b60015dcf664",
    "reftest"
   ],
   "css/css-writing-modes/table-progression-vlr-001.html": [
@@ -529815,11 +530459,11 @@
    "support"
   ],
   "css/css-writing-modes/text-baseline-slr-009.xht": [
-   "7d7d462fb5e26a2f735da1b9d391d3af4c82e9c4",
+   "d0bc650954a32ef38b4fb380e1949fe1c9744837",
    "reftest"
   ],
   "css/css-writing-modes/text-baseline-srl-008.xht": [
-   "e69f1e570a636bd447dea014e9481096cb0d1787",
+   "867ac538416750661b1deb445c15485afec865d9",
    "reftest"
   ],
   "css/css-writing-modes/text-baseline-vlr-003.xht": [
@@ -529879,19 +530523,19 @@
    "reftest"
   ],
   "css/css-writing-modes/text-combine-upright-parsing-digits-001.html": [
-   "9901ba440e7856a1dba6086417a59e9a6aa2571f",
+   "9dccbac170af19640e3352cad5d3cdc876ea0866",
    "testharness"
   ],
   "css/css-writing-modes/text-combine-upright-parsing-digits-002.html": [
-   "b3a3c71f86a553bc88e319e3f347e1209748fb9a",
+   "e7e0061bf2aa30f1d4c25b8ea75abeec8183dbab",
    "testharness"
   ],
   "css/css-writing-modes/text-combine-upright-parsing-invalid-001.html": [
-   "ceb1e3678cc6d520bbfadae029e9c3cc06e453e4",
+   "399800cdad8850d9ae841fa467c73f05b2fd3b30",
    "testharness"
   ],
   "css/css-writing-modes/text-combine-upright-parsing-invalid-002.html": [
-   "8cb9289e79cd60aec1115c086118a4d3c9834265",
+   "318ac1d26b5b4dfd5bf2ab8362c8ae365aea7f34",
    "testharness"
   ],
   "css/css-writing-modes/text-combine-upright-parsing-valid-001.html": [
@@ -529911,39 +530555,39 @@
    "reftest"
   ],
   "css/css-writing-modes/text-combine-upright-value-digits2-001.html": [
-   "cac653b24b0719df3519f28cdb7e4b8a53eccd69",
+   "76e9b4108255781dc974e5cc774ce43bb04c7cc8",
    "reftest"
   ],
   "css/css-writing-modes/text-combine-upright-value-digits2-002.html": [
-   "78ed12d8f5fb5437b97d21576931eec0d3719dc0",
+   "3fcb759c73f430c5daee90132f29ad00683db404",
    "reftest"
   ],
   "css/css-writing-modes/text-combine-upright-value-digits2-003.html": [
-   "4326fc4517828a283b29baaedc4e7fa45e5626fc",
+   "878ffcd6350bead22eb02c0c1b5ed4cd674c4377",
    "reftest"
   ],
   "css/css-writing-modes/text-combine-upright-value-digits3-001.html": [
-   "b0b97a321f310a1053873bec0912996f1e02d5bb",
+   "dd3a4ee60668ef908f457f53caae7f31047c5c89",
    "reftest"
   ],
   "css/css-writing-modes/text-combine-upright-value-digits3-002.html": [
-   "3ea6cde183d478ecce31edd3ee2d752139a2b73e",
+   "0d8937fd353ffc6afb10d539ded1d9f749221689",
    "reftest"
   ],
   "css/css-writing-modes/text-combine-upright-value-digits3-003.html": [
-   "dbdcf29eb97c0b9512f596abff4f314059aa5df4",
+   "801083d2e61aa03e0245c693309c4771faa65c90",
    "reftest"
   ],
   "css/css-writing-modes/text-combine-upright-value-digits4-001.html": [
-   "c30132b2caf8ebb340dd38e5e4cc6d4f0121f9ff",
+   "79634f21871f273bc36613c8074e33bcc55ded83",
    "reftest"
   ],
   "css/css-writing-modes/text-combine-upright-value-digits4-002.html": [
-   "e4d39c7a7edb4e10f394970439f0cca5c0c5f128",
+   "92af4d9107ceb541ee1f98ad55e9d2c56ce2909b",
    "reftest"
   ],
   "css/css-writing-modes/text-combine-upright-value-digits4-003.html": [
-   "431d2e53d38c6c3800ff70c9c79bb6738b364cb7",
+   "ee5e7721a870291288a6e5a408ac2613871ac3c8",
    "reftest"
   ],
   "css/css-writing-modes/text-combine-upright-value-none-001.html": [
@@ -530119,7 +530763,7 @@
    "reftest"
   ],
   "css/css-writing-modes/text-orientation-mixed-slr-015.xht": [
-   "c43092d37cb60b744d80cddae4a9b274a0073e5a",
+   "5b03427b13a9586f7891acc84b4481e7be5d9ab4",
    "visual"
   ],
   "css/css-writing-modes/text-orientation-mixed-srl-016-ref.xht": [
@@ -530127,7 +530771,7 @@
    "support"
   ],
   "css/css-writing-modes/text-orientation-mixed-srl-016.xht": [
-   "c23b11adbb83d56d80167d3373f153a7828911a0",
+   "e915d9d4cf85cc76c3c2bfb23d880229144cf336",
    "reftest"
   ],
   "css/css-writing-modes/text-orientation-mixed-vlr-100-ref.html": [
@@ -530235,7 +530879,7 @@
    "visual"
   ],
   "css/css-writing-modes/text-orientation-sideways-slr-019.xht": [
-   "a044836b817181faea607eb8e776db82a70982f2",
+   "6402e262986377f75a9734b2ad39c89462f1e4be",
    "visual"
   ],
   "css/css-writing-modes/text-orientation-sideways-vlr-100-ref.html": [
@@ -530255,11 +530899,11 @@
    "reftest"
   ],
   "css/css-writing-modes/text-orientation-upright-slr-017.xht": [
-   "a7e63e94d73c9df28d7eaf38f7760e3c49442529",
+   "37048959d42607f908d704950860a82c605eae29",
    "visual"
   ],
   "css/css-writing-modes/text-orientation-upright-srl-018.xht": [
-   "588b6ae8ca104f3e636862f6086b9fae928b069d",
+   "e2cc82de89c7a33c5c18c300d0671c9da96fca63",
    "reftest"
   ],
   "css/css-writing-modes/text-orientation-upright-vlr-100-ref.html": [
@@ -530439,31 +531083,31 @@
    "reftest"
   ],
   "css/css-writing-modes/vertical-alignment-slr-029.xht": [
-   "60ef4cb770927ea21ecb085b7e29b4ce02346d25",
+   "d0dddcd9cb5bc21b2f1566439d8ef91a1e68b214",
    "reftest"
   ],
   "css/css-writing-modes/vertical-alignment-slr-031.xht": [
-   "c6e6346fc92b874121cf80f409a6994dc6bee3e2",
+   "c2253830b2060386fa7d93a8a07acf34d1895076",
    "reftest"
   ],
   "css/css-writing-modes/vertical-alignment-slr-033.xht": [
-   "1af7bb1dbf5462ebdf16ea4b3725c8b6ee6f8866",
+   "1db81b80a78fbe2d8f74f156a96abf47bf1f58c8",
    "reftest"
   ],
   "css/css-writing-modes/vertical-alignment-slr-035.xht": [
-   "219dc850c6de419c45719527b7f30ca84953e099",
+   "147364b7e7aa459c7c52098a9acecad7ca97e970",
    "reftest"
   ],
   "css/css-writing-modes/vertical-alignment-slr-037.xht": [
-   "078eddfc006c52a62557cf6f4b386a9a449a4084",
+   "a47e91d8d292ab9521b3d2319b3032fb090778f8",
    "visual"
   ],
   "css/css-writing-modes/vertical-alignment-slr-039.xht": [
-   "d83cf22f8ff17330a4ac17bf3f3edbd00d5de407",
+   "355c4cf541617219a6afdcfd0ec35df37e8f9faa",
    "visual"
   ],
   "css/css-writing-modes/vertical-alignment-slr-041.xht": [
-   "fff37acb50ac24b0d879d99e8201a02b9c471e93",
+   "a81d5cefd09e9f4eb32b85b5e91f9868de5d8b8f",
    "reftest"
   ],
   "css/css-writing-modes/vertical-alignment-slr-049-ref.xht": [
@@ -530471,31 +531115,31 @@
    "support"
   ],
   "css/css-writing-modes/vertical-alignment-srl-028.xht": [
-   "584717924daf8186707532e90d19491fb9596cd6",
+   "3dedf0183d3549bb8d0842342b1ef7bd57f7f280",
    "reftest"
   ],
   "css/css-writing-modes/vertical-alignment-srl-030.xht": [
-   "de4cc7b47866a44f91e6d09b82f768390278ce90",
+   "f32e7665116bd84b56077e5d3606ab2c9fac3c0e",
    "reftest"
   ],
   "css/css-writing-modes/vertical-alignment-srl-032.xht": [
-   "fcb7589f869bf40448466482296a6d6b4e91bf4b",
+   "3db8f8bb81825a2febf310512c12f05e1c6cace0",
    "reftest"
   ],
   "css/css-writing-modes/vertical-alignment-srl-034.xht": [
-   "d3d64bc592c7d3873af17103471d0702d7739dcb",
+   "81ebb41e47a0723cf5796836efcdab2f4f83decb",
    "reftest"
   ],
   "css/css-writing-modes/vertical-alignment-srl-036.xht": [
-   "2da544bd13f70a1c3fa82373ae03f63a81a701ad",
+   "accf5217f77f550153cf3943f53884064f5c68b6",
    "visual"
   ],
   "css/css-writing-modes/vertical-alignment-srl-038.xht": [
-   "6a0837aded8404f898d7730521dca7af62f06858",
+   "c6ccd92ac36fc7981d06ec2ab44449051bc8ad79",
    "visual"
   ],
   "css/css-writing-modes/vertical-alignment-srl-040.xht": [
-   "856d31a7c41a2daac058193905e108f521186a4a",
+   "2a7490ddce4f56719debbf5e87095c24e7cb9397",
    "reftest"
   ],
   "css/css-writing-modes/vertical-alignment-vlr-011.xht": [
@@ -530587,7 +531231,7 @@
    "reftest"
   ],
   "css/css-writing-modes/wm-propagation-body-008.xht": [
-   "200b7875de084cae5d9657b123b33f3464557f6a",
+   "a58999e55ac7968974cca7ad14d0a218ec140458",
    "reftest"
   ],
   "css/css-writing-modes/wm-propagation-body-010.xht": [
@@ -530627,11 +531271,11 @@
    "testharness"
   ],
   "css/css-writing-modes/writing-mode-parsing-sideways-lr-001.html": [
-   "d3af3d60656357583e722c983d060c1a30e0dabf",
+   "e57e20399404d3ce38be885b081b916666e01ea8",
    "testharness"
   ],
   "css/css-writing-modes/writing-mode-parsing-sideways-rl-001.html": [
-   "6434d9a2c8f70308094f9626e995b5cfcffe82a4",
+   "eef44aba22253a177525c039218497d00864d05d",
    "testharness"
   ],
   "css/css-writing-modes/writing-mode-parsing-svg1-001.html": [
@@ -543499,7 +544143,7 @@
    "support"
   ],
   "docs/_running-tests/index.md": [
-   "f860f2f652b8a837d3e565b896fec5eea35e267d",
+   "ab0156e7fea2e4e462065c458dd8aaf56298150a",
    "support"
   ],
   "docs/_running-tests/safari.md": [
@@ -543547,7 +544191,7 @@
    "support"
   ],
   "docs/_writing-tests/reftests.md": [
-   "19c5c75eb5d2a09f8ba61f94900f4e80a2d6b1bf",
+   "e9008d9896ba0693352309e2d16353b8bd16874f",
    "support"
   ],
   "docs/_writing-tests/rendering.md": [
@@ -570199,7 +570843,7 @@
    "support"
   ],
   "interfaces/accelerometer.idl": [
-   "6132c634314380a83c8a57647447826d95448939",
+   "a834258dac3ad510dec10425b9f79648547e0b42",
    "support"
   ],
   "interfaces/ambient-light.idl": [
@@ -570267,7 +570911,7 @@
    "support"
   ],
   "interfaces/gyroscope.idl": [
-   "a2aa39ac39a5ec1eff5f5023a8134b5ec387b766",
+   "7c37c98eb39d994a89314c45c216bcb27b51f2d1",
    "support"
   ],
   "interfaces/hr-time.idl": [
@@ -570327,7 +570971,7 @@
    "support"
   ],
   "interfaces/uievents.idl": [
-   "de07cb2600834f13c49e00d6d77df5108244b3ce",
+   "9e107e1ac2ed7195f802291f1d3827c53468a002",
    "support"
   ],
   "interfaces/url.idl": [
@@ -590731,7 +591375,7 @@
    "testharness"
   ],
   "service-workers/service-worker/navigate-window.https.html": [
-   "0499d4489276c2a933b79e47f1de591f467f42aa",
+   "4b481c60520981f5f5791344cd78d638412b4ecb",
    "testharness"
   ],
   "service-workers/service-worker/navigation-preload/broken-chunked-encoding.https.html": [
@@ -592935,7 +593579,7 @@
    "testharness"
   ],
   "streams/piping/error-propagation-backward.js": [
-   "e7f1bdd524056017264ba1f0d2f569c5a5bbece5",
+   "a9ed4065bf5512937a60f85e18ee0b4312994506",
    "support"
   ],
   "streams/piping/error-propagation-backward.serviceworker.https.html": [
@@ -593015,7 +593659,7 @@
    "testharness"
   ],
   "streams/piping/multiple-propagation.js": [
-   "8d00cd13d84d421a297bff499511d96f7b72c98c",
+   "a4f9df6a5da581c14aae0d489bc73972873f2b7d",
    "support"
   ],
   "streams/piping/multiple-propagation.serviceworker.https.html": [
@@ -593471,7 +594115,7 @@
    "testharness"
   ],
   "streams/transform-streams/errors.js": [
-   "5dcd3245e4518ff59d1297e900118cf04c6cd2d8",
+   "607bf12f225025a006e3b898776553fa23d38597",
    "support"
   ],
   "streams/transform-streams/errors.serviceworker.https.html": [
@@ -593591,7 +594235,7 @@
    "testharness"
   ],
   "streams/transform-streams/reentrant-strategies.js": [
-   "caf6c2d53b211fdfd001858a8656dc0f0f92ce74",
+   "1ddadc53f6b69bda7cf015ca44e6c78f74f11111",
    "support"
   ],
   "streams/transform-streams/reentrant-strategies.serviceworker.https.html": [
@@ -593651,7 +594295,7 @@
    "testharness"
   ],
   "streams/writable-streams/aborting.js": [
-   "d5c1da21925490cb9ea134eac5435a03e84fe4f7",
+   "f10c4d9ffb59d4480fd069a9ea70ec41f5b71754",
    "support"
   ],
   "streams/writable-streams/aborting.serviceworker.https.html": [
@@ -593691,7 +594335,7 @@
    "testharness"
   ],
   "streams/writable-streams/bad-underlying-sinks.js": [
-   "f09d495d577ff9904adbcfc4746acfd5f70860ff",
+   "9a9f0b9eb7a93e9809c549e983c4052648157592",
    "support"
   ],
   "streams/writable-streams/bad-underlying-sinks.serviceworker.https.html": [
@@ -593751,7 +594395,7 @@
    "testharness"
   ],
   "streams/writable-streams/close.js": [
-   "a0f0183652427bdcd049eac90eb52d1ba5e09110",
+   "45a448b31a40388f277ecf064339f6858f032cc1",
    "support"
   ],
   "streams/writable-streams/close.serviceworker.https.html": [
@@ -593851,7 +594495,7 @@
    "testharness"
   ],
   "streams/writable-streams/general.js": [
-   "4f07b059c3b2d90ca0c08ffe014e3e77ade70be0",
+   "af1848e49d119ba4e57b8354052e161ac8e80632",
    "support"
   ],
   "streams/writable-streams/general.serviceworker.https.html": [
@@ -593891,7 +594535,7 @@
    "testharness"
   ],
   "streams/writable-streams/reentrant-strategy.js": [
-   "e0fea3678e9441483cda043bff02595836a20de4",
+   "87a02a0d0b66c3fe571ca106379da254a4e2869f",
    "support"
   ],
   "streams/writable-streams/reentrant-strategy.serviceworker.https.html": [
@@ -600255,7 +600899,7 @@
    "support"
   ],
   "webdriver/tests/support/fixtures.py": [
-   "ff5b6ca84a42c849b018b512af6987dc9e317cc5",
+   "cfae7bac775181b96107346746f0e5b17b4e2eed",
    "support"
   ],
   "webdriver/tests/support/http_request.py": [
diff --git a/tests/wpt/metadata/css/css-values/vh_not_refreshing_on_chrome.html.ini b/tests/wpt/metadata/css/css-values/vh_not_refreshing_on_chrome.html.ini
deleted file mode 100644
index 26435e28b09..00000000000
--- a/tests/wpt/metadata/css/css-values/vh_not_refreshing_on_chrome.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[vh_not_refreshing_on_chrome.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
index 171592fc08f..6ef8bb1049f 100644
--- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
@@ -2,3 +2,6 @@
   [elementsFromPoint on the root document for points in iframe elements]
     expected: FAIL
 
+  [elementsFromPoint on inner documents]
+    expected: FAIL
+
diff --git a/tests/wpt/web-platform-tests/apng/supported-in-source-type.html b/tests/wpt/web-platform-tests/apng/supported-in-source-type.html
new file mode 100644
index 00000000000..0a4d232dcb1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/apng/supported-in-source-type.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<title>Animated PNG MIME type (image/apng) is recognized by &lt;source type></title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+function resolveUrl(relativeUrl) {
+  var a = document.createElement('a');
+  a.href = relativeUrl;
+  return a.href;
+}
+
+async_test(t => {
+  window.onload = t.step_func_done(() => {
+    let image = document.querySelector('img');
+    let apngSrc = document.querySelector('source');
+    assert_equals(image.currentSrc, resolveUrl(apngSrc.srcset));
+  });
+});
+</script>
+<picture>
+  <source srcset="/images/anim-gr.png" type="image/apng">
+  <img src="/images/anim-gr.gif" style="visibility: hidden">
+</picture>
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/all-tests.html b/tests/wpt/web-platform-tests/cookies/http-state/all-tests.html
new file mode 100644
index 00000000000..169984de6ac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/all-tests.html
@@ -0,0 +1,59 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset=utf-8>
+    <title>Tests basic cookie setting functionality</title>
+    <meta name=help href="https://tools.ietf.org/html/rfc6265#page-8">
+
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/cookie-http-state-template.js"></script>
+  </head>
+  <body>
+    <div id="log"></div>
+    <script>
+      setup({ explicit_timeout: true });
+
+      const TEST_CASES = [
+        {file: "0001", name: "Set cookie."},
+        {file: "0002", name: "Set cookie with future expiration."},
+        {file: "0003", name: "Set expired cookie along with valid cookie."},
+        {file: "0004", name: "Ignore cookie without key."},
+        {file: "0005", name: "Set cookie with age."},
+        {file: "0006", name: "Set no cookie with max-age=0."},
+        {file: "0007", name: "Set cookie with version=1."},
+        {file: "0008", name: "Set cookie with version=1000."},
+        {file: "0009", name: "Set cookie with custom value."},
+        // TODO(fhorschig): Could 0010 break when run on a HTTPS try server?
+        {file: "0010", name: "Dont accept 'secure' cookies over http."},
+        {file: "0011", name: "Ignore separators in cookie values."},
+        {file: "0012", name: "Ignore values with separators and without ';'."},
+        {file: "0013", name: "Use last value for cookies with identical keys."},
+        {file: "0014", name: "Keep alphabetic key order."},
+        {file: "0015", name: "Keep alphabetic single-char key order."},
+        {file: "0016", name: "Keep non-alphabetic key order."},
+        {file: "0017", name: "Keep order if comma-separated."},
+        {file: "0018", name: "Ignore keys after semicolon."},
+        {file: "0019", name: "Ignore attributes after semicolon."},
+        {file: "0020", name: "Ignore cookies without key and value."},
+        {file: "0021", name: "Ignore cookie without key in all 'Set-Cookie'."},
+        {file: "0022", name: "Set cookie without value in all 'Set-Cookie'."},
+        {file: "0023", name: "Ignore cookies without '=' in all 'Set-Cookie'."},
+        {file: "0024", name: "Ignore malformed cookies in all 'Set-Cookie'."},
+        {file: "0025", name: "Ignore cookies with ';' in all 'Set-Cookie'."},
+        {file: "0026", name: "Ignore malformed cookies in all 'Set-Cookie' v2."},
+        {file: "0027", name: "Ignore malformed cookies in all 'Set-Cookie' v3."},
+        // TODO(fhorschig): Ask about 0028's expectations ... should be empty?
+        {file: "0028", name: "[INVALID EXPECTATION] Ignore malformed cookies in all 'Set-Cookie' v4."},
+      ];
+
+      for (const i in TEST_CASES) {
+        const t = TEST_CASES[i];
+        promise_test(createCookieTest(t.file),
+                     t.file + " - " + t.name,
+                     { timeout: 3000 });
+      }
+
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/cookie-http-state-template.js b/tests/wpt/web-platform-tests/cookies/http-state/resources/cookie-http-state-template.js
new file mode 100644
index 00000000000..68c5212faab
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/cookie-http-state-template.js
@@ -0,0 +1,80 @@
+const SERVER_LOCATION = "resources";
+const SERVER_SCRIPT = SERVER_LOCATION + "/cookie-setter.py";
+
+function stripPrefixAndWhitespace(cookie_text) {
+  return cookie_text.replace(/^Cookie: /, '').replace(/^\s+|\s+$/g, '');
+}
+
+function getLocalResourcesPath() {
+  return location.pathname.replace(/[^\/]*$/, "") + SERVER_LOCATION;
+}
+
+function getAbsoluteServerLocation() {
+  return getLocalResourcesPath().replace(/resources.*$/,'')+ SERVER_SCRIPT;
+}
+
+function expireCookie(name, expiry_date, path) {
+  name = name || "";
+  expiry_date = expiry_date || "Thu, 01 Jan 1970 00:00:00 UTC";
+  path = path || getLocalResourcesPath();
+  document.cookie = name + "=; expires=" + expiry_date + "; path=" + path + ";";
+}
+
+function CookieManager() {
+  this.initial_cookies = [];
+}
+
+CookieManager.prototype.parse = document_cookies => {
+  this.initial_cookies = [];
+  document_cookies = document_cookies.replace(/^Cookie: /, '');
+  if (document_cookies != "") {
+    this.initial_cookies = document_cookies.split(/\s*;\s*/);
+  }
+}
+
+CookieManager.prototype.diffWith = document_cookies => {
+  this.actual_cookies = document_cookies;
+  for (let i in initial_cookies) {
+    let no_spaces_cookie_regex =
+        new RegExp(/\s*[\;]*\s/.source + initial_cookies[i]);
+    this.actual_cookies = actual_cookies.replace(no_spaces_cookie_regex, '');
+  }
+  return this.actual_cookies;
+}
+
+CookieManager.prototype.resetCookies = () => {
+  expireCookie(/*name=*/"");  // If a cookie without keys was accepted, drop it.
+  if (this.actual_cookies == "") {
+    return;  // There is nothing to reset here.
+  }
+  let cookies_to_delete = this.actual_cookies.split(/\s*;\s*/)
+  for (let i in cookies_to_delete){
+    expireCookie(cookies_to_delete[i].replace(/=.*$/, ""));
+    // Drop cookies with same name that were set to the root path which happens
+    // for example due to "0010" still failing.
+    expireCookie(cookies_to_delete[i].replace(/=.*$/, ""),
+                 /*expiry_date=*/null,
+                 /*path=*/'/');
+  }
+}
+
+function createCookieTest(file) {
+  return t => {
+    const iframe = document.createElement('iframe');
+    document.body.appendChild(iframe);
+    let diff_tool = new CookieManager();
+    t.add_cleanup(diff_tool.resetCookies);
+    return new Promise((resolve, reject) => {
+      diff_tool.parse(document.cookie);
+      window.addEventListener("message", t.step_func(e => {
+        assert_true(!!e.data, "Message contains data")
+        resolve(e.data);
+      }));
+      iframe.src = getAbsoluteServerLocation() + "?file=" + file;
+    }).then((response) => {
+      let actual_cookies = diff_tool.diffWith(response.cookies);
+      let expected_cookies = stripPrefixAndWhitespace(response.expectation);
+      assert_equals(actual_cookies, expected_cookies);
+    });
+  }
+};
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/cookie-setter.py b/tests/wpt/web-platform-tests/cookies/http-state/resources/cookie-setter.py
new file mode 100644
index 00000000000..0418f4b7630
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/cookie-setter.py
@@ -0,0 +1,54 @@
+from os import path;
+
+
+SETUP_FILE_TEMPLATE = "{}-test"
+EXPECTATION_FILE_TEMPLATE = "{}-expected"
+EXPECTATION_HTML_SCAFFOLD = "iframe-expectation-doc.html.py-str"
+DEBUGGING_HTML_SCAFFOLD = "debugging-single-test.html.py-str"
+DEFAULT_RESOURCE_DIR = path.join("cookies", "http-state", "resources")
+DEFAULT_TEST_DIR = "test-files"
+
+
+def dump_file(directory, filename):
+  return open(path.join(directory, filename), "r").read()
+
+
+class CookieTestResponse(object):
+  def __init__(self, file, root):
+    super(CookieTestResponse, self).__init__()
+    self.__test_file = SETUP_FILE_TEMPLATE.format(file)
+    self.__expectation_file = EXPECTATION_FILE_TEMPLATE.format(file)
+    self.__resources_dir = path.join(root, DEFAULT_RESOURCE_DIR)
+    self.__test_files_dir = path.join(self.__resources_dir, DEFAULT_TEST_DIR)
+
+  def cookie_setting_header(self):
+    return dump_file(self.__test_files_dir, self.__test_file)
+
+  def body_with_expectation(self):
+    html_frame = dump_file(self.__resources_dir, EXPECTATION_HTML_SCAFFOLD)
+    expected_data = dump_file(self.__test_files_dir, self.__expectation_file);
+    return html_frame.format(**{'data' : expected_data})
+
+
+def main(request, response):
+  if "debug" in request.GET:
+    response.writer.write_status(200)
+    response.writer.end_headers()
+    html_frame = dump_file(path.join(request.doc_root, DEFAULT_RESOURCE_DIR),
+                           DEBUGGING_HTML_SCAFFOLD)
+    test_file = html_frame % (request.GET['debug'])
+    response.writer.write_content(test_file)
+    return;
+
+  if not "file" in request.GET:
+    response.writer.write_status(404)
+    response.writer.end_headers()
+    response.writer.write_content("The 'file' parameter is missing!")
+    return;
+
+  cookie_response = CookieTestResponse(request.GET['file'], request.doc_root)
+
+  response.writer.write_status(200)
+  response.writer.write(cookie_response.cookie_setting_header())
+  response.writer.end_headers()
+  response.writer.write_content(cookie_response.body_with_expectation())
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/debugging-single-test.html.py-str b/tests/wpt/web-platform-tests/cookies/http-state/resources/debugging-single-test.html.py-str
new file mode 100644
index 00000000000..d34ff872c1d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/debugging-single-test.html.py-str
@@ -0,0 +1,21 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset=utf-8>
+    <title>Debug single test</title>
+    <meta name=help href="https://tools.ietf.org/html/rfc6265#page-8">
+
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="cookie-http-state-template.js"></script>
+  </head>
+  <body>
+    <div id="log"></div>
+    <script>
+      setup({ explicit_timeout: true });
+
+      promise_test(createCookieTest("%s"), "DEBUG", { timeout: 3000 });
+
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/iframe-content-pushing.js b/tests/wpt/web-platform-tests/cookies/http-state/resources/iframe-content-pushing.js
new file mode 100644
index 00000000000..99ede2a2582
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/iframe-content-pushing.js
@@ -0,0 +1,4 @@
+window.top.postMessage({
+  "cookies": document.cookie,
+  "expectation": document.querySelector('#data').innerText
+}, "*");
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/iframe-expectation-doc.html.py-str b/tests/wpt/web-platform-tests/cookies/http-state/resources/iframe-expectation-doc.html.py-str
new file mode 100644
index 00000000000..f2cf31312d7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/iframe-expectation-doc.html.py-str
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset=utf-8>
+    <title>Cookie Test Expectation Document</title>
+  </head>
+  <body>
+    <div id="data">{data}</div>
+    <script src="iframe-content-pushing.js"></script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0001-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0001-expected
new file mode 100644
index 00000000000..b14d4f69b58
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0001-expected
@@ -0,0 +1 @@
+Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0001-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0001-test
new file mode 100644
index 00000000000..bbeb77a029c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0001-test
@@ -0,0 +1 @@
+Set-Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0002-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0002-expected
new file mode 100644
index 00000000000..b14d4f69b58
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0002-expected
@@ -0,0 +1 @@
+Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0002-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0002-test
new file mode 100644
index 00000000000..a3eaff03ba3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0002-test
@@ -0,0 +1 @@
+Set-Cookie: foo=bar; Expires=Fri, 07 Aug 2019 08:04:19 GMT
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0003-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0003-expected
new file mode 100644
index 00000000000..78e79c2c7c1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0003-expected
@@ -0,0 +1 @@
+Cookie: foo2=bar2
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0003-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0003-test
new file mode 100644
index 00000000000..62fa1729183
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0003-test
@@ -0,0 +1,2 @@
+Set-Cookie: foo=bar; Expires=Fri, 07 Aug 2007 08:04:19 GMT
+Set-Cookie: foo2=bar2; Expires=Fri, 07 Aug 2027 08:04:19 GMT
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0004-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0004-expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0004-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0004-test
new file mode 100644
index 00000000000..190260d7aba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0004-test
@@ -0,0 +1 @@
+Set-Cookie: foo
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0005-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0005-expected
new file mode 100644
index 00000000000..b14d4f69b58
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0005-expected
@@ -0,0 +1 @@
+Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0005-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0005-test
new file mode 100644
index 00000000000..4de576a0d72
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0005-test
@@ -0,0 +1 @@
+Set-Cookie: foo=bar; max-age=10000;
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0006-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0006-expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0006-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0006-test
new file mode 100644
index 00000000000..83e41ec9baa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0006-test
@@ -0,0 +1 @@
+Set-Cookie: foo=bar; max-age=0;
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0007-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0007-expected
new file mode 100644
index 00000000000..b14d4f69b58
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0007-expected
@@ -0,0 +1 @@
+Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0007-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0007-test
new file mode 100644
index 00000000000..af7b6726670
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0007-test
@@ -0,0 +1 @@
+Set-Cookie: foo=bar; version=1;
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0008-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0008-expected
new file mode 100644
index 00000000000..b14d4f69b58
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0008-expected
@@ -0,0 +1 @@
+Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0008-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0008-test
new file mode 100644
index 00000000000..02baa00dcb2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0008-test
@@ -0,0 +1 @@
+Set-Cookie: foo=bar; version=1000;
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0009-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0009-expected
new file mode 100644
index 00000000000..b14d4f69b58
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0009-expected
@@ -0,0 +1 @@
+Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0009-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0009-test
new file mode 100644
index 00000000000..83c83fe1725
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0009-test
@@ -0,0 +1 @@
+Set-Cookie: foo=bar; customvalue=1000;
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0010-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0010-expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0010-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0010-test
new file mode 100644
index 00000000000..1408056a8da
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0010-test
@@ -0,0 +1 @@
+Set-Cookie: foo=bar; secure;
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0011-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0011-expected
new file mode 100644
index 00000000000..b14d4f69b58
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0011-expected
@@ -0,0 +1 @@
+Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0011-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0011-test
new file mode 100644
index 00000000000..ad11eab90df
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0011-test
@@ -0,0 +1 @@
+Set-Cookie: foo=bar; customvalue="1000 or more";
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0012-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0012-expected
new file mode 100644
index 00000000000..b14d4f69b58
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0012-expected
@@ -0,0 +1 @@
+Cookie: foo=bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0012-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0012-test
new file mode 100644
index 00000000000..cf9e7126e9c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0012-test
@@ -0,0 +1 @@
+Set-Cookie: foo=bar; customvalue="no trailing semicolon"
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0013-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0013-expected
new file mode 100644
index 00000000000..266392c144e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0013-expected
@@ -0,0 +1 @@
+Cookie: foo=qux
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0013-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0013-test
new file mode 100644
index 00000000000..f3c30abd38d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0013-test
@@ -0,0 +1,2 @@
+Set-Cookie: foo=bar
+Set-Cookie: foo=qux
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0014-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0014-expected
new file mode 100644
index 00000000000..4b162fed7be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0014-expected
@@ -0,0 +1 @@
+Cookie: foo1=bar; foo2=qux
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0014-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0014-test
new file mode 100644
index 00000000000..6bacc67355f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0014-test
@@ -0,0 +1,2 @@
+Set-Cookie: foo1=bar
+Set-Cookie: foo2=qux
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0015-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0015-expected
new file mode 100644
index 00000000000..036ac4aaf50
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0015-expected
@@ -0,0 +1 @@
+Cookie: a=b; z=y
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0015-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0015-test
new file mode 100644
index 00000000000..b9a3125839d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0015-test
@@ -0,0 +1,2 @@
+Set-Cookie: a=b
+Set-Cookie: z=y
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0016-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0016-expected
new file mode 100644
index 00000000000..5f1a6fd3c85
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0016-expected
@@ -0,0 +1 @@
+Cookie: z=y; a=b
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0016-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0016-test
new file mode 100644
index 00000000000..556592812a1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0016-test
@@ -0,0 +1,2 @@
+Set-Cookie: z=y
+Set-Cookie: a=b
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0017-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0017-expected
new file mode 100644
index 00000000000..f3c269c1fb1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0017-expected
@@ -0,0 +1,2 @@
+Cookie: z=y, a=b
+
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0017-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0017-test
new file mode 100644
index 00000000000..b8984fea8e8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0017-test
@@ -0,0 +1 @@
+Set-Cookie: z=y, a=b
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0018-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0018-expected
new file mode 100644
index 00000000000..0b549358d06
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0018-expected
@@ -0,0 +1,2 @@
+Cookie: z=y
+
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0018-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0018-test
new file mode 100644
index 00000000000..630bf9ba9e3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0018-test
@@ -0,0 +1 @@
+Set-Cookie: z=y; foo=bar, a=b
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0019-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0019-expected
new file mode 100644
index 00000000000..ecc95263e4e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0019-expected
@@ -0,0 +1 @@
+Cookie: foo=b
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0019-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0019-test
new file mode 100644
index 00000000000..352123e97ff
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0019-test
@@ -0,0 +1 @@
+Set-Cookie: foo=b;max-age=3600, c=d;path=/
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0020-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0020-expected
new file mode 100644
index 00000000000..a43cb004436
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0020-expected
@@ -0,0 +1 @@
+Cookie: a=b; c=d
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0020-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0020-test
new file mode 100644
index 00000000000..9b35947f693
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0020-test
@@ -0,0 +1,3 @@
+Set-Cookie: a=b
+Set-Cookie: =
+Set-Cookie: c=d
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0021-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0021-expected
new file mode 100644
index 00000000000..a43cb004436
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0021-expected
@@ -0,0 +1 @@
+Cookie: a=b; c=d
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0021-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0021-test
new file mode 100644
index 00000000000..5781fe3be02
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0021-test
@@ -0,0 +1,3 @@
+Set-Cookie: a=b
+Set-Cookie: =x
+Set-Cookie: c=d
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0022-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0022-expected
new file mode 100644
index 00000000000..5632bec87d2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0022-expected
@@ -0,0 +1 @@
+Cookie: a=b; x=; c=d
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0022-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0022-test
new file mode 100644
index 00000000000..70b9abf4ef0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0022-test
@@ -0,0 +1,3 @@
+Set-Cookie: a=b
+Set-Cookie: x=
+Set-Cookie: c=d
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0023-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0023-expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0023-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0023-test
new file mode 100644
index 00000000000..609c6680b82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0023-test
@@ -0,0 +1,2 @@
+Set-Cookie: foo
+Set-Cookie:
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0024-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0024-expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0024-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0024-test
new file mode 100644
index 00000000000..31dd69f052d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0024-test
@@ -0,0 +1,2 @@
+Set-Cookie: foo
+Set-Cookie: =
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0025-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0025-expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0025-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0025-test
new file mode 100644
index 00000000000..09f51a85bcc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0025-test
@@ -0,0 +1,2 @@
+Set-Cookie: foo
+Set-Cookie: ; bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0026-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0026-expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0026-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0026-test
new file mode 100644
index 00000000000..609c6680b82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0026-test
@@ -0,0 +1,2 @@
+Set-Cookie: foo
+Set-Cookie:
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0027-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0027-expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0027-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0027-test
new file mode 100644
index 00000000000..f7f6d267bb4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0027-test
@@ -0,0 +1,2 @@
+Set-Cookie: foo
+Set-Cookie: bar
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0028-expected b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0028-expected
new file mode 100644
index 00000000000..609c6680b82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0028-expected
@@ -0,0 +1,2 @@
+Set-Cookie: foo
+Set-Cookie:
diff --git a/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0028-test b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0028-test
new file mode 100644
index 00000000000..609c6680b82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/http-state/resources/test-files/0028-test
@@ -0,0 +1,2 @@
+Set-Cookie: foo
+Set-Cookie:
diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/fractional-line-height.html b/tests/wpt/web-platform-tests/css/CSS2/linebox/fractional-line-height.html
new file mode 100644
index 00000000000..0b748072b7e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/linebox/fractional-line-height.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<title>Container height calculation with fractional line height and fractional child height</title>
+<link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS22/visudet.html#line-height" title="10.8 Line height calculations: the 'line-height' and 'vertical-align' properties">
+<link rel="match" href="../../reference/nothing.html">
+<style>
+  .container { float:left; overflow:auto; width:50px; }
+  .container > span { display:inline-block; width:10px; }
+</style>
+<p>There should be nothing below.</p>
+
+<!-- None of these should not trigger a vertical scrollbar, because the height
+     of the overflow:auto container is auto, so it should make room for
+     whatever's inside. -->
+
+<div class="container" style="line-height:19.75px;">
+  <span style="height:100.25px;"></span>
+</div>
+
+<div class="container" style="line-height:19.75px;">
+  <span style="height:100.75px;"></span>
+</div>
+
+<div class="container" style="line-height:19.25px;">
+  <span style="height:100.25px;"></span>
+</div>
+
+<div class="container" style="line-height:19.25px;">
+  <span style="height:100.75px;"></span>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-align/OWNERS b/tests/wpt/web-platform-tests/css/css-align/OWNERS
new file mode 100644
index 00000000000..e9c4f6b9710
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-align/OWNERS
@@ -0,0 +1,2 @@
+@dholbert
+@emilio
diff --git a/tests/wpt/web-platform-tests/css/css-tables/width-distribution/td-with-subpixel-padding.html b/tests/wpt/web-platform-tests/css/css-tables/width-distribution/td-with-subpixel-padding.html
new file mode 100644
index 00000000000..ff040773e23
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-tables/width-distribution/td-with-subpixel-padding.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="help" href="https://drafts.csswg.org/css-tables/#width-distribution" />
+<style>
+div {
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  background: blue;
+}
+</style>
+Passes if each row has two blue squares.
+<table>
+  <tr>
+    <td class='target' style="padding: 0 0.8px"><div></div> <div></div></td>
+    <td style="padding: 0 0.8px; width: 30px"></td>
+  </tr>
+</table>
+<table>
+  <tr>
+    <td class='target' style="padding: 0 1px"><div></div> <div></div></td>
+    <td style="padding: 0 1px; width: 30px"></td>
+  </tr>
+</table>
+<table>
+  <tr>
+    <td class='target' style="padding: 0 1.3px"><div></div> <div></div></td>
+    <td style="padding: 0 1.3px; width: 30px"></td>
+  </tr>
+</table>
+<table>
+  <tr>
+    <td class='target' style="padding: 0 1.5px"><div></div> <div></div></td>
+    <td style="padding: 0 1.5px; width: 30px"></td>
+  </tr>
+</table>
+<table>
+  <tr>
+    <td class='target' style="padding: 0 1.7px"><div></div> <div></div></td>
+    <td style="padding: 0 1.7px; width: 30px"></td>
+  </tr>
+</table>
+<script>
+test(() => {
+  var targets = document.getElementsByClassName('target');
+  for (var i = 0; i < targets.length; ++i) {
+    var divs = targets[i].getElementsByTagName('div');
+    assert_equals(divs.length, 2);
+    assert_equals(divs[0].offsetTop, divs[1].offsetTop, 'Contents of td.target[' + i + '] should not wrap');
+  }
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-indexed-getter-setter.html b/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-indexed-getter-setter.html
new file mode 100644
index 00000000000..9f0403fbae4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-indexed-getter-setter.html
@@ -0,0 +1,54 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSSUnparsedValue Indexed Getter and Setter</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-cssunparsedvalue-__getter__-index-index">
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-cssunparsedvalue-__setter__-index-val-val">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/testhelper.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+test(() => {
+  const result = new CSSUnparsedValue(['foo', 'bar']);
+  assert_equals(result[3], undefined, 'result from out of range index');
+  assert_equals(result[-1], undefined, 'result from negative index');
+}, 'Getting invalid index in CSSUnparsedValue returns undefined');
+
+test(() => {
+  let result = new CSSUnparsedValue([new CSSVariableReferenceValue('--foo')]);
+  result[0] = 'A';
+  assert_equals(result[0], 'A', 'fragment reflects new value');
+}, 'Can update fragment in CSSUnparsedValue to a String');
+
+test(() => {
+  let result = new CSSUnparsedValue(['foo']);
+  result[0] = new CSSVariableReferenceValue('--A');
+  assert_style_value_equals(result[0], new CSSVariableReferenceValue('--A'),
+                            'fragment reflects new value');
+}, 'Can update fragment in CSSUnparsedValue to a CSSVariableReference');
+
+test(() => {
+  let result = new CSSUnparsedValue([]);
+  result[0] = 'foo';
+  assert_equals(result[0], 'foo', 'new fragment is appended');
+}, 'Setting one past the last fragment in a CSSUnparsedValue to a String ' +
+   'appends the new fragment');
+
+test(() => {
+  let result = new CSSUnparsedValue([' ']);
+  result[1] = new CSSVariableReferenceValue('--A');
+  assert_style_value_equals(result[1], new CSSVariableReferenceValue('--A'),
+                            'new fragment is appended');
+}, 'Setting one past the last fragment in a CSSUnparsedValue to a ' +
+   'CSSVariableReferenceValue appends the new fragment');
+
+test(() => {
+  let result = new CSSUnparsedValue(['foo', 'bar']);
+  assert_throws(new RangeError(), () => result[3] = 'foo');
+  assert_equals(result[3], undefined, 'fragment does not change');
+}, 'Setting out of range index in CSSUnparsedValue throws RangeError');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-iterable.html b/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-iterable.html
new file mode 100644
index 00000000000..186ba7329c9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-iterable.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSSUnparsedValue Iterable Declaration</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#cssunparsedvalue">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/testhelper.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+test(() => {
+  const result = new CSSUnparsedValue([]);
+  assert_array_equals([...result], [], 'result of iterating');
+}, 'Iterating over an empty CSSUnparsedValue produces nothing');
+
+test(() => {
+  const args = [' ', new CSSVariableReferenceValue('--A')];
+  const result = new CSSUnparsedValue(args);
+  assert_style_value_array_equals([...result], args, 'result of iterating');
+}, 'Iterating over a CSSUnparsedValue produces all fragments');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-length.html b/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-length.html
new file mode 100644
index 00000000000..cb2b9c9b706
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue-length.html
@@ -0,0 +1,47 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSSUnparsedValue.length</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-cssunparsedvalue-length">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+test(() => {
+  const result = new CSSUnparsedValue([]);
+  assert_equals(result.length, 0, 'length');
+}, 'Length of CSSUnparsedValue with no fragments is zero');
+
+test(() => {
+  const result = new CSSUnparsedValue([
+    ' ', new CSSVariableReferenceValue('--A')
+  ]);
+  assert_equals(result.length, 2, 'length');
+}, 'Length of CSSUnparsedValue with multiple fragments is the number of ' +
+   'fragments');
+
+test(() => {
+  let result = new CSSUnparsedValue([' ']);
+  assert_equals(result.length, 1, 'initial length');
+
+  result[1] = new CSSVariableReferenceValue('--A');
+  assert_equals(result.length, 2, 'length after appending once');
+
+  result[2] = 'lemon';
+  assert_equals(result.length, 3, 'length after appending twice');
+}, 'Length of CSSUnparsedValue updates when fragments are appended');
+
+test(() => {
+  let result = new CSSUnparsedValue([' ']);
+  assert_equals(result.length, 1, 'initial length');
+
+  result[0] = new CSSVariableReferenceValue('--A');
+  assert_equals(result.length, 1, 'length after modification');
+
+  result[0] = 'lemon';
+  assert_equals(result.length, 1, 'length after modification');
+}, 'Length of CSSUnparsedValue does not change when fragments are modified');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue.html b/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue.html
index f33703256fb..db43fd7ecbe 100644
--- a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue.html
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssUnparsedValue.html
@@ -1,32 +1,31 @@
 <!doctype html>
 <meta charset="utf-8">
-<title>CSSUnparsedValue</title>
-<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#unparsedvalue-objects">
-<meta name="assert" content="Test CSSUnparsedValue constructor and members">
+<title>CSSUnparsedValue Constructor</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-cssunparsedvalue-cssunparsedvalue">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="../resources/testhelper.js"></script>
 <body>
-<div id="log">
+<div id="log"></div>
 <script>
 'use strict';
 
 const gTestArguments = [
   {
     description: 'no arguments',
-    args: [],
+    fragments: [],
   },
   {
-    description: 'an empty string',
-    args: [''],
+    description: 'a single empty string',
+    fragments: [''],
   },
   {
-    description: 'a CSSVariableReferenceValue',
-    args: [new CSSVariableReferenceValue('--foo')],
+    description: 'a single CSSVariableReferenceValue',
+    fragments: [new CSSVariableReferenceValue('--foo')],
   },
   {
-    description: 'mix of strings and CSSVariableReferenceValues',
-    args: [
+    description: 'a mix of strings and CSSVariableReferenceValues',
+    fragments: [
       'foo',
       'bar',
       new CSSVariableReferenceValue('--A'),
@@ -36,56 +35,13 @@ const gTestArguments = [
   },
 ];
 
-for (const {args, description} of gTestArguments) {
+for (const args of gTestArguments) {
   test(() => {
-    const result = new CSSUnparsedValue(args);
-
-    assert_not_equals(result, null,
-        'A CSSUnparsedValue should be created');
-    assert_array_equals(result, args,
-        'Content of CSSUnparsedValue should be same as the arguments ' +
-        'passed in the constructor');
-  }, 'CSSUnparsedValue can be constructed from ' + description);
+    const result = new CSSUnparsedValue(args.fragments);
+    assert_not_equals(result, null, 'a CSSUnparsedValue is created');
+    assert_style_value_array_equals(result, args.fragments,
+                                    'fragments are same as given by constructor');
+  }, `CSSUnparsedValue can be constructed from ${args.description}`);
 }
 
-test(() => {
-  let result = new CSSUnparsedValue([new CSSVariableReferenceValue('--foo')]);
-
-  result[0] = 'A';
-  assert_equals(result[0], 'A', 'Item should be updated to new value');
-}, 'Can update item in CSSUnparsedValue to a string');
-
-test(() => {
-  let result = new CSSUnparsedValue(['foo']);
-
-  result[0] = new CSSVariableReferenceValue('--A');
-  assert_style_value_equals(result[0], new CSSVariableReferenceValue('--A'),
-      'Item should be updated to new value');
-}, 'Can update item in CSSUnparsedValue to a variable reference');
-
-test(() => {
-  let result = new CSSUnparsedValue([]);
-
-  result[0] = new CSSVariableReferenceValue('--A');
-  assert_equals(result.length, 1,
-      'Length of CSSUnparsedValue should have increased');
-  assert_style_value_equals(result[0], new CSSVariableReferenceValue('--A'),
-      'New item should be appended');
-
-  result[1] = 'foo';
-  assert_equals(result.length, 2,
-      'Length of CSSUnparsedValue should have increased');
-  assert_equals(result[1], 'foo', 'New item should be appended');
-}, 'Can append items to CSSUnparsedValue');
-
-test(() => {
-  const result = new CSSUnparsedValue(['foo', 'bar']);
-  assert_equals(result[3], undefined);
-}, 'Getting invalid index in CSSUnparsedValue returns undefined');
-
-test(() => {
-  let result = new CSSUnparsedValue(['foo', 'bar']);
-  assert_throws(new RangeError(), () => result[3] = 'foo');
-}, 'Setting invalid index in CSSUnparsedValue throws RangeError');
-
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue-invalid.html b/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue-invalid.html
index c58bf76bac3..3696e9997ed 100644
--- a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue-invalid.html
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue-invalid.html
@@ -20,22 +20,4 @@ test(() => {
 }, 'Constructing a CSSVariableReferenceValue with an invalid variable name ' +
    'throws SyntaxError');
 
-test(() => {
-  let result = new CSSVariableReferenceValue('--foo');
-  assert_throws(new TypeError(), () => result.variable = '');
-
-  assert_equals(result.variable, '--foo',
-    'Variable member should not have changed');
-}, 'Updating CSSVariableReferenceValue.variable to an empty variable name ' +
-   'throws TypeError');
-
-test(() => {
-  let result = new CSSVariableReferenceValue('--foo');
-  assert_throws(new TypeError(), () => result.variable = 'bar');
-
-  assert_equals(result.variable, '--foo',
-    'Variable member should not have changed');
-}, 'Updating CSSVariableReferenceValue.variable to an invalid variable name ' +
-   'throws TypeError');
-
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue-variable.html b/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue-variable.html
new file mode 100644
index 00000000000..236758bf1f2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue-variable.html
@@ -0,0 +1,33 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSSVariableReferenceValue.variable</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-cssvariablereferencevalue-variable">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+test(() => {
+  let result = new CSSVariableReferenceValue('--foo');
+  result.variable = '--bar';
+  assert_equals(result.variable, '--bar', 'variable reflects new value');
+}, 'CSSVariableReferenceValue.variable can updated to a valid custom ' +
+   'property name');
+
+test(() => {
+  let result = new CSSVariableReferenceValue('--foo');
+  assert_throws(new TypeError(), () => result.variable = '');
+  assert_equals(result.variable, '--foo', 'variable does not change');
+}, 'Updating CSSVariableReferenceValue.variable to the empty string ' +
+   'throws TypeError');
+
+test(() => {
+  let result = new CSSVariableReferenceValue('--foo');
+  assert_throws(new TypeError(), () => result.variable = 'bar');
+  assert_equals(result.variable, '--foo', 'variable does not change');
+}, 'Updating CSSVariableReferenceValue.variable to an invalid custom ' +
+   'property name throws TypeError');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue.html b/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue.html
index 7e981567fe8..9899b210ad5 100644
--- a/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue.html
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/stylevalue-subclasses/cssVariableReferenceValue.html
@@ -1,55 +1,40 @@
 <!doctype html>
 <meta charset="utf-8">
-<title>CSSVariableReferenceValue tests</title>
-<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#cssvariablereferencevalue">
-<meta name="assert" content="Test CSSVariableReferenceValue constructor and attributes" />
+<title>CSSVariableReferenceValue Constructor</title>
+<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#dom-cssvariablereferencevalue-cssvariablereferencevalue">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="../resources/testhelper.js"></script>
+<body>
+<div id="log"></div>
 <script>
 'use strict';
 
 test(() => {
   const result = new CSSVariableReferenceValue('--foo');
-
-  assert_not_equals(result, null,
-      'A CSSVariableReferenceValue should be created');
+  assert_not_equals(result, null, 'a CSSVariableReferenceValue is created');
   assert_equals(result.variable, '--foo',
-      'Variable member should be same as passed in the constructor');
-  assert_equals(result.fallback, null,
-      'Fallback member should be null');
+                'variable is same as passed by constructor');
+  assert_equals(result.fallback, null, 'fallback');
 }, 'CSSVariableReferenceValue can be constructed with no fallback');
 
 test(() => {
   const result = new CSSVariableReferenceValue('--foo', null);
-
-  assert_not_equals(result, null,
-      'A CSSVariableReferenceValue should be created');
+  assert_not_equals(result, null, 'a CSSVariableReferenceValue is created');
   assert_equals(result.variable, '--foo',
-      'Variable member should be same as passed in the constructor');
-  assert_equals(result.fallback, null, 'Fallback member should be null');
+                'variable is same as passed by constructor');
+  assert_equals(result.fallback, null, 'fallback');
 }, 'CSSVariableReferenceValue can be constructed with null fallback');
 
 test(() => {
   const result = new CSSVariableReferenceValue('--foo',
       new CSSUnparsedValue(['lemon']));
-
-  assert_not_equals(result, null,
-      'A CSSVariableReferenceValue should be created');
+  assert_not_equals(result, null, 'a CSSVariableReferenceValue is created');
   assert_equals(result.variable, '--foo',
-      'Variable member should be same as passed in the constructor');
-  assert_not_equals(result.fallback, null,
-      'Fallback member should not be null');
+                'variable is same as passed by constructor');
+  assert_not_equals(result.fallback, null, 'fallback');
   assert_style_value_equals(result.fallback, new CSSUnparsedValue(['lemon']),
-      'Fallback member should be as same as passed in the constructor');
+                            'fallback is same as passed by constructor');
 }, 'CSSVariableReferenceValue can be constructed with valid fallback');
 
-test(() => {
-  let result = new CSSVariableReferenceValue('--foo');
-  result.variable = '--bar';
-
-  assert_equals(result.variable, '--bar',
-      'Variable member should be updated to new value');
-}, 'CSSVariableReferenceValue.variable can updated to a valid variable name');
-
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-043.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-043.xht
index e860cd1bf32..43fa2037595 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-043.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-043.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: sideways-lr - block flow direction of block-level boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-043-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-047.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-047.xht
index ecb3b69593f..dcc59fa04c4 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-047.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-047.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: 'float: right' and 'sideways-lr' - block flow direction of block-level boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-002-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-048.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-048.xht
index 6802d8b0efa..f7c9c227be3 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-048.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-048.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: 'float: right' and 'sideways-lr' - block flow direction of block-level boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-002-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-050.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-050.xht
index f5bfc731f19..5d8575dbb10 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-050.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-050.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: position absolute and 'sideways-lr' - block flow direction of block-level boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-054.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-054.xht
index a779ab9cbd5..47f42abdb9f 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-054.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-054.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: inline-block and 'sideways-lr' - block flow direction of block-level boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-055.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-055.xht
index 8e35691fbb0..b934f4b2e1a 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-055.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-055.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: inline-block and 'sideways-lr' - block flow direction of block-level boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-056.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-056.xht
index da8f4834fca..286c44f2805 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-056.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-056.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: inline-block and 'sideways-lr' - block flow direction of block-level boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-058.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-058.xht
index 4b9f063e797..540991b6af9 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-058.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-058.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: table-cell and 'sideways-lr' - block flow direction of block-level boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-060.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-060.xht
index 3c242b39f9a..a9a9c2ac984 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-060.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-060.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: table-caption and 'sideways-lr' - block flow direction of block-level boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-062.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-062.xht
index a6609bdd50b..ac1aec36412 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-062.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-062.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: list and sideways-lr - block flow direction of block-level boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-043-ref.xht" />
 
   <meta content="ahem image" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-063.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-063.xht
index 5c5056901dd..065f75e32ee 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-063.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-063.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: sideways-lr - block flow direction of block-level boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-043-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-066.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-066.xht
index 108d4e247bc..24a4dfef3dd 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-066.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-slr-066.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: writing mode (sideways-lr) of document - horizontal position of first block</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="help" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visuren.html#block-formatting" title="9.4.1 Block formatting contexts" />
   <link rel="match" href="block-flow-direction-066-ref.xht" />
 
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-042.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-042.xht
index 847b39d9220..6a99d55cd7c 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-042.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-042.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: sideways-rl - block flow direction of block-level boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-002-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-045.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-045.xht
index 6a868bf383a..a8cefba9f0e 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-045.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-045.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: 'float: left' and 'sideways-rl' - block flow direction of block-level boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-046.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-046.xht
index e4ab2ec5db0..bb61fcfa5ea 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-046.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-046.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: 'float: left' and 'sideways-rl' - block flow direction of block-level boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-049.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-049.xht
index a0cd94ed12b..447527fc80e 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-049.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-049.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: position absolute and 'sideways-rl' - block flow direction of block-level boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-051.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-051.xht
index 14cefa26dbd..2fc0b3770e5 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-051.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-051.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: inline-block and 'sideways-rl' - block flow direction of block-level boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-052.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-052.xht
index dae358a4f9f..f32066e9454 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-052.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-052.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: inline-block and 'sideways-rl' - block flow direction of block-level boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-053.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-053.xht
index 8635757eebd..86b36fce193 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-053.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-053.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: inline-block and 'sideways-rl' - block flow direction of block-level boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-057.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-057.xht
index 87c8dc138f2..1afed95c053 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-057.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-057.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: table-cell and 'sideways-rl' - block flow direction of block-level boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-059.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-059.xht
index 0d14068bab8..6bd8d4ae379 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-059.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-059.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: table-caption and 'sideways-rl' - block flow direction of block-level boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-061.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-061.xht
index b08891e98a9..5b05219968b 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-061.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-061.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: list and sideways-rl - block flow direction of block-level boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-002-ref.xht" />
 
   <meta content="ahem image" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-064.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-064.xht
index d023e63e324..40e5be94625 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-064.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-064.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: sideways-rl - block flow direction of block-level boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-002-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-065.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-065.xht
index ac5fdf29e1e..40c0f83daa7 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-065.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/block-flow-direction-srl-065.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: writing mode (sideways-rl) of document - horizontal position of first block</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="help" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visuren.html#block-formatting" title="9.4.1 Block formatting contexts" />
   <link rel="match" href="block-flow-direction-025-ref.xht" />
 
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/form-controls-slr-004.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/form-controls-slr-004.xht
index e5409900640..7774f4b6179 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/form-controls-slr-004.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/form-controls-slr-004.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: order, orientation and layout of form controls in 'sideways-lr' writing-mode</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
 
   <meta content="image should" name="flags" />
   <meta content="This test checks the order, the flow, the orientation and layout of form controls used in Example 4 of section 3.1 when the 'writing-mode' of the whole form element is set to 'sideways-lr'." name="assert" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/form-controls-slr-005.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/form-controls-slr-005.xht
index 75370af2a3a..35b4ace5233 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/form-controls-slr-005.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/form-controls-slr-005.xht
@@ -8,7 +8,7 @@
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
 
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
 
   <meta content="should" name="flags" />
   <meta content="This test checks the rendering of various form controls (select, optgroup, options, various types of input and buttons) written with latin text in 'sideways-lr' writing mode. The text of replaced content should match the replaced element's writing mode and line orientation; therefore, in this test, a) the text's inline base direction must be from bottom to top, b) the glyphs must be rotated 90° counter-clockwise and c) the block flow direction must be from left to right." name="assert" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/form-controls-srl-004.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/form-controls-srl-004.xht
index 919c3de1034..37f4bb47330 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/form-controls-srl-004.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/form-controls-srl-004.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: order, orientation and layout of form controls in 'sideways-rl' writing-mode</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
 
   <meta content="image should" name="flags" />
   <meta content="This test checks the order, the flow, the orientation and layout of form controls used in Example 4 of section 3.1 when the 'writing-mode' of the whole form element is set to 'sideways-rl'." name="assert" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/form-controls-srl-005.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/form-controls-srl-005.xht
index 5fe188ee4b6..f092ecc1d35 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/form-controls-srl-005.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/form-controls-srl-005.xht
@@ -8,7 +8,7 @@
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
 
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
 
   <meta content="should" name="flags" />
   <meta content="This test checks the rendering of various form controls (select, optgroup, options, various types of input and buttons) written with latin text in 'sideways-rl' writing mode. The text of replaced content should match the replaced element's writing mode and line orientation; therefore, in this test, a) the text's inline base direction must be from top to bottom, b) the glyphs must be rotated 90° clockwise and c) the block flow direction must be from right to left." name="assert" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/full-width-003.html b/tests/wpt/web-platform-tests/css/css-writing-modes/full-width-003.html
index a708656a7e5..da0d4707798 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/full-width-003.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/full-width-003.html
@@ -5,7 +5,7 @@
 <title>CSS Writing Modes: 'text-combine-upright: digits 2' applied on 2 full-width characters</title>
 <link rel="author" title="Masataka Yakura" href="http://google.com/+MasatakaYakura">
 <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
-<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#text-combine-fullwidth" title="9.1.3.1. Full-width Characters">
+<link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#text-combine-fullwidth" title="9.1.3.1. Full-width Characters">
 <link rel="help" href="https://www.w3.org/TR/css-text-3/#text-transform-property" title="2.1. Case Transforms: the 'text-transform' property">
 <link rel="mismatch" href="reference/full-width-002-notcu-notref.html">
 <link rel="mismatch" href="reference/full-width-002-horizontal-notref.html">
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-slr-009.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-slr-009.xht
index 1ec6bb90a63..55836bcfcc8 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-slr-009.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-slr-009.xht
@@ -4,7 +4,7 @@
   <title>CSS Writing Modes Test: inline block alignment - alphabetical alignment with vertical layout</title>
   <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-12 -->
-  <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines" />
+  <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-4/#replaced-baselines" />
   <link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes" />
   <link rel="match" href="inline-block-alignment-slr-009-ref.xht" />
   <meta name="assert" content="This test checks the generation of inline-block baseline. When 'writing-mode' is 'sideways-lr', then the alphabetic baseline is used as the dominant baseline." />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-srl-008.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-srl-008.xht
index 5ef9bc92a49..115f8a56ed0 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-srl-008.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/inline-block-alignment-srl-008.xht
@@ -4,7 +4,7 @@
     <title>CSS Writing Modes Test: inline block alignment - alphabetical alignment with vertical layout</title>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
     <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-06 -->
-    <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines" />
+    <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-4/#replaced-baselines" />
     <link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes" />
     <link rel="match" href="inline-block-alignment-006-ref.xht" />
     <meta name="assert" content="This test checks the generation of inline-block baseline. When 'writing-mode' is 'sideways-rl', then the alphabetic baseline is used as the dominant baseline." />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-043.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-043.xht
index 80038f396ef..63fc7e9ff58 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-043.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-043.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: sideways-lr - ordering direction of line boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-047.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-047.xht
index 21767135776..89c7a6d4746 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-047.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-047.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: 'float: right' and 'sideways-lr' - ordering direction of line boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-002-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-048.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-048.xht
index 403b3ed8b1b..8dc5da47733 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-048.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-048.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: 'float: right' and 'sideways-lr' - ordering direction of line boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-002-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-050.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-050.xht
index b9e99a326d3..10619f356b4 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-050.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-050.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: position absolute and 'sideways-lr' - ordering direction of line boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-053.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-053.xht
index 20b23f3248d..5f9825048af 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-053.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-053.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: inline-block and 'sideways-lr' - ordering direction of line boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-054.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-054.xht
index 0efae8f6513..e38aea85ad6 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-054.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-054.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: inline-block and 'sideways-lr' - ordering direction of line boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-056.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-056.xht
index 9a162ff930a..6f2fdb01767 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-056.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-056.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: table-cell and 'sideways-lr' - ordering direction of line boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-058.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-058.xht
index d483cff4b56..1b4bc0dd480 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-058.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-058.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: table-caption and 'sideways-lr' - ordering direction of line boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-060.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-060.xht
index 8d1383cc007..b4b2d196236 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-060.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-slr-060.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: list and 'sideways-lr' - ordering direction of line boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-042.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-042.xht
index 921af5a214e..a3165003bc4 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-042.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-042.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: sideways-rl - ordering direction of line boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-045.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-045.xht
index ba1420302e9..b6bc08a9f4f 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-045.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-045.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: 'float: left' and 'sideways-rl' - ordering direction of line boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-046.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-046.xht
index 2f9edc291b9..2379135821b 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-046.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-046.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: 'float: left' and 'sideways-rl' - ordering direction of line boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-049.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-049.xht
index babf754d318..822855eae8a 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-049.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-049.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: position absolute and 'sideways-rl' - ordering direction of line boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-051.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-051.xht
index 995d7e53796..54c0068adb0 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-051.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-051.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: inline-block and 'sideways-rl' - ordering direction of line boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-052.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-052.xht
index 8d1c369b704..a1ace9571ff 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-052.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-052.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: inline-block and 'sideways-rl' - ordering direction of line boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-055.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-055.xht
index 0000f0bd51f..23c4d2875ab 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-055.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-055.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: table-cell and 'sideways-rl' - ordering direction of line boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-057.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-057.xht
index e694871fa78..18608c5c36e 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-057.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-057.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: table-caption and 'sideways-rl' - ordering direction of line boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-059.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-059.xht
index 7a0e79eb82d..5f66d208dee 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-059.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/line-box-direction-srl-059.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: list and 'sideways-rl' - ordering direction of line boxes</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-slr-005.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-slr-005.xht
index 95267852397..42adb380b7b 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-slr-005.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-slr-005.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: outline layout and non-replaced inline in sideways-lr writing-mode</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" title="7.1. Principles of Layout in Vertical Writing Modes" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" />
+  <link rel="help" title="7.1. Principles of Layout in Vertical Writing Modes" href="http://www.w3.org/TR/css-writing-modes-4/#vertical-layout" />
   <link rel="help" title="18.4 Dynamic outlines: the 'outline' property" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/ui.html#dynamic-outlines" />
 
   <meta content="" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-srl-004.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-srl-004.xht
index 4b077c45772..e9fc32af49b 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-srl-004.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/outline-inline-srl-004.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: outline layout and non-replaced inline and sideways-rl writing-mode</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" title="7.1. Principles of Layout in Vertical Writing Modes" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" />
+  <link rel="help" title="7.1. Principles of Layout in Vertical Writing Modes" href="http://www.w3.org/TR/css-writing-modes-4/#vertical-layout" />
   <link rel="help" title="18.4 Dynamic outlines: the 'outline' property" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/ui.html#dynamic-outlines" />
 
   <meta content="" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/page-flow-direction-slr-005.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/page-flow-direction-slr-005.xht
index afc68ccc228..30d045d1d15 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/page-flow-direction-slr-005.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/page-flow-direction-slr-005.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: 'writing-mode: sideways-lr' - default page flow (progression) direction</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
 
   <meta content="image paged" name="flags" />
   <meta content="This test checks that when 'writing-mode' is set on the root element, then it determines the default page flow (or progression) direction. In this test, the page flow (or progression) direction is left-to-right." name="assert" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/page-flow-direction-srl-004.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/page-flow-direction-srl-004.xht
index b12e9c183b8..d1d1aa65b57 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/page-flow-direction-srl-004.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/page-flow-direction-srl-004.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: 'writing-mode: sideways-rl' - default page flow (progression) direction</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
 
   <meta content="image paged" name="flags" />
   <meta content="This test checks that when 'writing-mode' is set on the root element, then it determines the default page flow (or progression) direction. In this test, the page flow (or progression) direction is right-to-left." name="assert" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-slr-023.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-slr-023.xht
index b907f478870..bf0e55259ab 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-slr-023.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-slr-023.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: sideways-lr - table rows progression</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-slr-029.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-slr-029.xht
index 8f570dad0e5..a0c580c4c8f 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-slr-029.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-slr-029.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: sideways-lr - table rows progression (thead, 2 tbodies, tfoot)</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-srl-022.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-srl-022.xht
index 7ba0a904e1a..d21a70a47e4 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-srl-022.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-srl-022.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: sideways-rl - table rows progression</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-srl-028.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-srl-028.xht
index 748b5241c49..6bfe38614fd 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-srl-028.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-srl-028.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: sideways-rl - table rows progression (thead, 2 tbodies, tfoot)</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-vlr-009.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-vlr-009.xht
index dbe161365fa..64ec1cda31c 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-vlr-009.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/row-progression-vlr-009.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: vertical-lr - table rows progression (thead, 2 tbodies, tfoot)</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#writing-mode" title="3.1 Block Flow Direction: the writing-mode property" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-column-order-slr-007.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/table-column-order-slr-007.xht
index 8d6f3fd0142..f1829e36dfa 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/table-column-order-slr-007.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/table-column-order-slr-007.xht
@@ -8,8 +8,8 @@
 
   <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-22 -->
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#direction" title="2.1 Specifying Directionality: the direction property" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#direction" title="2.1 Specifying Directionality: the direction property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-column-order-srl-006.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/table-column-order-srl-006.xht
index ce1d8ff4c3c..38cfa2fb55e 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/table-column-order-srl-006.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/table-column-order-srl-006.xht
@@ -8,8 +8,8 @@
 
   <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-22 -->
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#direction" title="2.1 Specifying Directionality: the direction property" />
-  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#direction" title="2.1 Specifying Directionality: the direction property" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
   <link rel="match" href="block-flow-direction-001-ref.xht" />
 
   <meta content="ahem" name="flags" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-slr-001.html b/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-slr-001.html
index 45970fb2227..25050b8e371 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-slr-001.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-slr-001.html
@@ -5,8 +5,8 @@
 <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
 <link rel="match" href="table-progression-slr-001-ref.html">
 <meta name="assert" content="This test checks that sideways-lr tables order rows/rowgroups left to right and cells bottom-to-top (LTR) or top-to-bottom (RTL) per 'direction'. This test also checks that 'writing-mode' and 'direction' do not apply to table rows and row groups.">
-<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#block-flow" title="3.1 Block Flow Direction: the 'writing-mode' property">
-<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#direction" title="2.1 Specifying Directionality: the 'direction' property">
+<link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#block-flow" title="3.1 Block Flow Direction: the 'writing-mode' property">
+<link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#direction" title="2.1 Specifying Directionality: the 'direction' property">
 
 <style>
   .test {
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-slr-002.html b/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-slr-002.html
index 6c4dd6a012c..1525e2423d5 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-slr-002.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-slr-002.html
@@ -3,8 +3,8 @@
 <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
 <link rel="match" href="table-progression-002-ref.html">
 <meta name="assert" content="This test checks that sideways-lr tables order columns bottom-to-top (LTR) or top-to-bottom (RTL) per the table's 'direction'. This test also checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.">
-<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#block-flow" title="3.1 Block Flow Direction: the 'writing-mode' property">
-<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#direction" title="2.1 Specifying Directionality: the 'direction' property">
+<link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#block-flow" title="3.1 Block Flow Direction: the 'writing-mode' property">
+<link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#direction" title="2.1 Specifying Directionality: the 'direction' property">
 
 <style>
   .test {
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-srl-001.html b/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-srl-001.html
index 1ae2dd259d0..b74b2caee53 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-srl-001.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-srl-001.html
@@ -5,8 +5,8 @@
 <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
 <link rel="match" href="table-progression-001-ref.html">
 <meta name="assert" content="This test checks that sideways-rl tables order rows/rowgroups right to left and cells top-to-bottom (LTR) or bottom-to-top (RTL) per 'direction'. This test also checks that 'writing-mode' and 'direction' do not apply to table rows and row groups.">
-<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#block-flow" title="3.1 Block Flow Direction: the 'writing-mode' property">
-<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#direction" title="2.1 Specifying Directionality: the 'direction' property">
+<link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#block-flow" title="3.1 Block Flow Direction: the 'writing-mode' property">
+<link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#direction" title="2.1 Specifying Directionality: the 'direction' property">
 
 <style>
   .test {
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-srl-002.html b/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-srl-002.html
index d552244dac4..7d5df32cc26 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-srl-002.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/table-progression-srl-002.html
@@ -5,8 +5,8 @@
 <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
 <link rel="match" href="table-progression-002-ref.html">
 <meta name="assert" content="This test checks that sideways-rl tables order columns top-to-bottom (LTR) or bottom-to-top (RTL) per the table's 'direction'. This test also checks that 'writing-mode' and 'direction' do not apply to table columns and column groups.">
-<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#block-flow" title="3.1 Block Flow Direction: the 'writing-mode' property">
-<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#direction" title="2.1 Specifying Directionality: the 'direction' property">
+<link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#block-flow" title="3.1 Block Flow Direction: the 'writing-mode' property">
+<link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#direction" title="2.1 Specifying Directionality: the 'direction' property">
 
 <style>
   .test {
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-slr-009.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-slr-009.xht
index 6b478a56367..a458bab4066 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-slr-009.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-slr-009.xht
@@ -4,7 +4,7 @@
     <title>CSS Writing Modes Test: text baseline alignment - alphabetical alignment with vertical layout</title>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
     <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-05 -->
-    <link rel="help" title="4.2. Text Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#text-baselines" />
+    <link rel="help" title="4.2. Text Baseline" href="http://www.w3.org/TR/css-writing-modes-4/#text-baselines" />
     <link rel="match" href="text-baseline-slr-009-ref.xht" />
     <meta name="assert" content="When 'writing-mode' is 'sideways-lr', then the alphabetic baseline is used as the dominant baseline." />
     <meta name="flags" content="ahem" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-srl-008.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-srl-008.xht
index b7300bcaaeb..f9fc267c2f2 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-srl-008.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/text-baseline-srl-008.xht
@@ -4,7 +4,7 @@
     <title>CSS Writing Modes Test: text baseline alignment - alphabetical alignment with vertical layout</title>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
     <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-05 -->
-    <link rel="help" title="4.2. Text Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#text-baselines" />
+    <link rel="help" title="4.2. Text Baseline" href="http://www.w3.org/TR/css-writing-modes-4/#text-baselines" />
     <link rel="match" href="text-baseline-vrl-006-ref.xht" />
     <meta name="assert" content="When 'writing-mode' is 'sideways-rl', then the alphabetic baseline is used as the dominant baseline." />
     <meta name="flags" content="ahem" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-digits-001.html b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-digits-001.html
index bcb6c143df9..4f083c870b8 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-digits-001.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-digits-001.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <title>CSS Writing Modes: parsing text-combine-upright for digits</title>
 <link rel="author" title="Masataka Yakura" href="http://google.com/+MasatakaYakura">
-<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#text-combine-upright">
+<link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#text-combine-upright">
 <meta name="assert" content="text-combine-upright supports `none`, `all`, `digits`, and `digits` followed by a digit in the range from 2 to 4.">
 <meta name="flags" content="dom">
 <script src="/resources/testharness.js"></script>
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-digits-002.html b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-digits-002.html
index 7a375d622bb..327ebdda11e 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-digits-002.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-digits-002.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <title>CSS Writing Modes: parsing text-combine-upright with digits plus calc() computing to valid digits</title>
 <link rel="author" title="Masataka Yakura" href="http://google.com/+MasatakaYakura">
-<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#text-combine-upright">
+<link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#text-combine-upright">
 <link rel="help" href="http://www.w3.org/TR/css-values-3/#calc-notation">
 <meta name="assert" content="User Agents support text-combine-upright with values `digits calc(...)` if the expression inside `calc()` computes to a valid integer, which is either 2, 3, or 4.">
 <meta name="flags" content="dom">
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-invalid-001.html b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-invalid-001.html
index aabe7a70680..beb54108a31 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-invalid-001.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-invalid-001.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <title>CSS Writing Modes: parsing text-combine-upright with invalid values</title>
 <link rel="author" title="Masataka Yakura" href="http://google.com/+MasatakaYakura">
-<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#text-combine-upright">
+<link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#text-combine-upright">
 <meta name="assert" content="text-combine-upright doesn't support undefined keywords and out-of-range integer, and numbers.">
 <meta name="flags" content="dom invalid">
 <script src="/resources/testharness.js"></script>
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-invalid-002.html b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-invalid-002.html
index ed5ce4eb32d..08a0978eaa9 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-invalid-002.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-parsing-invalid-002.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <title>CSS Writing Modes: parsing text-combine-upright with digits plus calc() computing to invalid digits</title>
 <link rel="author" title="Masataka Yakura" href="http://google.com/+MasatakaYakura">
-<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#text-combine-upright">
+<link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#text-combine-upright">
 <link rel="help" href="http://www.w3.org/TR/css-values-3/#calc-notation">
 <meta name="assert" content="User Agents ignore text-combine-upright with values `digits calc(...)` if the expression inside `calc()` computes to either numbers or out-of-range integers.">
 <meta name="flags" content="dom invalid">
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits2-001.html b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits2-001.html
index 10c4f423350..a765d2dfa50 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits2-001.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits2-001.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <title>CSS Writing Modes: text-combine-upright: digits 2</title>
 <link rel="author" title="Masataka Yakura" href="https://google.com/+MasatakaYakura">
-<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#text-combine-upright">
+<link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#text-combine-upright">
 <link rel="match" href="reference/text-combine-upright-value-single-character.html">
 <meta name="assert" content="the 'digits' values in text-combine-upright rotates the composition even if there is only one character inside tate-chu-yoko.">
 <meta name="flags" content="">
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits2-002.html b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits2-002.html
index ab8d216c232..5a9784ea134 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits2-002.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits2-002.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <title>CSS Writing Modes: text-combine-upright: digits 2 + two digits</title>
 <link rel="author" title="Masataka Yakura" href="https://google.com/+MasatakaYakura">
-<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#text-combine-upright">
+<link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#text-combine-upright">
 <link rel="match" href="reference/vertical-ahem-1x1-ref.html">
 <link rel="mismatch" href="reference/horizontal-ahem-1x1-notref.html">
 <meta name="assert" content="'text-combine-upright: digits 2' combines two ASCII digits horizontally.">
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits2-003.html b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits2-003.html
index 2a56d3eb9c5..dd73b555c7b 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits2-003.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits2-003.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <title>CSS Writing Modes: text-combine-upright: digits 2 + three digits</title>
 <link rel="author" title="Masataka Yakura" href="https://google.com/+MasatakaYakura">
-<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#text-combine-upright">
+<link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#text-combine-upright">
 <link rel="match" href="reference/vertical-ahem-1x3-ref.html">
 <link rel="mismatch" href="reference/horizontal-ahem-1x3-notref.html">
 <meta name="assert" content="'text-combine-upright: digits 2' does not combine digits that are greater than two.">
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits3-001.html b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits3-001.html
index bec7de975d2..227ec7e5d5f 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits3-001.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits3-001.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <title>CSS Writing Modes: text-combine-upright: digits 3 + two digits</title>
 <link rel="author" title="Masataka Yakura" href="https://google.com/+MasatakaYakura">
-<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#text-combine-upright">
+<link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#text-combine-upright">
 <link rel="match" href="reference/vertical-ahem-1x1-ref.html">
 <link rel="mismatch" href="reference/horizontal-ahem-1x1-notref.html">
 <meta name="assert" content="'text-combine-upright: digits 3' combines two ASCII digits horizontally.">
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits3-002.html b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits3-002.html
index 18da1a24372..d1a352d8bdd 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits3-002.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits3-002.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <title>CSS Writing Modes: text-combine-upright: digits 3 + three digits</title>
 <link rel="author" title="Masataka Yakura" href="https://google.com/+MasatakaYakura">
-<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#text-combine-upright">
+<link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#text-combine-upright">
 <link rel="match" href="reference/vertical-ahem-1x1-ref.html">
 <link rel="mismatch" href="reference/horizontal-ahem-1x1-notref.html">
 <meta name="assert" content="'text-combine-upright: digits 3' combines three ASCII digits horizontally.">
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits3-003.html b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits3-003.html
index 11a6932519c..f8f837116a3 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits3-003.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits3-003.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <title>CSS Writing Modes: text-combine-upright: digits 3 + four digits</title>
 <link rel="author" title="Masataka Yakura" href="https://google.com/+MasatakaYakura">
-<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#text-combine-upright">
+<link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#text-combine-upright">
 <link rel="match" href="reference/vertical-ahem-1x4-ref.html">
 <link rel="mismatch" href="reference/horizontal-ahem-1x4-notref.html">
 <meta name="assert" content="'text-combine-upright: digits 3' does not combine digits that are greater than three.">
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits4-001.html b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits4-001.html
index 5a9f0e43bd1..21a2a0d383a 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits4-001.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits4-001.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <title>CSS Writing Modes: text-combine-upright: digits 4 + three digits</title>
 <link rel="author" title="Masataka Yakura" href="https://google.com/+MasatakaYakura">
-<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#text-combine-upright">
+<link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#text-combine-upright">
 <link rel="match" href="reference/vertical-ahem-1x1-ref.html">
 <link rel="mismatch" href="reference/horizontal-ahem-1x1-notref.html">
 <meta name="assert" content="'text-combine-upright: digits 4' combines three ASCII digits horizontally.">
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits4-002.html b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits4-002.html
index d58e555a3e8..14813450d9a 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits4-002.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits4-002.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <title>CSS Writing Modes: text-combine-upright: digits 4 + four digits</title>
 <link rel="author" title="Masataka Yakura" href="https://google.com/+MasatakaYakura">
-<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#text-combine-upright">
+<link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#text-combine-upright">
 <link rel="match" href="reference/vertical-ahem-1x1-ref.html">
 <link rel="mismatch" href="reference/horizontal-ahem-1x1-notref.html">
 <meta name="assert" content="'text-combine-upright: digits 4' combines four ASCII digits horizontally.">
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits4-003.html b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits4-003.html
index 4b30058ad10..8dd3cd5b054 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits4-003.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/text-combine-upright-value-digits4-003.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <title>CSS Writing Modes: text-combine-upright: digits 4 + five digits</title>
 <link rel="author" title="Masataka Yakura" href="https://google.com/+MasatakaYakura">
-<link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#text-combine-upright">
+<link rel="help" href="http://www.w3.org/TR/css-writing-modes-4/#text-combine-upright">
 <link rel="match" href="reference/vertical-ahem-1x5-ref.html">
 <link rel="mismatch" href="reference/horizontal-ahem-1x5-notref.html">
 <meta name="assert" content="'text-combine-upright: digits 4' does not combine digits that are greater than four.">
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-slr-015.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-slr-015.xht
index daa17052c78..c1d57ef1245 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-slr-015.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-slr-015.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: 'writing-mode: sideways-lr' - 'text-orientation: mixed' has no effect</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" title="5.1. Orienting Text: the 'text-orientation' property" href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" />
+  <link rel="help" title="5.1. Orienting Text: the 'text-orientation' property" href="http://www.w3.org/TR/css-writing-modes-4/#text-orientation" />
 
   <meta name="flags" content="image" />
   <meta name="assert" content="This test checks that when 'writing-mode' is set to 'sideways-lr', then a 'text-orientation: mixed' declaration has no effect: the alphabetical baseline is used as the dominant baseline and all the glyphs remain rotated 90 degrees counter-clockwise. The typographic mode for 'sideways-lr' is horizontal and 'text-orientation' has no effect on boxes in horizontal typographic modes." />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-srl-016.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-srl-016.xht
index 11a8f7eb186..4fd928a8764 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-srl-016.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-mixed-srl-016.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: 'writing-mode: sideways-rl' - 'text-orientation: mixed' has no effect</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" title="5.1. Orienting Text: the 'text-orientation' property" href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" />
+  <link rel="help" title="5.1. Orienting Text: the 'text-orientation' property" href="http://www.w3.org/TR/css-writing-modes-4/#text-orientation" />
   <link rel="match" href="text-orientation-mixed-srl-016-ref.xht" />
 
   <meta name="flags" content="" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-sideways-slr-019.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-sideways-slr-019.xht
index edaefc7fae0..9751a850cef 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-sideways-slr-019.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-sideways-slr-019.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: 'writing-mode: sideways-lr' - 'text-orientation: sideways' has no effect</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" title="5.1. Orienting Text: the 'text-orientation' property" href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" />
+  <link rel="help" title="5.1. Orienting Text: the 'text-orientation' property" href="http://www.w3.org/TR/css-writing-modes-4/#text-orientation" />
 
   <meta name="flags" content="image" />
   <meta name="assert" content="This test checks that when 'writing-mode' is set to 'sideways-lr', then a 'text-orientation: sideways' declaration has no effect: the alphabetical baseline is used as the dominant baseline and all the glyphs remain rotated 90 degrees counter-clockwise. The typographic mode for 'sideways-lr' is horizontal and 'text-orientation' has no effect on boxes in horizontal typographic modes." />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-slr-017.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-slr-017.xht
index a668d13d9e3..eb67dde8ed7 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-slr-017.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-slr-017.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: 'writing-mode: sideways-lr' - 'text-orientation: upright' has no effect</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" title="5.1. Orienting Text: the 'text-orientation' property" href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" />
+  <link rel="help" title="5.1. Orienting Text: the 'text-orientation' property" href="http://www.w3.org/TR/css-writing-modes-4/#text-orientation" />
 
   <meta name="flags" content="image" />
   <meta name="assert" content="This test checks that when 'writing-mode' is set to 'sideways-lr', then a 'text-orientation: upright' declaration has no effect: the alphabetical baseline is used as the dominant baseline and all the glyphs remain rotated 90 degrees counter-clockwise. The typographic mode for 'sideways-lr' is horizontal and 'text-orientation' has no effect on boxes in horizontal typographic modes." />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-srl-018.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-srl-018.xht
index 1da5b27ee2a..95549c2b195 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-srl-018.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/text-orientation-upright-srl-018.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: 'writing-mode: sideways-rl' - 'text-orientation: upright' has no effect</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" title="5.1. Orienting Text: the 'text-orientation' property" href="http://www.w3.org/TR/css-writing-modes-3/#text-orientation" />
+  <link rel="help" title="5.1. Orienting Text: the 'text-orientation' property" href="http://www.w3.org/TR/css-writing-modes-4/#text-orientation" />
   <link rel="match" href="text-orientation-mixed-srl-016-ref.xht" />
 
   <meta name="flags" content="" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-029.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-029.xht
index fc738a54f06..e4c4621358e 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-029.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-029.xht
@@ -4,7 +4,7 @@
     <title>CSS Writing Modes Test: vertical-align - 'top' and sideways-lr writing-mode</title>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
     <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-11 -->
-    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
+    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-4/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'sideways-lr', 'vertical-align' is 'top', the physical left (logical top) edge of an inline non-replaced box is aligned with the physical left (logical top) edge of its line box." />
     <link rel="match" href="vertical-alignment-008-ref.xht" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-031.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-031.xht
index 68776ffe309..e26e644bc1f 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-031.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-031.xht
@@ -4,7 +4,7 @@
     <title>CSS Writing Modes Test: vertical-align - 'text-top' and sideways-lr writing-mode</title>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
     <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-11 -->
-    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
+    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-4/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'sideways-lr', 'vertical-align' is 'text-top', the physical left (logical top) edge of an inline non-replaced box is aligned with the left side (logical top) of parent's content area." />
     <link rel="match" href="vertical-alignment-006-ref.xht" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-033.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-033.xht
index 64fa04498be..594af050775 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-033.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-033.xht
@@ -4,7 +4,7 @@
     <title>CSS Writing Modes Test: vertical-align - 'text-bottom' and sideways-lr writing-mode</title>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
     <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-11 -->
-    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
+    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-4/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'sideways-lr', 'vertical-align' is 'text-bottom', the physical right (logical bottom) edge of an inline non-replaced box is aligned with the right side (logical bottom) of parent's content area." />
     <link rel="match" href="vertical-alignment-004-ref.xht" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-035.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-035.xht
index fc134d8b692..f080c1adba9 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-035.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-035.xht
@@ -4,7 +4,7 @@
     <title>CSS Writing Modes Test: vertical-align - 'bottom' and sideways-lr writing-mode</title>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
     <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-11 -->
-    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
+    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-4/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'sideways-lr', 'vertical-align' is 'bottom', the physical right (logical bottom) edge of an inline non-replaced box is aligned with the physical right (logical bottom) edge of its line box." />
     <link rel="match" href="vertical-alignment-002-ref.xht" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-037.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-037.xht
index 2fa710919a1..2ce7a16ceb7 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-037.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-037.xht
@@ -4,7 +4,7 @@
     <title>CSS Writing Modes Test: vertical-align - 'super' and sideways-lr writing-mode</title>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
     <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-11 -->
-    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
+    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-4/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'sideways-lr' and 'vertical-align' is 'super', the baseline of the box is shifted to the left." />
     <meta name="flags" content="ahem" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-039.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-039.xht
index 87a76f31d18..4421bf423fe 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-039.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-039.xht
@@ -4,7 +4,7 @@
     <title>CSS Writing Modes Test: vertical-align - 'sub' and sideways-lr writing-mode</title>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
     <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-11 -->
-    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
+    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-4/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'sideways-lr' and 'vertical-align' is 'sub', the baseline of the box is shifted to the right." />
     <meta name="flags" content="ahem" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-041.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-041.xht
index 8d85d9dfb0e..478b7341c01 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-041.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-slr-041.xht
@@ -4,7 +4,7 @@
     <title>CSS Writing Modes Test: vertical-align - 'middle' and sideways-lr writing-mode</title>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
     <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-11 -->
-    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
+    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-4/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'sideways-lr', 'text-orientation' is 'mixed', 'vertical-align' is 'middle', the vertical midpoint of the box is aligned with the alphabetic baseline of the parent box plus half the x-height of the parent." />
     <link rel="match" href="vertical-alignment-slr-049-ref.xht" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-028.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-028.xht
index dda7e6e74f9..323d9b9ceb7 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-028.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-028.xht
@@ -4,7 +4,7 @@
     <title>CSS Writing Modes Test: vertical-align - 'top' and sideways-rl writing-mode</title>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
     <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-11 -->
-    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
+    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-4/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'sideways-rl', 'vertical-align' is 'top', the physical right (logical top) edge of an inline non-replaced box is aligned with the physical right (logical top) edge of its line box." />
     <link rel="match" href="vertical-alignment-002-ref.xht" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-030.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-030.xht
index ec1663354bc..9d452b96911 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-030.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-030.xht
@@ -4,7 +4,7 @@
     <title>CSS Writing Modes Test: vertical-align - 'text-top' and sideways-rl writing-mode</title>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
     <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-11 -->
-    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
+    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-4/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'sideways-rl', 'vertical-align' is 'text-top', the physical right (logical top) edge of an inline non-replaced box is aligned with the right side (logical top) of parent's content area." />
     <link rel="match" href="vertical-alignment-004-ref.xht" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-032.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-032.xht
index 5905014d0c2..f249ebe57b0 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-032.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-032.xht
@@ -4,7 +4,7 @@
     <title>CSS Writing Modes Test: vertical-align - 'text-bottom' and sideways-rl writing-mode</title>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
     <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-11 -->
-    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
+    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-4/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of an inline non-replaced box with vertical align property. When 'writing-mode' is 'vertical-rl', 'vertical-align' is 'text-bottom', the physical left (logical bottom) edge of an inline non-replaced box is aligned with the left side (logical bottom) of parent's content area." />
     <link rel="match" href="vertical-alignment-006-ref.xht" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-034.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-034.xht
index f99702879d4..3475d21b2a3 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-034.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-034.xht
@@ -4,7 +4,7 @@
    <title>CSS Writing Modes Test: vertical-align - 'bottom' and sideways-rl writing-mode</title>
    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-11 -->
-   <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
+   <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-4/#line-mappings" />
    <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
    <meta name="assert" content="This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'sideways-rl', 'vertical-align' is 'bottom', the physical left (logical bottom) edge of an inline non-replaced box is aligned with the physical left (logical bottom) edge of its line box." />
     <link rel="match" href="vertical-alignment-008-ref.xht" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-036.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-036.xht
index af38d90a001..59d49496d4d 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-036.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-036.xht
@@ -4,7 +4,7 @@
     <title>CSS Writing Modes Test: vertical-align - 'super' and sideways-rl writing-mode</title>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
     <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-11 -->
-    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
+    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-4/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'sideways-rl' and 'vertical-align' is 'super', the baseline of the box is shifted to the right." />
     <meta name="flags" content="ahem" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-038.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-038.xht
index 941149acdc6..c8aa9756332 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-038.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-038.xht
@@ -4,7 +4,7 @@
     <title>CSS Writing Modes Test: vertical-align - 'sub' and sideways-rl writing-mode</title>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
     <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-11 -->
-    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
+    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-4/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'sideways-rl' and 'vertical-align' is 'sub', the baseline of the box is shifted to the left." />
     <meta name="flags" content="ahem" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-040.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-040.xht
index 0281e516333..fd805a2552a 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-040.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/vertical-alignment-srl-040.xht
@@ -4,7 +4,7 @@
     <title>CSS Writing Modes Test: vertical-align - 'middle' and sideways-rl writing-mode</title>
     <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
     <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-12-11 -->
-    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-3/#line-mappings" />
+    <link rel="help" title="7.5 Line-Relative Mappings" href="http://www.w3.org/TR/css-writing-modes-4/#line-mappings" />
     <link rel="help" title="10.8.1 Leading and half-leading" href="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#leading" />
     <meta name="assert" content="This test checks the position of inline non-replaced box with vertical align property. When 'writing-mode' is 'sideways-rl' and 'vertical-align' is 'middle', the vertical midpoint of the box is aligned with the alphabetic baseline of the parent box plus half the x-height of the parent." />
     <link rel="match" href="vertical-alignment-vrl-026-ref.xht" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-008.xht b/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-008.xht
index 788afb701cd..feeb8575ad9 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-008.xht
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-body-008.xht
@@ -7,7 +7,7 @@
   <title>CSS Writing Modes Test: 'writing-mode: sideways-rl' set to body element propagates to viewport</title>
 
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-  <link rel="help" href="https://www.w3.org/TR/css-writing-modes-3/#principal-flow" title="8. The Principal Writing Mode" />
+  <link rel="help" href="https://www.w3.org/TR/css-writing-modes-4/#principal-flow" title="8. The Principal Writing Mode" />
   <link rel="match" href="block-flow-direction-025-ref.xht" />
 
   <meta name="flags" content="image" />
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-parsing-sideways-lr-001.html b/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-parsing-sideways-lr-001.html
index 97083020153..0997dae95ce 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-parsing-sideways-lr-001.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-parsing-sideways-lr-001.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>CSS Writing Modes: parsing writing-mode: sideways-lr</title>
 <link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com">
-<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#block-flow">
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-4/#block-flow">
 <meta name="assert" content="This test asserts the parser and getComputedStyle works correctly for the writing-mode: sideways-lr.">
 <meta name="flags" content="dom">
 <script src="/resources/testharness.js"></script>
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-parsing-sideways-rl-001.html b/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-parsing-sideways-rl-001.html
index 71138dae13a..dfd6f4b3cba 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-parsing-sideways-rl-001.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/writing-mode-parsing-sideways-rl-001.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>CSS Writing Modes: parsing writing-mode: sideways-rl</title>
 <link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com">
-<link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#block-flow">
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-4/#block-flow">
 <meta name="assert" content="This test asserts the parser and getComputedStyle works correctly for the writing-mode: sideways-rl.">
 <meta name="flags" content="dom">
 <script src="/resources/testharness.js"></script>
diff --git a/tests/wpt/web-platform-tests/docs/_running-tests/index.md b/tests/wpt/web-platform-tests/docs/_running-tests/index.md
index 7977c7efecd..f0cecfb15c2 100644
--- a/tests/wpt/web-platform-tests/docs/_running-tests/index.md
+++ b/tests/wpt/web-platform-tests/docs/_running-tests/index.md
@@ -32,7 +32,7 @@ Additional browser-specific documentation:
   * [Safari][safari]
 
 ## From Inside a Browser
-Tests that have been merged on GitHub are mirrored at [http://w3c-test.org/].
+Tests that have been merged on GitHub are mirrored at [http://w3c-test.org/][w3c-test].
 
 For running multiple tests inside a browser, there is a test runner
 located at `/tools/runner/index.html`.
@@ -74,3 +74,4 @@ documented!
 [public-test-infra]: https://lists.w3.org/Archives/Public/public-test-infra/
 [IRC]: irc://irc.w3.org:6667/testing
 [web irc]: http://irc.w3.org
+[w3c-test]: http://w3c-test.org
diff --git a/tests/wpt/web-platform-tests/docs/_writing-tests/reftests.md b/tests/wpt/web-platform-tests/docs/_writing-tests/reftests.md
index 2658962c210..f90d66dbd91 100644
--- a/tests/wpt/web-platform-tests/docs/_writing-tests/reftests.md
+++ b/tests/wpt/web-platform-tests/docs/_writing-tests/reftests.md
@@ -99,14 +99,15 @@ leaf nodes.)
 ## Controlling When Comparison Occurs
 
 By default reftest screenshots are taken after the `load` event has
-fired. In some cases it is necessary to delay the screenshot later
-than this, for example because some DOM manipulation is required to
-set up the desired test conditions. To enable this, the test may have
-a `class="reftest-wait"` attribute specified on the root element. This
-will cause the screenshot to be delayed until the `load` event has
-fired and the `reftest-wait` class has been removed from the root
-element. Note that in neither case is exact timing of the screenshot
-guaranteed: it is only guaranteed to be after those events.
+fired, and web fonts (if any) are loaded. In some cases it is
+necessary to delay the screenshot later than this, for example because
+some DOM manipulation is required to set up the desired test
+conditions. To enable this, the test may have a `class="reftest-wait"`
+attribute specified on the root element. This will cause the
+screenshot to be delayed until the `load` event has fired and the
+`reftest-wait` class has been removed from the root element. Note that
+in neither case is exact timing of the screenshot guaranteed: it is
+only guaranteed to be after those events.
 
 ## Fuzzy Matching
 
diff --git a/tests/wpt/web-platform-tests/interfaces/accelerometer.idl b/tests/wpt/web-platform-tests/interfaces/accelerometer.idl
index dbde9da8672..d3db6023ea5 100644
--- a/tests/wpt/web-platform-tests/interfaces/accelerometer.idl
+++ b/tests/wpt/web-platform-tests/interfaces/accelerometer.idl
@@ -6,10 +6,10 @@ interface Accelerometer : Sensor {
   readonly attribute double? z;
 };
 
-enum LocalCoordinateSystem { "device", "screen" };
+enum AccelerometerLocalCoordinateSystem { "device", "screen" };
 
 dictionary AccelerometerSensorOptions : SensorOptions {
-  LocalCoordinateSystem referenceFrame = "device";
+  AccelerometerLocalCoordinateSystem referenceFrame = "device";
 };
 
 [Constructor(optional AccelerometerSensorOptions options), SecureContext,
diff --git a/tests/wpt/web-platform-tests/interfaces/gyroscope.idl b/tests/wpt/web-platform-tests/interfaces/gyroscope.idl
index 86e70a814f8..5dbb2eae06d 100644
--- a/tests/wpt/web-platform-tests/interfaces/gyroscope.idl
+++ b/tests/wpt/web-platform-tests/interfaces/gyroscope.idl
@@ -5,8 +5,8 @@ interface Gyroscope : Sensor {
   readonly attribute double? z;
 };
 
-enum LocalCoordinateSystem { "device", "screen" };
+enum GyroscopeLocalCoordinateSystem { "device", "screen" };
 
 dictionary GyroscopeSensorOptions : SensorOptions {
-  LocalCoordinateSystem referenceFrame = "device";
+  GyroscopeLocalCoordinateSystem referenceFrame = "device";
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/uievents.idl b/tests/wpt/web-platform-tests/interfaces/uievents.idl
index 5964ee8969a..a273887827e 100644
--- a/tests/wpt/web-platform-tests/interfaces/uievents.idl
+++ b/tests/wpt/web-platform-tests/interfaces/uievents.idl
@@ -1,4 +1,8 @@
-[Constructor(DOMString type, optional UIEventInit eventInitDict)]
+// GENERATED CONTENT - DO NOT EDIT
+// Content of this file was automatically extracted from the UI Events spec.
+// See https://w3c.github.io/uievents/
+
+[Constructor(DOMString type, optional UIEventInit eventInitDict), Exposed=Window]
 interface UIEvent : Event {
   readonly attribute Window? view;
   readonly attribute long detail;
@@ -9,7 +13,7 @@ dictionary UIEventInit : EventInit {
   long detail = 0;
 };
 
-[Constructor(DOMString type, optional FocusEventInit eventInitDict)]
+[Constructor(DOMString type, optional FocusEventInit eventInitDict), Exposed=Window]
 interface FocusEvent : UIEvent {
   readonly attribute EventTarget? relatedTarget;
 };
@@ -18,7 +22,7 @@ dictionary FocusEventInit : UIEventInit {
   EventTarget? relatedTarget = null;
 };
 
-[Constructor(DOMString type, optional MouseEventInit eventInitDict)]
+[Constructor(DOMString type, optional MouseEventInit eventInitDict), Exposed=Window]
 interface MouseEvent : UIEvent {
   readonly attribute long screenX;
   readonly attribute long screenY;
@@ -67,7 +71,7 @@ dictionary EventModifierInit : UIEventInit {
   boolean modifierSymbolLock = false;
 };
 
-[Constructor(DOMString type, optional WheelEventInit eventInitDict)]
+[Constructor(DOMString type, optional WheelEventInit eventInitDict), Exposed=Window]
 interface WheelEvent : MouseEvent {
   // DeltaModeCode
   const unsigned long DOM_DELTA_PIXEL = 0x00;
@@ -87,19 +91,18 @@ dictionary WheelEventInit : MouseEventInit {
   unsigned long deltaMode = 0;
 };
 
-[Constructor(DOMString type, optional InputEventInit eventInitDict)]
+[Constructor(DOMString type, optional InputEventInit eventInitDict), Exposed=Window]
 interface InputEvent : UIEvent {
   readonly attribute DOMString? data;
   readonly attribute boolean isComposing;
 };
 
-
 dictionary InputEventInit : UIEventInit {
   DOMString? data = "";
   boolean isComposing = false;
 };
 
-[Constructor(DOMString type, optional KeyboardEventInit eventInitDict)]
+[Constructor(DOMString type, optional KeyboardEventInit eventInitDict), Exposed=Window]
 interface KeyboardEvent : UIEvent {
   // KeyLocationCode
   const unsigned long DOM_KEY_LOCATION_STANDARD = 0x00;
@@ -130,7 +133,7 @@ dictionary KeyboardEventInit : EventModifierInit {
   boolean isComposing = false;
 };
 
-[Constructor(DOMString type, optional CompositionEventInit eventInitDict)]
+[Constructor(DOMString type, optional CompositionEventInit eventInitDict), Exposed=Window]
 interface CompositionEvent : UIEvent {
   readonly attribute DOMString data;
 };
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/navigate-window.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/navigate-window.https.html
index 3c8533a8000..46d32a48a0a 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/navigate-window.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/navigate-window.https.html
@@ -94,9 +94,9 @@ function validate_window(win, url, opts) {
         resultList.sort(compare_urls);
 
         for (var i = 0; i < resultList.length; ++i) {
-          assert_equals(expected[i].url, resultList[i].url,
+          assert_equals(resultList[i].url, expected[i].url,
                         'client should have expected url');
-          assert_equals(expected[i].frameType, resultList[i].frameType,
+          assert_equals(resultList[i].frameType, expected[i].frameType,
                         'client should have expected frame type');
         }
         return win;
diff --git a/tests/wpt/web-platform-tests/streams/piping/error-propagation-backward.js b/tests/wpt/web-platform-tests/streams/piping/error-propagation-backward.js
index 5dd9feaaea8..dda5774e1c9 100644
--- a/tests/wpt/web-platform-tests/streams/piping/error-propagation-backward.js
+++ b/tests/wpt/web-platform-tests/streams/piping/error-propagation-backward.js
@@ -548,7 +548,7 @@ promise_test(() => {
   return rs.pipeTo(ws).then(
     () => assert_unreached('the promise must not fulfill'),
     err => {
-      assert_equals(err.name, 'TypeError', 'the promise must reject with a TypeError (_not_ with error1)');
+      assert_equals(err, error1, 'the promise must reject with error1');
 
       assert_array_equals(rs.eventsWithoutPulls, ['cancel', err]);
       assert_array_equals(ws.events, ['abort', error1]);
@@ -575,7 +575,7 @@ promise_test(t => {
       return ws.getWriter().closed.then(
         () => assert_unreached('the promise must not fulfill'),
         err => {
-          assert_equals(err.name, 'TypeError', 'the promise must reject with a TypeError (_not_ with error1)');
+          assert_equals(err, error1, 'the promise must reject with error1');
 
           assert_array_equals(rs.eventsWithoutPulls, ['cancel', err]);
           assert_array_equals(ws.events, ['abort', error1]);
@@ -594,7 +594,7 @@ promise_test(t => {
 
   ws.abort(error1);
 
-  return promise_rejects(t, new TypeError(), rs.pipeTo(ws, { preventCancel: true })).then(() => {
+  return promise_rejects(t, error1, rs.pipeTo(ws, { preventCancel: true })).then(() => {
     assert_array_equals(rs.eventsWithoutPulls, []);
     assert_array_equals(ws.events, ['abort', error1]);
   });
diff --git a/tests/wpt/web-platform-tests/streams/piping/multiple-propagation.js b/tests/wpt/web-platform-tests/streams/piping/multiple-propagation.js
index 447433f5980..4edc7c180e1 100644
--- a/tests/wpt/web-platform-tests/streams/piping/multiple-propagation.js
+++ b/tests/wpt/web-platform-tests/streams/piping/multiple-propagation.js
@@ -80,10 +80,10 @@ promise_test(t => {
 
     return Promise.all([
       promise_rejects(t, error1, rs.getReader().closed, 'the readable stream must be errored with error1'),
-      promise_rejects(t, new TypeError(), ws.getWriter().closed,
-        'closed must reject with a TypeError indicating the writable stream was aborted'),
-      promise_rejects(t, new TypeError(), closePromise,
-        'close() must reject with a TypeError indicating the writable stream was aborted'),
+      promise_rejects(t, error1, ws.getWriter().closed,
+        'closed must reject with error1'),
+      promise_rejects(t, error1, closePromise,
+        'close() must reject with error1')
     ]);
   });
 
diff --git a/tests/wpt/web-platform-tests/streams/transform-streams/errors.js b/tests/wpt/web-platform-tests/streams/transform-streams/errors.js
index 83f4984c5bb..fdb21545546 100644
--- a/tests/wpt/web-platform-tests/streams/transform-streams/errors.js
+++ b/tests/wpt/web-platform-tests/streams/transform-streams/errors.js
@@ -205,7 +205,7 @@ promise_test(t => {
   return Promise.all([
     abortPromise,
     cancelPromise,
-    promise_rejects(t, new TypeError(), writer.closed, 'writer.closed should reject with a TypeError')]);
+    promise_rejects(t, thrownError, writer.closed, 'writer.closed should reject with thrownError')]);
 }, 'abort should set the close reason for the writable when it happens before cancel during start, but cancel should ' +
              'still succeed');
 
@@ -229,7 +229,7 @@ promise_test(t => {
       writePromise,
       abortPromise,
       cancelPromise,
-      promise_rejects(t, new TypeError(), writer.closed, 'writer.closed should reject with a TypeError')]);
+      promise_rejects(t, thrownError, writer.closed, 'writer.closed should reject with thrownError')]);
   });
 }, 'abort should set the close reason for the writable when it happens before cancel during underlying sink write, ' +
              'but cancel should still succeed');
@@ -269,9 +269,9 @@ promise_test(t => {
       controller = c;
     }
   });
-  return ts.writable.abort().then(() => {
+  return ts.writable.abort(thrownError).then(() => {
     controller.error(ignoredError);
-    return promise_rejects(t, new TypeError(), ts.writable.getWriter().closed, 'closed should reject with a TypeError');
+    return promise_rejects(t, thrownError, ts.writable.getWriter().closed, 'closed should reject with thrownError');
   });
 }, 'controller.error() should do nothing after writable.abort() has completed');
 
@@ -325,15 +325,22 @@ promise_test(t => {
     // write should start synchronously
     const writePromise = writer.write(0);
     // The underlying sink's abort() is not called until the write() completes.
-    const abortPromise = writer.abort();
+    const abortPromise = writer.abort(thrownError);
     // Perform a read to relieve backpressure and permit the write() to complete.
     const readPromise = ts.readable.getReader().read();
     return Promise.all([
-      promise_rejects(t, new TypeError(), readPromise, 'read() should reject'),
-      promise_rejects(t, new TypeError(), writePromise, 'write() should reject'),
+      promise_rejects(t, thrownError, readPromise, 'read() should reject'),
+      promise_rejects(t, thrownError, writePromise, 'write() should reject'),
       abortPromise
     ]);
   });
 }, 'a write() that was waiting for backpressure should reject if the writable is aborted');
 
+promise_test(t => {
+  const ts = new TransformStream();
+  ts.writable.abort(thrownError);
+  const reader = ts.readable.getReader();
+  return promise_rejects(t, thrownError, reader.read(), 'read() should reject with thrownError');
+}, 'the readable should be errored with the reason passed to the writable abort() method');
+
 done();
diff --git a/tests/wpt/web-platform-tests/streams/transform-streams/reentrant-strategies.js b/tests/wpt/web-platform-tests/streams/transform-streams/reentrant-strategies.js
index 436552b9475..50285bbbcd9 100644
--- a/tests/wpt/web-platform-tests/streams/transform-streams/reentrant-strategies.js
+++ b/tests/wpt/web-platform-tests/streams/transform-streams/reentrant-strategies.js
@@ -317,7 +317,7 @@ promise_test(t => {
   // call to TransformStreamDefaultSink.
   return delay(0).then(() => {
     controller.enqueue('a');
-    return Promise.all([promise_rejects(t, new TypeError(), reader.read(), 'read() should reject'), abortPromise]);
+    return Promise.all([promise_rejects(t, error1, reader.read(), 'read() should reject'), abortPromise]);
   });
 }, 'writer.abort() inside size() should work');
 
diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/aborting.js b/tests/wpt/web-platform-tests/streams/writable-streams/aborting.js
index a193c3b2bb9..b6be0a78895 100644
--- a/tests/wpt/web-platform-tests/streams/writable-streams/aborting.js
+++ b/tests/wpt/web-platform-tests/streams/writable-streams/aborting.js
@@ -27,8 +27,8 @@ promise_test(t => {
   assert_equals(writer.ready, readyPromise, 'the ready promise property should not change');
 
   return Promise.all([
-    promise_rejects(t, new TypeError(), readyPromise, 'the ready promise should reject with a TypeError'),
-    promise_rejects(t, new TypeError(), writePromise, 'the write() promise should reject with a TypeError')
+    promise_rejects(t, error1, readyPromise, 'the ready promise should reject with error1'),
+    promise_rejects(t, error1, writePromise, 'the write() promise should reject with error1')
   ]);
 }, 'Aborting a WritableStream before it starts should cause the writer\'s unsettled ready promise to reject');
 
@@ -44,7 +44,7 @@ promise_test(t => {
     writer.abort(error1);
 
     assert_not_equals(writer.ready, readyPromise, 'the ready promise property should change');
-    return promise_rejects(t, new TypeError(), writer.ready, 'the ready promise should reject with a TypeError');
+    return promise_rejects(t, error1, writer.ready, 'the ready promise should reject with error1');
   });
 }, 'Aborting a WritableStream should cause the writer\'s fulfilled ready promise to reset to a rejected one');
 
@@ -64,16 +64,16 @@ promise_test(t => {
     .then(() => {
       const writer = ws.getWriter();
 
-      const abortPromise = writer.abort();
+      const abortPromise = writer.abort(error1);
 
       return Promise.all([
-        promise_rejects(t, new TypeError(), writer.write(1), 'write(1) must reject with a TypeError'),
-        promise_rejects(t, new TypeError(), writer.write(2), 'write(2) must reject with a TypeError'),
+        promise_rejects(t, error1, writer.write(1), 'write(1) must reject with error1'),
+        promise_rejects(t, error1, writer.write(2), 'write(2) must reject with error1'),
         abortPromise
       ]);
     })
     .then(() => {
-      assert_array_equals(ws.events, ['abort', undefined]);
+      assert_array_equals(ws.events, ['abort', error1]);
     });
 }, 'Aborting a WritableStream immediately prevents future writes');
 
@@ -87,20 +87,20 @@ promise_test(t => {
 
       results.push(
         writer.write(1),
-        promise_rejects(t, new TypeError(), writer.write(2), 'write(2) must reject with a TypeError'),
-        promise_rejects(t, new TypeError(), writer.write(3), 'write(3) must reject with a TypeError')
+        promise_rejects(t, error1, writer.write(2), 'write(2) must reject with error1'),
+        promise_rejects(t, error1, writer.write(3), 'write(3) must reject with error1')
       );
 
-      const abortPromise = writer.abort();
+      const abortPromise = writer.abort(error1);
 
       results.push(
-        promise_rejects(t, new TypeError(), writer.write(4), 'write(4) must reject with a TypeError'),
-        promise_rejects(t, new TypeError(), writer.write(5), 'write(5) must reject with a TypeError')
+        promise_rejects(t, error1, writer.write(4), 'write(4) must reject with error1'),
+        promise_rejects(t, error1, writer.write(5), 'write(5) must reject with error1')
       );
 
       return abortPromise;
     }).then(() => {
-      assert_array_equals(ws.events, ['write', 1, 'abort', undefined]);
+      assert_array_equals(ws.events, ['write', 1, 'abort', error1]);
 
       return Promise.all(results);
     });
@@ -209,26 +209,26 @@ promise_test(t => {
 
   return Promise.all([
     abortPromise,
-    promise_rejects(t, new TypeError(), writer.write(), 'writing should reject with a TypeError'),
-    promise_rejects(t, new TypeError(), writer.close(), 'closing should reject with a TypeError'),
-    promise_rejects(t, new TypeError(), writer.ready, 'ready should reject with a TypeError'),
-    promise_rejects(t, new TypeError(), writer.closed, 'closed should reject with a TypeError')
+    promise_rejects(t, error1, writer.write(), 'writing should reject with error1'),
+    promise_rejects(t, error1, writer.close(), 'closing should reject with error1'),
+    promise_rejects(t, error1, writer.ready, 'ready should reject with error1'),
+    promise_rejects(t, error1, writer.closed, 'closed should reject with error1')
   ]).then(() => {
     assert_array_equals(['ready', 'closed'], events, 'ready should reject before closed');
   });
-}, 'Aborting a WritableStream puts it in an errored state, with a TypeError as the stored error');
+}, 'Aborting a WritableStream puts it in an errored state with the error passed to abort()');
 
 promise_test(t => {
   const ws = new WritableStream();
   const writer = ws.getWriter();
 
-  const writePromise = promise_rejects(t, new TypeError(), writer.write('a'),
-    'writing should reject with a TypeError');
+  const writePromise = promise_rejects(t, error1, writer.write('a'),
+    'writing should reject with error1');
 
   writer.abort(error1);
 
   return writePromise;
-}, 'Aborting a WritableStream causes any outstanding write() promises to be rejected with a TypeError');
+}, 'Aborting a WritableStream causes any outstanding write() promises to be rejected with the reason supplied');
 
 promise_test(t => {
   const ws = recordingWritableStream();
@@ -238,8 +238,8 @@ promise_test(t => {
   const abortPromise = writer.abort(error1);
 
   return Promise.all([
-    promise_rejects(t, new TypeError(), writer.closed, 'closed should reject with a TypeError'),
-    promise_rejects(t, new TypeError(), closePromise, 'close() should reject with a TypeError'),
+    promise_rejects(t, error1, writer.closed, 'closed should reject with error1'),
+    promise_rejects(t, error1, closePromise, 'close() should reject with error1'),
     abortPromise
   ]).then(() => {
     assert_array_equals(ws.events, ['abort', error1]);
@@ -293,9 +293,9 @@ promise_test(t => {
 
   const writer = ws.getWriter();
 
-  writer.abort();
+  writer.abort(error1);
 
-  return promise_rejects(t, new TypeError(), writer.closed, 'closed should reject with a TypeError').then(() => {
+  return promise_rejects(t, error1, writer.closed, 'closed should reject with error1').then(() => {
     assert_false(closeCalled, 'close must not have been called');
   });
 }, 'WritableStream should NOT call underlying sink\'s close if no abort is supplied (historical)');
@@ -329,7 +329,7 @@ promise_test(t => {
     let closedRejected = false;
     return Promise.all([
       writePromise.then(() => assert_false(closedRejected, '.closed should not resolve before write()')),
-      promise_rejects(t, new TypeError(), writer.closed, '.closed should reject').then(() => {
+      promise_rejects(t, error1, writer.closed, '.closed should reject').then(() => {
         closedRejected = true;
       })
     ]);
@@ -350,7 +350,7 @@ promise_test(t => {
     return Promise.all([
       promise_rejects(t, error1, writePromise, 'write() should reject')
           .then(() => assert_false(closedRejected, '.closed should not resolve before write()')),
-      promise_rejects(t, new TypeError(), writer.closed, '.closed should reject')
+      promise_rejects(t, error2, writer.closed, '.closed should reject')
           .then(() => {
             closedRejected = true;
           }),
@@ -370,9 +370,9 @@ promise_test(t => {
     const settlementOrder = [];
     return Promise.all([
       writer.write('1').then(() => settlementOrder.push(1)),
-      promise_rejects(t, new TypeError(), writer.write('2'), 'first queued write should be rejected')
+      promise_rejects(t, error1, writer.write('2'), 'first queued write should be rejected')
           .then(() => settlementOrder.push(2)),
-      promise_rejects(t, new TypeError(), writer.write('3'), 'second queued write should be rejected')
+      promise_rejects(t, error1, writer.write('3'), 'second queued write should be rejected')
           .then(() => settlementOrder.push(3)),
       writer.abort(error1)
     ]).then(() => assert_array_equals([1, 2, 3], settlementOrder, 'writes should be satisfied in order'));
@@ -391,9 +391,9 @@ promise_test(t => {
     return Promise.all([
       promise_rejects(t, error1, writer.write('1'), 'in-flight write should be rejected')
           .then(() => settlementOrder.push(1)),
-      promise_rejects(t, new TypeError(), writer.write('2'), 'first queued write should be rejected')
+      promise_rejects(t, error2, writer.write('2'), 'first queued write should be rejected')
           .then(() => settlementOrder.push(2)),
-      promise_rejects(t, new TypeError(), writer.write('3'), 'second queued write should be rejected')
+      promise_rejects(t, error2, writer.write('3'), 'second queued write should be rejected')
           .then(() => settlementOrder.push(3)),
       writer.abort(error2)
     ]).then(() => assert_array_equals([1, 2, 3], settlementOrder, 'writes should be satisfied in order'));
@@ -410,12 +410,12 @@ promise_test(t => {
   return writer.ready.then(() => {
     return Promise.all([
       promise_rejects(t, error1, writer.write('a'), 'writer.write() should reject with error from underlying write()'),
-      promise_rejects(t, new TypeError(), writer.close(),
+      promise_rejects(t, error2, writer.close(),
                       'writer.close() should reject with error from underlying write()'),
-      writer.abort()
+      writer.abort(error2)
     ]);
   });
-}, 'close() should reject with TypeError when abort() is first error');
+}, 'close() should reject with abort reason why abort() is first error');
 
 promise_test(() => {
   let resolveWrite;
@@ -510,14 +510,14 @@ promise_test(t => {
   return writer.ready.then(() => {
     writer.write('a');
     const closePromise = writer.close();
-    const abortPromise = writer.abort('b');
+    const abortPromise = writer.abort(error1);
 
     return flushAsyncEvents().then(() => {
       assert_array_equals(ws.events, ['write', 'a'], 'abort should not be called while write is in-flight');
       resolveWrite();
       return abortPromise.then(() => {
-        assert_array_equals(ws.events, ['write', 'a', 'abort', 'b'], 'abort should be called after write completes');
-        return promise_rejects(t, new TypeError(), closePromise, 'promise returned by close() should be rejected');
+        assert_array_equals(ws.events, ['write', 'a', 'abort', error1], 'abort should be called after write completes');
+        return promise_rejects(t, error1, closePromise, 'promise returned by close() should be rejected');
       });
     });
   });
@@ -533,13 +533,13 @@ promise_test(t => {
   const writer = ws.getWriter();
   return writer.ready.then(() => {
     writer.write('a');
-    writer.abort();
+    writer.abort(error1);
     writer.releaseLock();
     const writer2 = ws.getWriter();
-    return promise_rejects(t, new TypeError(), writer2.ready,
-                           'ready of the second writer should be rejected with a TypeError');
+    return promise_rejects(t, error1, writer2.ready,
+                           'ready of the second writer should be rejected with error1');
   });
-}, 'if a writer is created for a stream with a pending abort, its ready should be rejected with a TypeError');
+}, 'if a writer is created for a stream with a pending abort, its ready should be rejected with the abort error');
 
 promise_test(() => {
   const ws = new WritableStream();
@@ -607,8 +607,8 @@ promise_test(t => {
     const writePromise2 = writer.write('a');
 
     return Promise.all([
-      promise_rejects(t, new TypeError(), writePromise2, 'writePromise2 must reject with an error indicating abort'),
-      promise_rejects(t, new TypeError(), writer.ready, 'writer.ready must reject with an error indicating abort'),
+      promise_rejects(t, error1, writePromise2, 'writePromise2 must reject with the error from abort'),
+      promise_rejects(t, error1, writer.ready, 'writer.ready must reject with the error from abort'),
       flushAsyncEvents()
     ]);
   }).then(() => {
@@ -620,8 +620,8 @@ promise_test(t => {
       promise_rejects(t, error2, writePromise,
                       'writePromise must reject with the error returned from the sink\'s write method'),
       abortPromise,
-      promise_rejects(t, new TypeError(), writer.closed,
-                      'writer.closed must reject with an error indicating abort'),
+      promise_rejects(t, error1, writer.closed,
+                      'writer.closed must reject with the error from abort'),
       flushAsyncEvents()
     ]);
   }).then(() => {
@@ -631,9 +631,9 @@ promise_test(t => {
     const writePromise3 = writer.write('a');
 
     return Promise.all([
-      promise_rejects(t, new TypeError(), writePromise3,
-                      'writePromise3 must reject with an error indicating abort'),
-      promise_rejects(t, new TypeError(), writer.ready,
+      promise_rejects(t, error1, writePromise3,
+                      'writePromise3 must reject with the error from abort'),
+      promise_rejects(t, error1, writer.ready,
                       'writer.ready must be still rejected with the error indicating abort')
     ]);
   }).then(() => {
@@ -686,8 +686,8 @@ promise_test(t => {
     const writePromise2 = writer.write('a');
 
     return Promise.all([
-      promise_rejects(t, new TypeError(), writePromise2, 'writePromise2 must reject with an error indicating abort'),
-      promise_rejects(t, new TypeError(), writer.ready, 'writer.ready must reject with an error indicating abort'),
+      promise_rejects(t, error1, writePromise2, 'writePromise2 must reject with the error from abort'),
+      promise_rejects(t, error1, writer.ready, 'writer.ready must reject with the error from abort'),
       flushAsyncEvents()
     ]);
   }).then(() => {
@@ -699,9 +699,9 @@ promise_test(t => {
     const writePromise3 = writer.write('a');
 
     return Promise.all([
-      promise_rejects(t, new TypeError(), writePromise3,
-                      'writePromise3 must reject with an error indicating abort'),
-      promise_rejects(t, new TypeError(), writer.ready,
+      promise_rejects(t, error1, writePromise3,
+                      'writePromise3 must reject with the error from abort'),
+      promise_rejects(t, error1, writer.ready,
                       'writer.ready must be still rejected with the error indicating abort'),
       flushAsyncEvents()
     ]);
@@ -716,8 +716,8 @@ promise_test(t => {
     return Promise.all([
       writePromise,
       abortPromise,
-      promise_rejects(t, new TypeError(), writer.closed,
-                      'writer.closed must reject with an error indicating abort'),
+      promise_rejects(t, error1, writer.closed,
+                      'writer.closed must reject with the error from abort'),
       flushAsyncEvents()
     ]);
   }).then(() => {
@@ -728,9 +728,9 @@ promise_test(t => {
 
     return Promise.all([
       writePromise,
-      promise_rejects(t, new TypeError(), writePromise4,
-                      'writePromise4 must reject with an error indicating abort'),
-      promise_rejects(t, new TypeError(), writer.ready,
+      promise_rejects(t, error1, writePromise4,
+                      'writePromise4 must reject with the error from abort'),
+      promise_rejects(t, error1, writer.ready,
                       'writer.ready must be still rejected with the error indicating abort')
     ]);
   }).then(() => {
@@ -785,7 +785,7 @@ promise_test(t => {
     return Promise.all([
       promise_rejects(t, new TypeError(), writer.close(),
         'writer.close() must reject with an error indicating already closing'),
-      promise_rejects(t, new TypeError(), writer.ready, 'writer.ready must reject with an error indicating abort'),
+      promise_rejects(t, error1, writer.ready, 'writer.ready must reject with the error from abort'),
       flushAsyncEvents()
     ]);
   }).then(() => {
@@ -796,7 +796,7 @@ promise_test(t => {
     return Promise.all([
       promise_rejects(t, new TypeError(), writer.close(),
         'writer.close() must reject with an error indicating already closing'),
-      promise_rejects(t, new TypeError(), writer.ready,
+      promise_rejects(t, error1, writer.ready,
                       'writer.ready must be still rejected with the error indicating abort'),
       flushAsyncEvents()
     ]);
@@ -821,7 +821,7 @@ promise_test(t => {
     return Promise.all([
       promise_rejects(t, new TypeError(), writer.close(),
         'writer.close() must reject with an error indicating already closing'),
-      promise_rejects(t, new TypeError(), writer.ready,
+      promise_rejects(t, error1, writer.ready,
                       'writer.ready must be still rejected with the error indicating abort')
     ]);
   }).then(() => {
@@ -1125,11 +1125,11 @@ promise_test(t => {
   const ws = new WritableStream();
   const writer = ws.getWriter();
   const writerReady1 = writer.ready;
-  writer.abort('a');
+  writer.abort(error1);
   const writerReady2 = writer.ready;
   assert_not_equals(writerReady1, writerReady2, 'abort() should replace the ready promise with a rejected one');
   return Promise.all([writerReady1,
-                      promise_rejects(t, new TypeError(), writerReady2, 'writerReady2 should reject')]);
+                      promise_rejects(t, error1, writerReady2, 'writerReady2 should reject')]);
 }, 'writer abort() during sink start() should replace the writer.ready promise synchronously');
 
 promise_test(t => {
@@ -1137,7 +1137,7 @@ promise_test(t => {
   const ws = recordingWritableStream();
   const writer = ws.getWriter();
   const writePromise1 = writer.write(1);
-  const abortPromise = writer.abort('a');
+  const abortPromise = writer.abort(error1);
   const writePromise2 = writer.write(2);
   const closePromise = writer.close();
   writePromise1.catch(() => events.push('write1'));
@@ -1145,15 +1145,15 @@ promise_test(t => {
   writePromise2.catch(() => events.push('write2'));
   closePromise.catch(() => events.push('close'));
   return Promise.all([
-    promise_rejects(t, new TypeError(), writePromise1, 'first write() should reject'),
+    promise_rejects(t, error1, writePromise1, 'first write() should reject'),
     abortPromise,
-    promise_rejects(t, new TypeError(), writePromise2, 'second write() should reject'),
-    promise_rejects(t, new TypeError(), closePromise, 'close() should reject')
+    promise_rejects(t, error1, writePromise2, 'second write() should reject'),
+    promise_rejects(t, error1, closePromise, 'close() should reject')
   ])
   .then(() => {
     assert_array_equals(events, ['write2', 'write1', 'abort', 'close'],
                         'promises should resolve in the standard order');
-    assert_array_equals(ws.events, ['abort', 'a'], 'underlying sink write() should not be called');
+    assert_array_equals(ws.events, ['abort', error1], 'underlying sink write() should not be called');
   });
 }, 'promises returned from other writer methods should be rejected when writer abort() happens during sink start()');
 
@@ -1224,7 +1224,7 @@ promise_test(t => {
     return Promise.all([
       promise_rejects(t, error1, writePromise, 'write should reject'),
       abortPromise,
-      promise_rejects(t, new TypeError(), writer.closed, 'closed should reject with TypeError')
+      promise_rejects(t, error2, writer.closed, 'closed should reject with error2')
     ]);
   }).then(() => {
     assert_array_equals(ws.events, ['write', '1', 'abort', error2], 'abort sink method should be called');
@@ -1243,7 +1243,7 @@ promise_test(() => {
       });
 }, 'when start errors after stream abort(), underlying sink abort() should be called anyway');
 
-promise_test(t => {
+promise_test(() => {
   const ws = new WritableStream();
   const abortPromise1 = ws.abort();
   const abortPromise2 = ws.abort();
@@ -1253,7 +1253,7 @@ promise_test(t => {
       v => assert_equals(v, undefined, 'abort() should fulfill with undefined'));
 }, 'when calling abort() twice on the same stream, both should give the same promise that fulfills with undefined');
 
-promise_test(t => {
+promise_test(() => {
   const ws = new WritableStream();
   const abortPromise1 = ws.abort();
 
diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/bad-underlying-sinks.js b/tests/wpt/web-platform-tests/streams/writable-streams/bad-underlying-sinks.js
index 6cc1b0cc441..2c7c44831d1 100644
--- a/tests/wpt/web-platform-tests/streams/writable-streams/bad-underlying-sinks.js
+++ b/tests/wpt/web-platform-tests/streams/writable-streams/bad-underlying-sinks.js
@@ -189,7 +189,7 @@ promise_test(t => {
   const writer = ws.getWriter();
 
   return promise_rejects(t, error1, writer.abort(abortReason), 'abort should reject with the thrown error')
-  .then(() => promise_rejects(t, new TypeError(), writer.closed, 'closed should reject with a TypeError'));
+  .then(() => promise_rejects(t, abortReason, writer.closed, 'closed should reject with abortReason'));
 }, 'abort: throwing method should cause abort() and closed to reject');
 
 done();
diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/close.js b/tests/wpt/web-platform-tests/streams/writable-streams/close.js
index bf9472ef3bb..5cbe5701ba5 100644
--- a/tests/wpt/web-platform-tests/streams/writable-streams/close.js
+++ b/tests/wpt/web-platform-tests/streams/writable-streams/close.js
@@ -361,8 +361,8 @@ promise_test(t => {
                       'closePromise must reject with the error returned from the sink\'s close method'),
       promise_rejects(t, error1, abortPromise,
                       'abortPromise must reject with the error returned from the sink\'s close method'),
-      promise_rejects(t, new TypeError(), writer.closed,
-                      'writer.closed must reject with a TypeError indicating the stream was aborted')
+      promise_rejects(t, error2, writer.closed,
+                      'writer.closed must reject with error2')
     ]).then(() => {
       assert_array_equals(events, ['closePromise', 'abortPromise', 'closed'],
                           'promises must fulfill/reject in the expected order');
diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/general.js b/tests/wpt/web-platform-tests/streams/writable-streams/general.js
index 1702479337a..7187572f78f 100644
--- a/tests/wpt/web-platform-tests/streams/writable-streams/general.js
+++ b/tests/wpt/web-platform-tests/streams/writable-streams/general.js
@@ -165,8 +165,8 @@ promise_test(() => {
 
 promise_test(t => {
   function functionWithOverloads() {}
-  functionWithOverloads.apply = () => assert_unreached('apply() should not be called');
-  functionWithOverloads.call = () => assert_unreached('call() should not be called');
+  functionWithOverloads.apply = t.unreached_func('apply() should not be called');
+  functionWithOverloads.call = t.unreached_func('call() should not be called');
   const underlyingSink = {
     start: functionWithOverloads,
     write: functionWithOverloads,
@@ -180,9 +180,12 @@ promise_test(t => {
   writer1.close();
 
   // Test abort().
+  const abortError = new Error();
+  abortError.name = 'abort error';
+
   const ws2 = new WritableStream(underlyingSink);
   const writer2 = ws2.getWriter();
-  writer2.abort();
+  writer2.abort(abortError);
 
   // Test abort() with a close underlying sink method present. (Historical; see
   // https://github.com/whatwg/streams/issues/620#issuecomment-263483953 for what used to be
@@ -193,11 +196,11 @@ promise_test(t => {
     close: functionWithOverloads
   });
   const writer3 = ws3.getWriter();
-  writer3.abort();
+  writer3.abort(abortError);
 
   return writer1.closed
-      .then(() => promise_rejects(t, new TypeError(), writer2.closed, 'writer2.closed should be rejected'))
-      .then(() => promise_rejects(t, new TypeError(), writer3.closed, 'writer3.closed should be rejected'));
+      .then(() => promise_rejects(t, abortError, writer2.closed, 'writer2.closed should be rejected'))
+      .then(() => promise_rejects(t, abortError, writer3.closed, 'writer3.closed should be rejected'));
 }, 'methods should not not have .apply() or .call() called');
 
 promise_test(() => {
diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/reentrant-strategy.js b/tests/wpt/web-platform-tests/streams/writable-streams/reentrant-strategy.js
index 0dc9786ff7b..6e1b52c986c 100644
--- a/tests/wpt/web-platform-tests/streams/writable-streams/reentrant-strategy.js
+++ b/tests/wpt/web-platform-tests/streams/writable-streams/reentrant-strategy.js
@@ -114,16 +114,16 @@ promise_test(t => {
   let writer;
   const strategy = {
     size() {
-      writer.abort('nice');
+      writer.abort(error1);
       return 1;
     }
   };
 
   const ws = recordingWritableStream({}, strategy);
   writer = ws.getWriter();
-  return promise_rejects(t, new TypeError(), writer.write('a'), 'write() promise should reject')
+  return promise_rejects(t, error1, writer.write('a'), 'write() promise should reject')
       .then(() => {
-        assert_array_equals(ws.events, ['abort', 'nice'], 'sink.write() should not be called');
+        assert_array_equals(ws.events, ['abort', error1], 'sink.write() should not be called');
       });
 }, 'abort() should work when called from within strategy.size()');
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py b/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py
index c497b5504c2..76ae6a39f45 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py
@@ -179,7 +179,8 @@ def new_session(configuration, request):
         global _current_session
         if _current_session is not None and _current_session.session_id:
             _current_session.end()
-            _current_session = None
+
+        _current_session = None
 
     def create_session(body):
         global _current_session