WPT CSS rename: move remaining directories into css/
This is part of getting the big CSS rename imported:
https://github.com/w3c/web-platform-tests/pull/8011
Includes a fix not yet landed upstream:
https://github.com/w3c/web-platform-tests/pull/8048
Bug: 780700
Change-Id: Ic3654ba6d6440f650a011c547868bdcee59061ec
No-Export: true
TBR: [email protected]
Reviewed-on: https://chromium-review.googlesource.com/752570
Commit-Queue: Philip Jägenstedt <[email protected]>
Reviewed-by: Philip Jägenstedt <[email protected]>
Reviewed-by: Robert Ma <[email protected]>
Cr-Commit-Position: refs/heads/master@{#513671}
diff --git a/third_party/WebKit/LayoutTests/FlagExpectations/enable-blink-features=LayoutNG b/third_party/WebKit/LayoutTests/FlagExpectations/enable-blink-features=LayoutNG
index 32884b59..0c67325 100644
--- a/third_party/WebKit/LayoutTests/FlagExpectations/enable-blink-features=LayoutNG
+++ b/third_party/WebKit/LayoutTests/FlagExpectations/enable-blink-features=LayoutNG
@@ -2502,10 +2502,10 @@
crbug.com/591099 external/wpt/css/css-fonts/matching/fixed-stretch-style-over-weight.html [ Pass ]
crbug.com/591099 external/wpt/css/css-fonts/matching/stretch-distance-over-weight-distance.html [ Pass ]
crbug.com/591099 external/wpt/css/css-fonts/matching/style-ranges-over-weight-direction.html [ Pass ]
-crbug.com/591099 external/wpt/css-scroll-anchoring/anchoring-with-bounds-clamping.html [ Failure Pass ]
-crbug.com/591099 external/wpt/css-scroll-anchoring/clipped-scrollers-skipped.html [ Failure Pass ]
-crbug.com/591099 external/wpt/css-scroll-anchoring/opt-out.html [ Failure Pass ]
-crbug.com/591099 external/wpt/css-scroll-anchoring/position-change-heuristic.html [ Failure Pass ]
+crbug.com/591099 external/wpt/css/css-scroll-anchoring/anchoring-with-bounds-clamping.html [ Failure Pass ]
+crbug.com/591099 external/wpt/css/css-scroll-anchoring/clipped-scrollers-skipped.html [ Failure Pass ]
+crbug.com/591099 external/wpt/css/css-scroll-anchoring/opt-out.html [ Failure Pass ]
+crbug.com/591099 external/wpt/css/css-scroll-anchoring/position-change-heuristic.html [ Failure Pass ]
crbug.com/591099 external/wpt/css/CSS2/floats-clear/floats-143.xht [ Failure Pass ]
crbug.com/591099 external/wpt/css/CSS2/floats-clear/margin-collapse-157.xht [ Failure Pass ]
crbug.com/591099 external/wpt/css/CSS2/floats/floats-wrap-bfc-001-left-overflow.xht [ Crash Failure Pass ]
@@ -2993,13 +2993,13 @@
crbug.com/591099 external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/writing-modes-3/text-combine-upright-compression-003.html [ Crash Failure Pass ]
crbug.com/591099 external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/writing-modes-3/text-combine-upright-compression-004.html [ Crash Failure Pass ]
crbug.com/591099 external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/writing-modes-3/text-combine-upright-compression-006.html [ Crash Failure ]
-crbug.com/591099 external/wpt/cssom-view/cssom-getClientRects-002.html [ Failure Pass ]
-crbug.com/591099 external/wpt/cssom-view/elementFromPoint-002.html [ Failure Pass ]
-crbug.com/591099 external/wpt/cssom-view/elementFromPoint-003.html [ Failure Pass ]
-crbug.com/591099 external/wpt/cssom-view/elementFromPoint.html [ Crash Failure Pass ]
-crbug.com/591099 external/wpt/cssom-view/elementsFromPoint-iframes.html [ Failure Pass ]
-crbug.com/591099 external/wpt/cssom-view/elementsFromPoint-svg.html [ Failure Pass ]
-crbug.com/591099 external/wpt/cssom-view/elementsFromPoint.html [ Crash Failure Pass ]
+crbug.com/591099 external/wpt/css/cssom-view/cssom-getClientRects-002.html [ Failure Pass ]
+crbug.com/591099 external/wpt/css/cssom-view/elementFromPoint-002.html [ Failure Pass ]
+crbug.com/591099 external/wpt/css/cssom-view/elementFromPoint-003.html [ Failure Pass ]
+crbug.com/591099 external/wpt/css/cssom-view/elementFromPoint.html [ Crash Failure Pass ]
+crbug.com/591099 external/wpt/css/cssom-view/elementsFromPoint-iframes.html [ Failure Pass ]
+crbug.com/591099 external/wpt/css/cssom-view/elementsFromPoint-svg.html [ Failure Pass ]
+crbug.com/591099 external/wpt/css/cssom-view/elementsFromPoint.html [ Crash Failure Pass ]
crbug.com/591099 external/wpt/custom-elements/reactions/Document.html [ Crash Failure Pass ]
crbug.com/591099 external/wpt/dom/interfaces.html [ Pass Timeout ]
crbug.com/591099 external/wpt/dom/nodes/Document-contentType/contentType/contenttype_datauri_02.html [ Pass ]
diff --git a/third_party/WebKit/LayoutTests/FlagExpectations/enable-features=NetworkService b/third_party/WebKit/LayoutTests/FlagExpectations/enable-features=NetworkService
index 147551aa..87ebc76 100644
--- a/third_party/WebKit/LayoutTests/FlagExpectations/enable-features=NetworkService
+++ b/third_party/WebKit/LayoutTests/FlagExpectations/enable-features=NetworkService
@@ -14,8 +14,8 @@
Bug(none) external/wpt/content-security-policy/inside-worker/dedicated-inheritance.html [ Failure Timeout ]
Bug(none) external/wpt/content-security-policy/inside-worker/dedicated-script.html [ Failure Timeout ]
Bug(none) external/wpt/cookies/secure/set-from-wss.https.sub.html [ Failure ]
-Bug(none) external/wpt/cssom-view/scrolling-quirks-vs-nonquirks.html [ Failure Timeout Crash ]
-Bug(none) external/wpt/cssom-view/scrollingElement.html [ Failure Timeout Crash ]
+Bug(none) external/wpt/css/cssom-view/scrolling-quirks-vs-nonquirks.html [ Failure Timeout Crash ]
+Bug(none) external/wpt/css/cssom-view/scrollingElement.html [ Failure Timeout Crash ]
Bug(none) external/wpt/fetch/api/cors/cors-cookies.any.html [ Failure Pass ]
Bug(none) external/wpt/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-weird.html [ Failure Timeout Failure ]
Bug(none) external/wpt/html/browsers/offline/appcache/workers/appcache-worker.html [ Timeout ]
diff --git a/third_party/WebKit/LayoutTests/SmokeTests b/third_party/WebKit/LayoutTests/SmokeTests
index 9f5b0b9..a0cfe8c 100644
--- a/third_party/WebKit/LayoutTests/SmokeTests
+++ b/third_party/WebKit/LayoutTests/SmokeTests
@@ -153,17 +153,17 @@
external/wpt/css/css-grid/grid-definition/grid-template-columns-rows-resolved-values-001.xht
external/wpt/css/css-grid/grid-layout-properties.html
external/wpt/css/css-grid/grid-model/grid-support-display-001.xht
-external/wpt/cssom/cssom-cssText-serialize.html
-external/wpt/cssom/medialist-interfaces-004.html
-external/wpt/cssom-view/cssom-view/media-query-list-interface.xht
-external/wpt/cssom-view/cssom-view-window-screen-interface.html
-external/wpt/cssom-view/ttwf-scrollintoview.html
-external/wpt/css-timing/cubic-bezier-timing-functions-output.html
-external/wpt/css-timing/frames-timing-functions-output.html
-external/wpt/css-timing/frames-timing-functions-syntax.html
-external/wpt/css-timing/step-timing-functions-output.html
-external/wpt/css-typed-om/CSSMatrixComponent-DOMMatrix-mutable.html
-external/wpt/css-typed-om/declared-styleMap-accepts-inherit.html
+external/wpt/css/cssom/cssom-cssText-serialize.html
+external/wpt/css/cssom/medialist-interfaces-004.html
+external/wpt/css/cssom-view/cssom-view/media-query-list-interface.xht
+external/wpt/css/cssom-view/cssom-view-window-screen-interface.html
+external/wpt/css/cssom-view/ttwf-scrollintoview.html
+external/wpt/css/css-timing/cubic-bezier-timing-functions-output.html
+external/wpt/css/css-timing/frames-timing-functions-output.html
+external/wpt/css/css-timing/frames-timing-functions-syntax.html
+external/wpt/css/css-timing/step-timing-functions-output.html
+external/wpt/css/css-typed-om/CSSMatrixComponent-DOMMatrix-mutable.html
+external/wpt/css/css-typed-om/declared-styleMap-accepts-inherit.html
external/wpt/custom-elements/HTMLElement-constructor.html
external/wpt/custom-elements/parser/parser-constructs-custom-element-in-document-write.html
external/wpt/custom-elements/parser/parser-constructs-custom-elements.html
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
index 1e96687..4973858f 100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -102,7 +102,7 @@
crbug.com/774567 [ Win Linux ] external/wpt/webvtt/rendering/cues-with-video/processing-model/dom_override_remove_cue_while_paused.html [ Failure ]
# Fails because the manual test hasn't been automated yet
-crbug.com/762054 external/wpt/cssom-view/overscrollBehavior-manual.html [ Skip ]
+crbug.com/762054 external/wpt/css/cssom-view/overscrollBehavior-manual.html [ Skip ]
# Fails consistently on WebKit Mac10.10, WebKit Mac10.11 (retina) and mac10.10_blink_rel tryserver, but not on other Mac bots.
crbug.com/614910 [ Mac ] virtual/gpu-rasterization/images/pixel-crack-image-background-webkit-transform-scale.html [ Pass Failure ]
@@ -1925,7 +1925,7 @@
crbug.com/626703 external/wpt/css/css-ui/text-overflow-006.html [ Failure ]
crbug.com/626703 external/wpt/css/css-ui/text-overflow-010.html [ Failure ]
crbug.com/626703 external/wpt/css/css-ui/text-overflow-021.html [ Failure ]
-crbug.com/626703 external/wpt/cssom-view/matchMedia.xht [ Timeout ]
+crbug.com/626703 external/wpt/css/cssom-view/matchMedia.xht [ Timeout ]
crbug.com/626703 external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-001a.xhtml [ Failure ]
crbug.com/626703 external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-001b.xhtml [ Failure ]
crbug.com/626703 external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-006.xhtml [ Failure ]
@@ -3207,12 +3207,12 @@
crbug.com/755405 [ Android ] external/wpt/css/css-align/content-distribution/place-content-shorthand-003.html [ Failure ]
crbug.com/755405 [ Android ] external/wpt/css/css-align/default-alignment/place-items-shorthand-001.html [ Failure ]
crbug.com/755405 [ Android ] external/wpt/css/css-display/display-contents-computed-style.html [ Failure ]
-crbug.com/755405 [ Android ] external/wpt/css-typed-om/CSSMatrixComponent-DOMMatrix-mutable.html [ Failure ]
-crbug.com/755405 [ Android ] external/wpt/css-typed-om/declared-styleMap-accepts-inherit.html [ Failure ]
-crbug.com/755405 [ Android ] external/wpt/cssom/cssom-cssText-serialize.html [ Failure ]
-crbug.com/755405 [ Android ] external/wpt/cssom/medialist-interfaces-004.html [ Failure ]
-crbug.com/755405 [ Android ] external/wpt/cssom-view/cssom-view-window-screen-interface.html [ Failure ]
-crbug.com/755405 [ Android ] external/wpt/cssom-view/cssom-view/media-query-list-interface.xht [ Failure ]
+crbug.com/755405 [ Android ] external/wpt/css/css-typed-om/CSSMatrixComponent-DOMMatrix-mutable.html [ Failure ]
+crbug.com/755405 [ Android ] external/wpt/css/css-typed-om/declared-styleMap-accepts-inherit.html [ Failure ]
+crbug.com/755405 [ Android ] external/wpt/css/cssom/cssom-cssText-serialize.html [ Failure ]
+crbug.com/755405 [ Android ] external/wpt/css/cssom/medialist-interfaces-004.html [ Failure ]
+crbug.com/755405 [ Android ] external/wpt/css/cssom-view/cssom-view-window-screen-interface.html [ Failure ]
+crbug.com/755405 [ Android ] external/wpt/css/cssom-view/cssom-view/media-query-list-interface.xht [ Failure ]
crbug.com/755405 [ Android ] external/wpt/custom-elements/HTMLElement-constructor.html [ Failure ]
crbug.com/755405 [ Android ] external/wpt/custom-elements/parser/parser-constructs-custom-element-in-document-write.html [ Failure ]
crbug.com/755405 [ Android ] external/wpt/custom-elements/parser/parser-constructs-custom-elements.html [ Failure ]
diff --git a/third_party/WebKit/LayoutTests/VirtualTestSuites b/third_party/WebKit/LayoutTests/VirtualTestSuites
index 6c7286271..48239a97 100644
--- a/third_party/WebKit/LayoutTests/VirtualTestSuites
+++ b/third_party/WebKit/LayoutTests/VirtualTestSuites
@@ -280,7 +280,7 @@
},
{
"prefix": "scalefactor200",
- "base": "external/wpt/css-paint-api/hidpi",
+ "base": "external/wpt/css/css-paint-api/hidpi",
"args": ["--force-device-scale-factor=2"]
},
{
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-cascade/OWNERS b/third_party/WebKit/LayoutTests/external/wpt/css-cascade/OWNERS
deleted file mode 100644
index ada3963..0000000
--- a/third_party/WebKit/LayoutTests/external/wpt/css-cascade/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# TEAM: [email protected]
-# COMPONENT: Blink>CSS
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scoping/OWNERS b/third_party/WebKit/LayoutTests/external/wpt/css-scoping/OWNERS
deleted file mode 100644
index ada3963..0000000
--- a/third_party/WebKit/LayoutTests/external/wpt/css-scoping/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# TEAM: [email protected]
-# COMPONENT: Blink>CSS
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-backgrounds/OWNERS b/third_party/WebKit/LayoutTests/external/wpt/css/css-backgrounds/OWNERS
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-backgrounds/OWNERS
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-backgrounds/OWNERS
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-backgrounds/background-clip-color-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-backgrounds/background-clip-color-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-backgrounds/background-clip-color-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-backgrounds/background-clip-color-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-backgrounds/background-clip-color-repaint-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-backgrounds/background-clip-color-repaint-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-backgrounds/background-clip-color-repaint-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-backgrounds/background-clip-color-repaint-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-backgrounds/background-clip-color-repaint.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-backgrounds/background-clip-color-repaint.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-backgrounds/background-clip-color-repaint.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-backgrounds/background-clip-color-repaint.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-backgrounds/background-clip-color.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-backgrounds/background-clip-color.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-backgrounds/background-clip-color.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-backgrounds/background-clip-color.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-cascade/inherit-initial.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-cascade/inherit-initial.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-cascade/inherit-initial.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-cascade/inherit-initial.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-font-loading/OWNERS b/third_party/WebKit/LayoutTests/external/wpt/css/css-font-loading/OWNERS
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-font-loading/OWNERS
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-font-loading/OWNERS
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-font-loading/fontfacesetloadevent-constructor.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-font-loading/fontfacesetloadevent-constructor.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-font-loading/fontfacesetloadevent-constructor.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-font-loading/fontfacesetloadevent-constructor.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/OWNERS b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/OWNERS
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/OWNERS
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/OWNERS
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/background-image-alpha-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/background-image-alpha-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/background-image-alpha-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/background-image-alpha-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/background-image-alpha.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/background-image-alpha.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/background-image-alpha.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/background-image-alpha.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/background-image-multiple-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/background-image-multiple-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/background-image-multiple-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/background-image-multiple-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/background-image-multiple.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/background-image-multiple.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/background-image-multiple.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/background-image-multiple.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/background-image-tiled-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/background-image-tiled-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/background-image-tiled-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/background-image-tiled-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/background-image-tiled.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/background-image-tiled.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/background-image-tiled.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/background-image-tiled.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-background-image-001-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-background-image-001-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-background-image-001-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-background-image-001-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-background-image-001.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-background-image-001.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-background-image-001.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-background-image-001.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-background-image-002-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-background-image-002-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-background-image-002-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-background-image-002-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-background-image-002.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-background-image-002.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-background-image-002.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-background-image-002.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-background-image-tiled-001-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-background-image-tiled-001-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-background-image-tiled-001-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-background-image-tiled-001-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-background-image-tiled-001.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-background-image-tiled-001.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-background-image-tiled-001.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-background-image-tiled-001.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-background-image-tiled-002-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-background-image-tiled-002-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-background-image-tiled-002-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-background-image-tiled-002-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-background-image-tiled-002.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-background-image-tiled-002.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-background-image-tiled-002.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-background-image-tiled-002.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-background-image-tiled-003-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-background-image-tiled-003-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-background-image-tiled-003-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-background-image-tiled-003-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-background-image-tiled-003.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-background-image-tiled-003.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-background-image-tiled-003.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-background-image-tiled-003.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-border-image-001-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-border-image-001-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-border-image-001-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-border-image-001-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-border-image-001.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-border-image-001.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-border-image-001.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-border-image-001.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-border-image-002-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-border-image-002-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-border-image-002-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-border-image-002-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-border-image-002.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-border-image-002.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-border-image-002.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-border-image-002.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-border-image-003-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-border-image-003-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-border-image-003-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-border-image-003-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-border-image-003.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-border-image-003.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-border-image-003.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-border-image-003.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-border-image-004-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-border-image-004-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-border-image-004-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-border-image-004-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-border-image-004.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-border-image-004.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/geometry-border-image-004.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/geometry-border-image-004.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/hidpi/device-pixel-ratio-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/hidpi/device-pixel-ratio-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/hidpi/device-pixel-ratio-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/hidpi/device-pixel-ratio-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/hidpi/device-pixel-ratio.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/hidpi/device-pixel-ratio.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/hidpi/device-pixel-ratio.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/hidpi/device-pixel-ratio.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/invalid-image-constructor-error-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/invalid-image-constructor-error-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/invalid-image-constructor-error-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/invalid-image-constructor-error-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/invalid-image-constructor-error.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/invalid-image-constructor-error.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/invalid-image-constructor-error.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/invalid-image-constructor-error.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/invalid-image-paint-error-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/invalid-image-paint-error-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/invalid-image-paint-error-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/invalid-image-paint-error-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/invalid-image-paint-error.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/invalid-image-paint-error.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/invalid-image-paint-error.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/invalid-image-paint-error.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/invalid-image-pending-script-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/invalid-image-pending-script-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/invalid-image-pending-script-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/invalid-image-pending-script-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/invalid-image-pending-script.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/invalid-image-pending-script.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/invalid-image-pending-script.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/invalid-image-pending-script.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/overdraw-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/overdraw-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/overdraw-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/overdraw-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/overdraw.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/overdraw.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/overdraw.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/overdraw.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint-arguments-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint-arguments-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint-arguments-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint-arguments-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint-arguments.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint-arguments.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint-arguments.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint-arguments.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint-function-arguments-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint-function-arguments-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint-function-arguments-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint-function-arguments-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint-function-arguments.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint-function-arguments.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint-function-arguments.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint-function-arguments.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-composite-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-composite-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-composite-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-composite-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-composite.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-composite.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-composite.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-composite.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-filter-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-filter-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-filter-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-filter-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-filter.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-filter.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-filter.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-filter.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-gradient-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-gradient-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-gradient-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-gradient-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-gradient.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-gradient.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-gradient.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-gradient.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-image-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-image-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-image-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-image-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-image.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-image.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-image.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-image.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-paths-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-paths-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-paths-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-paths-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-paths.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-paths.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-paths.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-paths.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-rects-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-rects-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-rects-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-rects-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-rects.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-rects.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-rects.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-rects.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-shadows-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-shadows-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-shadows-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-shadows-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-shadows.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-shadows.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-shadows.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-shadows.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-transform-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-transform-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-transform-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-transform-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-transform.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-transform.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/paint2d-transform.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/paint2d-transform.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-001.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-001.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-001.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-001.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-002.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-002.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-002.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-002.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-003.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-003.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-003.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-003.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-004.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-004.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-004.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-004.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-005.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-005.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-005.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-005.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-006.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-006.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-006.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-006.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-007.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-007.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-007.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-007.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-008.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-008.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-008.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-008.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-009.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-009.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-009.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-009.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-010.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-010.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-010.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-010.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-011.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-011.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-011.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-011.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-012.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-012.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-012.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-012.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-013.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-013.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-013.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-013.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-014.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-014.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-014.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-014.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-015.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-015.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-015.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-015.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-016.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-016.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-016.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-016.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-017.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-017.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-017.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-017.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-018-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-018-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-018-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-018-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-018.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-018.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-018.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-018.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-019.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-019.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-019.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-019.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-020.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-020.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-020.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-020.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-021.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-021.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-021.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-021.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-022.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-022.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-022.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-022.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/parse-input-arguments-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/parse-input-arguments-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/registered-properties-in-custom-paint.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/registered-properties-in-custom-paint.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/registered-properties-in-custom-paint.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/registered-properties-in-custom-paint.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/style-background-image-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/style-background-image-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/style-background-image-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/style-background-image-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/style-background-image.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/style-background-image.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/style-background-image.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/style-background-image.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/style-before-pseudo-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/style-before-pseudo-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/style-before-pseudo-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/style-before-pseudo-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/style-before-pseudo.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/style-before-pseudo.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/style-before-pseudo.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/style-before-pseudo.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/style-first-letter-pseudo-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/style-first-letter-pseudo-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/style-first-letter-pseudo-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/style-first-letter-pseudo-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/style-first-letter-pseudo.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/style-first-letter-pseudo.html
similarity index 93%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/style-first-letter-pseudo.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/style-first-letter-pseudo.html
index 61763b28..3cdffb4 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/style-first-letter-pseudo.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/style-first-letter-pseudo.html
@@ -14,8 +14,8 @@
line-height: 2px;
}
</style>
-<script src="../common/reftest-wait.js"></script>
-<script src="../common/css-paint-tests.js"></script>
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/css-paint-tests.js"></script>
<body style="font: 10px/1 Ahem;">
<div>ppp</div>
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/valid-image-after-load-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/valid-image-after-load-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/valid-image-after-load-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/valid-image-after-load-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/valid-image-after-load.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/valid-image-after-load.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/valid-image-after-load.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/valid-image-after-load.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/valid-image-before-load-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/valid-image-before-load-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/valid-image-before-load-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/valid-image-before-load-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-paint-api/valid-image-before-load.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/valid-image-before-load.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-paint-api/valid-image-before-load.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-paint-api/valid-image-before-load.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scoping/slotted-parsing.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-scoping/slotted-parsing.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scoping/slotted-parsing.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scoping/slotted-parsing.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scoping/slotted-with-pseudo-element-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-scoping/slotted-with-pseudo-element-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scoping/slotted-with-pseudo-element-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scoping/slotted-with-pseudo-element-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scoping/slotted-with-pseudo-element.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-scoping/slotted-with-pseudo-element.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scoping/slotted-with-pseudo-element.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scoping/slotted-with-pseudo-element.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/OWNERS b/third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/OWNERS
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/OWNERS
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/OWNERS
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/README.md b/third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/README.md
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/README.md
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/README.md
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/abspos-containing-block-outside-scroller.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/abspos-containing-block-outside-scroller.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/abspos-containing-block-outside-scroller.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/abspos-containing-block-outside-scroller.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/abspos-contributes-to-static-parent-bounds.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/abspos-contributes-to-static-parent-bounds.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/abspos-contributes-to-static-parent-bounds.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/abspos-contributes-to-static-parent-bounds.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/ancestor-change-heuristic.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/ancestor-change-heuristic.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/ancestor-change-heuristic.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/ancestor-change-heuristic.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/anchor-updates-after-explicit-scroll.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/anchor-updates-after-explicit-scroll.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/anchor-updates-after-explicit-scroll.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/anchor-updates-after-explicit-scroll.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/anchoring-with-bounds-clamping-div.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/anchoring-with-bounds-clamping-div.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/anchoring-with-bounds-clamping-div.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/anchoring-with-bounds-clamping-div.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/anchoring-with-bounds-clamping.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/anchoring-with-bounds-clamping.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/anchoring-with-bounds-clamping.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/anchoring-with-bounds-clamping.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/anonymous-block-box.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/anonymous-block-box.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/anonymous-block-box.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/anonymous-block-box.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/basic.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/basic.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/basic.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/basic.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/clipped-scrollers-skipped.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/clipped-scrollers-skipped.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/clipped-scrollers-skipped.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/clipped-scrollers-skipped.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/descend-into-container-with-float.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/descend-into-container-with-float.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/descend-into-container-with-float.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/descend-into-container-with-float.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/descend-into-container-with-overflow.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/descend-into-container-with-overflow.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/descend-into-container-with-overflow.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/descend-into-container-with-overflow.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/exclude-fixed-position.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/exclude-fixed-position.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/exclude-fixed-position.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/exclude-fixed-position.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/inline-block.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/inline-block.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/inline-block.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/inline-block.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/negative-layout-overflow.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/negative-layout-overflow.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/negative-layout-overflow.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/negative-layout-overflow.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/opt-out.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/opt-out.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/opt-out.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/opt-out.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/position-change-heuristic.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/position-change-heuristic.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/position-change-heuristic.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/position-change-heuristic.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/start-edge-in-block-layout-direction.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/start-edge-in-block-layout-direction.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/start-edge-in-block-layout-direction.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/start-edge-in-block-layout-direction.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/subtree-exclusion.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/subtree-exclusion.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/subtree-exclusion.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/subtree-exclusion.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/wrapped-text.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/wrapped-text.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-scroll-anchoring/wrapped-text.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-scroll-anchoring/wrapped-text.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-timing/OWNERS b/third_party/WebKit/LayoutTests/external/wpt/css/css-timing/OWNERS
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-timing/OWNERS
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-timing/OWNERS
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-timing/cubic-bezier-timing-functions-output-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/css-timing/cubic-bezier-timing-functions-output-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-timing/cubic-bezier-timing-functions-output-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-timing/cubic-bezier-timing-functions-output-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-timing/cubic-bezier-timing-functions-output.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-timing/cubic-bezier-timing-functions-output.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-timing/cubic-bezier-timing-functions-output.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-timing/cubic-bezier-timing-functions-output.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-timing/frames-timing-functions-output.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-timing/frames-timing-functions-output.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-timing/frames-timing-functions-output.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-timing/frames-timing-functions-output.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-timing/frames-timing-functions-syntax.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-timing/frames-timing-functions-syntax.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-timing/frames-timing-functions-syntax.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-timing/frames-timing-functions-syntax.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-timing/step-timing-functions-output.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-timing/step-timing-functions-output.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-timing/step-timing-functions-output.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-timing/step-timing-functions-output.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-timing/testcommon.js b/third_party/WebKit/LayoutTests/external/wpt/css/css-timing/testcommon.js
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-timing/testcommon.js
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-timing/testcommon.js
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-typed-om/CSSMatrixComponent-DOMMatrix-mutable-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/css-typed-om/CSSMatrixComponent-DOMMatrix-mutable-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-typed-om/CSSMatrixComponent-DOMMatrix-mutable-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-typed-om/CSSMatrixComponent-DOMMatrix-mutable-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-typed-om/CSSMatrixComponent-DOMMatrix-mutable.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-typed-om/CSSMatrixComponent-DOMMatrix-mutable.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-typed-om/CSSMatrixComponent-DOMMatrix-mutable.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-typed-om/CSSMatrixComponent-DOMMatrix-mutable.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-typed-om/OWNERS b/third_party/WebKit/LayoutTests/external/wpt/css/css-typed-om/OWNERS
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-typed-om/OWNERS
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-typed-om/OWNERS
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-typed-om/declared-styleMap-accepts-inherit.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-typed-om/declared-styleMap-accepts-inherit.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-typed-om/declared-styleMap-accepts-inherit.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-typed-om/declared-styleMap-accepts-inherit.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-typed-om/styleMap-update-function-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/css-typed-om/styleMap-update-function-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-typed-om/styleMap-update-function-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-typed-om/styleMap-update-function-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/css-typed-om/styleMap-update-function.html b/third_party/WebKit/LayoutTests/external/wpt/css/css-typed-om/styleMap-update-function.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/css-typed-om/styleMap-update-function.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/css-typed-om/styleMap-update-function.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/CaretPosition-001.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/CaretPosition-001.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/CaretPosition-001.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/CaretPosition-001.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/DOMRectList.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/DOMRectList.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/DOMRectList.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/DOMRectList.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/HTMLBody-ScrollArea_quirksmode.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/HTMLBody-ScrollArea_quirksmode.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/HTMLBody-ScrollArea_quirksmode.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/HTMLBody-ScrollArea_quirksmode.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/MediaQueryList-001.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/MediaQueryList-001.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/MediaQueryList-001.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/MediaQueryList-001.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/MediaQueryList-with-empty-string.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/MediaQueryList-with-empty-string.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/MediaQueryList-with-empty-string.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/MediaQueryList-with-empty-string.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/OWNERS b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/OWNERS
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/OWNERS
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/OWNERS
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/Screen-pixelDepth-Screen-colorDepth001.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/Screen-pixelDepth-Screen-colorDepth001.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/Screen-pixelDepth-Screen-colorDepth001.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/Screen-pixelDepth-Screen-colorDepth001.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/cssom-getBoundingClientRect-001.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/cssom-getBoundingClientRect-001.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/cssom-getBoundingClientRect-001.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/cssom-getBoundingClientRect-001.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/cssom-getBoundingClientRect-002.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/cssom-getBoundingClientRect-002.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/cssom-getBoundingClientRect-002.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/cssom-getBoundingClientRect-002.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/cssom-getClientRects-002-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/cssom-getClientRects-002-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/cssom-getClientRects-002-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/cssom-getClientRects-002-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/cssom-getClientRects-002.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/cssom-getClientRects-002.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/cssom-getClientRects-002.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/cssom-getClientRects-002.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/cssom-getClientRects.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/cssom-getClientRects.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/cssom-getClientRects.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/cssom-getClientRects.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/cssom-view-img-attributes-001.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/cssom-view-img-attributes-001.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/cssom-view-img-attributes-001.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/cssom-view-img-attributes-001.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/cssom-view-window-screen-interface.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/cssom-view-window-screen-interface.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/cssom-view-window-screen-interface.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/cssom-view-window-screen-interface.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/cssom-view/media-query-list-interface.xht b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/cssom-view/media-query-list-interface.xht
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/cssom-view/media-query-list-interface.xht
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/cssom-view/media-query-list-interface.xht
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/cssom-view/window-interface-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/cssom-view/window-interface-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/cssom-view/window-interface-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/cssom-view/window-interface-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/cssom-view/window-interface.xht b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/cssom-view/window-interface.xht
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/cssom-view/window-interface.xht
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/cssom-view/window-interface.xht
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementFromPoint-001.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementFromPoint-001.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementFromPoint-001.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementFromPoint-001.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementFromPoint-002-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementFromPoint-002-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementFromPoint-002-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementFromPoint-002-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementFromPoint-002.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementFromPoint-002.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementFromPoint-002.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementFromPoint-002.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementFromPoint-003-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementFromPoint-003-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementFromPoint-003-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementFromPoint-003-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementFromPoint-003.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementFromPoint-003.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementFromPoint-003.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementFromPoint-003.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementFromPoint.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementFromPoint.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementFromPoint.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementFromPoint.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementFromPosition-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementFromPosition-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementFromPosition-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementFromPosition-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementFromPosition.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementFromPosition.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementFromPosition.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementFromPosition.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementScroll.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementScroll.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementScroll.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementScroll.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementsFromPoint-iframes.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementsFromPoint-iframes.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementsFromPoint-iframes.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementsFromPoint-iframes.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementsFromPoint-invalid-cases.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementsFromPoint-invalid-cases.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementsFromPoint-invalid-cases.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementsFromPoint-invalid-cases.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementsFromPoint-shadowroot.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementsFromPoint-shadowroot.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementsFromPoint-shadowroot.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementsFromPoint-shadowroot.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementsFromPoint-simple.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementsFromPoint-simple.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementsFromPoint-simple.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementsFromPoint-simple.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementsFromPoint-svg.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementsFromPoint-svg.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementsFromPoint-svg.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementsFromPoint-svg.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementsFromPoint-table.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementsFromPoint-table.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementsFromPoint-table.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementsFromPoint-table.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementsFromPoint.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementsFromPoint.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/elementsFromPoint.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/elementsFromPoint.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/historical.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/historical.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/historical.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/historical.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/htmlelement-offset-width-001.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/htmlelement-offset-width-001.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/htmlelement-offset-width-001.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/htmlelement-offset-width-001.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/iframe.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/iframe.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/iframe.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/iframe.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/interfaces-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/interfaces-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/interfaces-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/interfaces-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/interfaces.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/interfaces.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/interfaces.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/interfaces.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/matchMedia.xht b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/matchMedia.xht
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/matchMedia.xht
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/matchMedia.xht
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/matchMediaAddListener.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/matchMediaAddListener.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/matchMediaAddListener.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/matchMediaAddListener.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/mouseEvent.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/mouseEvent.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/mouseEvent.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/mouseEvent.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/negativeMargins.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/negativeMargins.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/negativeMargins.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/negativeMargins.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/offsetParent_element_test.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/offsetParent_element_test.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/offsetParent_element_test.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/offsetParent_element_test.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/offsetTopLeftInScrollableParent.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/offsetTopLeftInScrollableParent.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/offsetTopLeftInScrollableParent.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/offsetTopLeftInScrollableParent.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/overscrollBehavior-manual.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/overscrollBehavior-manual.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/overscrollBehavior-manual.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/overscrollBehavior-manual.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/resources/elementsFromPoint.js b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/resources/elementsFromPoint.js
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/resources/elementsFromPoint.js
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/resources/elementsFromPoint.js
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/resources/iframe1.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/resources/iframe1.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/resources/iframe1.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/resources/iframe1.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/resources/iframe2.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/resources/iframe2.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/resources/iframe2.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/resources/iframe2.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrollIntoView-shadow.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrollIntoView-shadow.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrollIntoView-shadow.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrollIntoView-shadow.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrollIntoView-smooth.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrollIntoView-smooth.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrollIntoView-smooth.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrollIntoView-smooth.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrollWidthHeight.xht b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrollWidthHeight.xht
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrollWidthHeight.xht
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrollWidthHeight.xht
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrollWidthHeightWhenNotScrollable.xht b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrollWidthHeightWhenNotScrollable.xht
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrollWidthHeightWhenNotScrollable.xht
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrollWidthHeightWhenNotScrollable.xht
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrolling-no-browsing-context.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrolling-no-browsing-context.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrolling-no-browsing-context.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrolling-no-browsing-context.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrolling-quirks-vs-nonquirks.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrolling-quirks-vs-nonquirks.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrolling-quirks-vs-nonquirks.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrolling-quirks-vs-nonquirks.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrollingElement-quirks-dynamic-001-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrollingElement-quirks-dynamic-001-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrollingElement-quirks-dynamic-001-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrollingElement-quirks-dynamic-001-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrollingElement-quirks-dynamic-001.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrollingElement-quirks-dynamic-001.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrollingElement-quirks-dynamic-001.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrollingElement-quirks-dynamic-001.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrollingElement-quirks-dynamic-002-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrollingElement-quirks-dynamic-002-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrollingElement-quirks-dynamic-002-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrollingElement-quirks-dynamic-002-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrollingElement-quirks-dynamic-002.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrollingElement-quirks-dynamic-002.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrollingElement-quirks-dynamic-002.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrollingElement-quirks-dynamic-002.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrollingElement.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrollingElement.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrollingElement.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrollingElement.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrollintoview-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrollintoview-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrollintoview-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrollintoview-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrollintoview.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrollintoview.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/scrollintoview.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/scrollintoview.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/1x1-green.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/1x1-green.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/1x1-green.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/1x1-green.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/1x1-lime.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/1x1-lime.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/1x1-lime.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/1x1-lime.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/1x1-maroon.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/1x1-maroon.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/1x1-maroon.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/1x1-maroon.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/1x1-navy.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/1x1-navy.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/1x1-navy.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/1x1-navy.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/1x1-red.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/1x1-red.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/1x1-red.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/1x1-red.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/1x1-white.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/1x1-white.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/1x1-white.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/1x1-white.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/60x60-gg-rr.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/60x60-gg-rr.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/60x60-gg-rr.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/60x60-gg-rr.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/60x60-green.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/60x60-green.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/60x60-green.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/60x60-green.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/60x60-red.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/60x60-red.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/60x60-red.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/60x60-red.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/README b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/README
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/README
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/README
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/a-green.css b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/a-green.css
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/a-green.css
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/a-green.css
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/b-green.css b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/b-green.css
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/b-green.css
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/b-green.css
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/c-red.css b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/c-red.css
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/c-red.css
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/c-red.css
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/cat.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/cat.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/cat.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/cat.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/import-green.css b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/import-green.css
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/import-green.css
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/import-green.css
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/import-red.css b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/import-red.css
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/import-red.css
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/import-red.css
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/pattern-grg-rgr-grg.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/pattern-grg-rgr-grg.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/pattern-grg-rgr-grg.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/pattern-grg-rgr-grg.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/pattern-grg-rrg-rgg.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/pattern-grg-rrg-rgg.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/pattern-grg-rrg-rgg.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/pattern-grg-rrg-rgg.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/pattern-rgr-grg-rgr.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/pattern-rgr-grg-rgr.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/pattern-rgr-grg-rgr.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/pattern-rgr-grg-rgr.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/pattern-tr.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/pattern-tr.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/pattern-tr.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/pattern-tr.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/ruler-h-50%.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/ruler-h-50%.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/ruler-h-50%.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/ruler-h-50%.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/ruler-h-50px.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/ruler-h-50px.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/ruler-h-50px.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/ruler-h-50px.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/ruler-v-100px.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/ruler-v-100px.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/ruler-v-100px.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/ruler-v-100px.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/ruler-v-50px.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/ruler-v-50px.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/ruler-v-50px.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/ruler-v-50px.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/square-purple.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/square-purple.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/square-purple.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/square-purple.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/square-teal.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/square-teal.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/square-teal.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/square-teal.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/square-white.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/square-white.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/square-white.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/square-white.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/support/README b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/support/README
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/support/README
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/support/README
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/support/swatch-green.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/support/swatch-green.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/support/swatch-green.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/support/swatch-green.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/support/swatch-red.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/support/swatch-red.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/support/swatch-red.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/support/swatch-red.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/swatch-blue.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/swatch-blue.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/swatch-blue.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/swatch-blue.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/swatch-green.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/swatch-green.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/swatch-green.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/swatch-green.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/swatch-lime.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/swatch-lime.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/swatch-lime.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/swatch-lime.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/swatch-orange.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/swatch-orange.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/swatch-orange.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/swatch-orange.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/swatch-red.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/swatch-red.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/swatch-red.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/swatch-red.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/swatch-teal.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/swatch-teal.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/swatch-teal.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/swatch-teal.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/swatch-white.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/swatch-white.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/swatch-white.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/swatch-white.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/swatch-yellow.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/swatch-yellow.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/swatch-yellow.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/swatch-yellow.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/test-bl.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/test-bl.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/test-bl.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/test-bl.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/test-br.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/test-br.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/test-br.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/test-br.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/test-inner-half-size.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/test-inner-half-size.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/test-inner-half-size.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/test-inner-half-size.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/test-outer.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/test-outer.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/test-outer.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/test-outer.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/test-tl.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/test-tl.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/test-tl.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/test-tl.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/test-tr.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/test-tr.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/support/test-tr.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/support/test-tr.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/ttwf-js-cssomview-getclientrects-length.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/ttwf-js-cssomview-getclientrects-length.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/ttwf-js-cssomview-getclientrects-length.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/ttwf-js-cssomview-getclientrects-length.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/window-screen-height-immutable.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/window-screen-height-immutable.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/window-screen-height-immutable.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/window-screen-height-immutable.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/window-screen-height.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/window-screen-height.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/window-screen-height.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/window-screen-height.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/window-screen-width-immutable.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/window-screen-width-immutable.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/window-screen-width-immutable.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/window-screen-width-immutable.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom-view/window-screen-width.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/window-screen-width.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom-view/window-screen-width.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom-view/window-screen-width.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/CSS.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/CSS.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/CSS.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/CSS.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/CSSKeyframeRule-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/CSSKeyframeRule-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/CSSKeyframeRule-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/CSSKeyframeRule-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/CSSKeyframeRule.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/CSSKeyframeRule.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/CSSKeyframeRule.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/CSSKeyframeRule.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/CSSKeyframesRule-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/CSSKeyframesRule-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/CSSKeyframesRule-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/CSSKeyframesRule-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/CSSKeyframesRule.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/CSSKeyframesRule.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/CSSKeyframesRule.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/CSSKeyframesRule.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/CSSNamespaceRule.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/CSSNamespaceRule.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/CSSNamespaceRule.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/CSSNamespaceRule.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/CSSRuleList.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/CSSRuleList.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/CSSRuleList.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/CSSRuleList.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/CSSStyleRule.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/CSSStyleRule.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/CSSStyleRule.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/CSSStyleRule.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/CSSStyleSheet.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/CSSStyleSheet.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/CSSStyleSheet.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/CSSStyleSheet.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/GetBoundingRect.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/GetBoundingRect.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/GetBoundingRect.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/GetBoundingRect.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/MediaList.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/MediaList.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/MediaList.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/MediaList.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/MediaList2.xhtml b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/MediaList2.xhtml
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/MediaList2.xhtml
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/MediaList2.xhtml
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/OWNERS b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/OWNERS
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/OWNERS
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/OWNERS
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/StyleSheetList.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/StyleSheetList.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/StyleSheetList.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/StyleSheetList.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/computed-style-001.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/computed-style-001.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/computed-style-001.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/computed-style-001.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/css-style-attribute-modifications.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/css-style-attribute-modifications.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/css-style-attribute-modifications.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/css-style-attribute-modifications.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/css-style-declaration-modifications.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/css-style-declaration-modifications.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/css-style-declaration-modifications.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/css-style-declaration-modifications.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/cssimportrule.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/cssimportrule.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/cssimportrule.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/cssimportrule.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/cssom-cssText-serialize.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/cssom-cssText-serialize.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/cssom-cssText-serialize.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/cssom-cssText-serialize.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/cssom-cssstyledeclaration-set.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/cssom-cssstyledeclaration-set.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/cssom-cssstyledeclaration-set.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/cssom-cssstyledeclaration-set.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/cssom-fontfacerule-constructors.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/cssom-fontfacerule-constructors.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/cssom-fontfacerule-constructors.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/cssom-fontfacerule-constructors.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/cssom-fontfacerule-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/cssom-fontfacerule-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/cssom-fontfacerule-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/cssom-fontfacerule-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/cssom-fontfacerule.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/cssom-fontfacerule.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/cssom-fontfacerule.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/cssom-fontfacerule.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/cssom-ruleTypeAndOrder.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/cssom-ruleTypeAndOrder.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/cssom-ruleTypeAndOrder.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/cssom-ruleTypeAndOrder.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/cssom-setProperty-shorthand.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/cssom-setProperty-shorthand.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/cssom-setProperty-shorthand.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/cssom-setProperty-shorthand.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/cssstyledeclaration-csstext.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/cssstyledeclaration-csstext.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/cssstyledeclaration-csstext.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/cssstyledeclaration-csstext.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/cssstyledeclaration-mutability.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/cssstyledeclaration-mutability.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/cssstyledeclaration-mutability.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/cssstyledeclaration-mutability.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/escape.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/escape.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/escape.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/escape.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/getComputedStyle-pseudo-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/getComputedStyle-pseudo-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/getComputedStyle-pseudo-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/getComputedStyle-pseudo-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/getComputedStyle-pseudo.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/getComputedStyle-pseudo.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/getComputedStyle-pseudo.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/getComputedStyle-pseudo.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/historical.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/historical.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/historical.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/historical.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/index-001.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/index-001.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/index-001.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/index-001.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/index-002-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/index-002-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/index-002-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/index-002-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/index-002.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/index-002.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/index-002.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/index-002.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/inline-style-001-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/inline-style-001-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/inline-style-001-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/inline-style-001-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/inline-style-001.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/inline-style-001.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/inline-style-001.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/inline-style-001.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/insertRule-charset-no-index.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/insertRule-charset-no-index.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/insertRule-charset-no-index.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/insertRule-charset-no-index.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/insertRule-import-no-index.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/insertRule-import-no-index.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/insertRule-import-no-index.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/insertRule-import-no-index.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/insertRule-namespace-no-index.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/insertRule-namespace-no-index.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/insertRule-namespace-no-index.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/insertRule-namespace-no-index.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/insertRule-no-index.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/insertRule-no-index.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/insertRule-no-index.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/insertRule-no-index.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/interfaces-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/interfaces-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/interfaces-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/interfaces-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/interfaces.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/interfaces.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/interfaces.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/interfaces.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/medialist-interfaces-001-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/medialist-interfaces-001-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/medialist-interfaces-001-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/medialist-interfaces-001-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/medialist-interfaces-001.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/medialist-interfaces-001.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/medialist-interfaces-001.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/medialist-interfaces-001.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/medialist-interfaces-002-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/medialist-interfaces-002-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/medialist-interfaces-002-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/medialist-interfaces-002-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/medialist-interfaces-002.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/medialist-interfaces-002.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/medialist-interfaces-002.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/medialist-interfaces-002.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/medialist-interfaces-003.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/medialist-interfaces-003.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/medialist-interfaces-003.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/medialist-interfaces-003.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/medialist-interfaces-004-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/medialist-interfaces-004-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/medialist-interfaces-004-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/medialist-interfaces-004-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/medialist-interfaces-004.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/medialist-interfaces-004.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/medialist-interfaces-004.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/medialist-interfaces-004.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/overflow-serialization.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/overflow-serialization.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/overflow-serialization.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/overflow-serialization.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/selectorSerialize-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/selectorSerialize-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/selectorSerialize-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/selectorSerialize-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/selectorSerialize.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/selectorSerialize.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/selectorSerialize.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/selectorSerialize.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/selectorText-modification-restyle-001-ref.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/selectorText-modification-restyle-001-ref.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/selectorText-modification-restyle-001-ref.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/selectorText-modification-restyle-001-ref.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/selectorText-modification-restyle-001.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/selectorText-modification-restyle-001.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/selectorText-modification-restyle-001.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/selectorText-modification-restyle-001.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/serialization-CSSDeclaration-with-important.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/serialization-CSSDeclaration-with-important.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/serialization-CSSDeclaration-with-important.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/serialization-CSSDeclaration-with-important.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/serialize-namespaced-type-selectors.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/serialize-namespaced-type-selectors.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/serialize-namespaced-type-selectors.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/serialize-namespaced-type-selectors.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/serialize-values-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/serialize-values-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/serialize-values-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/serialize-values-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/serialize-values.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/serialize-values.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/serialize-values.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/serialize-values.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/serialize-variable-reference-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/serialize-variable-reference-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/serialize-variable-reference-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/serialize-variable-reference-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/serialize-variable-reference.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/serialize-variable-reference.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/serialize-variable-reference.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/serialize-variable-reference.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/shorthand-serialization-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/shorthand-serialization-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/shorthand-serialization-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/shorthand-serialization-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/shorthand-serialization.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/shorthand-serialization.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/shorthand-serialization.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/shorthand-serialization.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/style-sheet-interfaces-001-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/style-sheet-interfaces-001-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/style-sheet-interfaces-001-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/style-sheet-interfaces-001-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/style-sheet-interfaces-001.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/style-sheet-interfaces-001.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/style-sheet-interfaces-001.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/style-sheet-interfaces-001.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/style-sheet-interfaces-002.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/style-sheet-interfaces-002.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/style-sheet-interfaces-002.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/style-sheet-interfaces-002.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/stylesheet-same-origin.css b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/stylesheet-same-origin.css
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/stylesheet-same-origin.css
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/stylesheet-same-origin.css
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/stylesheet-same-origin.sub-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/stylesheet-same-origin.sub-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/stylesheet-same-origin.sub-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/stylesheet-same-origin.sub-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/stylesheet-same-origin.sub.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/stylesheet-same-origin.sub.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/stylesheet-same-origin.sub.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/stylesheet-same-origin.sub.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/1x1-green.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/1x1-green.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/1x1-green.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/1x1-green.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/1x1-lime.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/1x1-lime.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/1x1-lime.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/1x1-lime.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/1x1-maroon.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/1x1-maroon.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/1x1-maroon.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/1x1-maroon.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/1x1-navy.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/1x1-navy.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/1x1-navy.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/1x1-navy.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/1x1-red.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/1x1-red.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/1x1-red.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/1x1-red.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/1x1-white.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/1x1-white.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/1x1-white.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/1x1-white.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/60x60-gg-rr.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/60x60-gg-rr.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/60x60-gg-rr.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/60x60-gg-rr.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/60x60-green.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/60x60-green.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/60x60-green.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/60x60-green.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/60x60-red.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/60x60-red.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/60x60-red.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/60x60-red.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/README b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/README
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/README
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/README
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/a-green.css b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/a-green.css
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/a-green.css
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/a-green.css
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/b-green.css b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/b-green.css
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/b-green.css
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/b-green.css
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/c-red.css b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/c-red.css
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/c-red.css
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/c-red.css
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/cat.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/cat.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/cat.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/cat.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/import-charset.css b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/import-charset.css
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/import-charset.css
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/import-charset.css
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/import-green.css b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/import-green.css
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/import-green.css
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/import-green.css
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/import-red.css b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/import-red.css
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/import-red.css
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/import-red.css
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/pattern-grg-rgr-grg.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/pattern-grg-rgr-grg.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/pattern-grg-rgr-grg.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/pattern-grg-rgr-grg.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/pattern-grg-rrg-rgg.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/pattern-grg-rrg-rgg.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/pattern-grg-rrg-rgg.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/pattern-grg-rrg-rgg.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/pattern-rgr-grg-rgr.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/pattern-rgr-grg-rgr.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/pattern-rgr-grg-rgr.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/pattern-rgr-grg-rgr.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/pattern-tr.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/pattern-tr.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/pattern-tr.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/pattern-tr.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/ruler-h-50%.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/ruler-h-50%.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/ruler-h-50%.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/ruler-h-50%.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/ruler-h-50px.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/ruler-h-50px.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/ruler-h-50px.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/ruler-h-50px.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/ruler-v-100px.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/ruler-v-100px.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/ruler-v-100px.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/ruler-v-100px.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/ruler-v-50px.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/ruler-v-50px.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/ruler-v-50px.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/ruler-v-50px.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/square-purple.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/square-purple.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/square-purple.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/square-purple.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/square-teal.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/square-teal.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/square-teal.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/square-teal.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/square-white.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/square-white.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/square-white.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/square-white.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/support/README b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/support/README
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/support/README
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/support/README
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/support/swatch-green.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/support/swatch-green.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/support/swatch-green.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/support/swatch-green.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/support/swatch-red.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/support/swatch-red.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/support/swatch-red.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/support/swatch-red.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/swatch-blue.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/swatch-blue.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/swatch-blue.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/swatch-blue.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/swatch-green.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/swatch-green.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/swatch-green.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/swatch-green.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/swatch-lime.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/swatch-lime.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/swatch-lime.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/swatch-lime.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/swatch-orange.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/swatch-orange.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/swatch-orange.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/swatch-orange.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/swatch-red.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/swatch-red.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/swatch-red.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/swatch-red.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/swatch-teal.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/swatch-teal.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/swatch-teal.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/swatch-teal.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/swatch-white.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/swatch-white.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/swatch-white.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/swatch-white.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/swatch-yellow.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/swatch-yellow.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/swatch-yellow.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/swatch-yellow.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/test-bl.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/test-bl.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/test-bl.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/test-bl.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/test-br.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/test-br.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/test-br.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/test-br.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/test-inner-half-size.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/test-inner-half-size.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/test-inner-half-size.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/test-inner-half-size.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/test-outer.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/test-outer.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/test-outer.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/test-outer.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/test-tl.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/test-tl.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/test-tl.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/test-tl.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/test-tr.png b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/test-tr.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/test-tr.png
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/test-tr.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/support/xmlss-pi.xhtml b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/xmlss-pi.xhtml
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/support/xmlss-pi.xhtml
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/support/xmlss-pi.xhtml
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/ttwf-cssom-doc-ext-load-count-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/ttwf-cssom-doc-ext-load-count-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/ttwf-cssom-doc-ext-load-count-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/ttwf-cssom-doc-ext-load-count-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/ttwf-cssom-doc-ext-load-count.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/ttwf-cssom-doc-ext-load-count.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/ttwf-cssom-doc-ext-load-count.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/ttwf-cssom-doc-ext-load-count.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/ttwf-cssom-doc-ext-load-tree-order.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/ttwf-cssom-doc-ext-load-tree-order.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/ttwf-cssom-doc-ext-load-tree-order.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/ttwf-cssom-doc-ext-load-tree-order.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/ttwf-cssom-document-extension.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/ttwf-cssom-document-extension.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/ttwf-cssom-document-extension.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/ttwf-cssom-document-extension.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/variable-names-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/variable-names-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/variable-names-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/variable-names-expected.txt
diff --git a/third_party/WebKit/LayoutTests/external/wpt/cssom/variable-names.html b/third_party/WebKit/LayoutTests/external/wpt/css/cssom/variable-names.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/cssom/variable-names.html
rename to third_party/WebKit/LayoutTests/external/wpt/css/cssom/variable-names.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/lint.whitelist b/third_party/WebKit/LayoutTests/external/wpt/lint.whitelist
index 04378f0..d3824c9e 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/lint.whitelist
+++ b/third_party/WebKit/LayoutTests/external/wpt/lint.whitelist
@@ -303,7 +303,7 @@
GENERATE_TESTS: css/css-tables/width-distribution/distribution-algo-min-content-specified-guess.1.html
GENERATE_TESTS: css/css-tables/width-distribution/distribution-algo-min-content-specified-guess.html
GENERATE_TESTS: css/work-in-progress/ttwf_sf/divya/index-002.html
-GENERATE_TESTS: cssom/index-002.html
+GENERATE_TESTS: css/cssom/index-002.html
GENERATE_TESTS: dom/nodes/case.js
GENERATE_TESTS: dom/ranges/Range-cloneRange.html
GENERATE_TESTS: dom/ranges/Range-collapse.html
diff --git a/third_party/WebKit/LayoutTests/platform/android/external/wpt/css-typed-om/CSSMatrixComponent-DOMMatrix-mutable-expected.txt b/third_party/WebKit/LayoutTests/platform/android/external/wpt/css/css-typed-om/CSSMatrixComponent-DOMMatrix-mutable-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/android/external/wpt/css-typed-om/CSSMatrixComponent-DOMMatrix-mutable-expected.txt
rename to third_party/WebKit/LayoutTests/platform/android/external/wpt/css/css-typed-om/CSSMatrixComponent-DOMMatrix-mutable-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/android/external/wpt/css-typed-om/declared-styleMap-accepts-inherit-expected.txt b/third_party/WebKit/LayoutTests/platform/android/external/wpt/css/css-typed-om/declared-styleMap-accepts-inherit-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/android/external/wpt/css-typed-om/declared-styleMap-accepts-inherit-expected.txt
rename to third_party/WebKit/LayoutTests/platform/android/external/wpt/css/css-typed-om/declared-styleMap-accepts-inherit-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/android/external/wpt/cssom-view/cssom-view-window-screen-interface-expected.txt b/third_party/WebKit/LayoutTests/platform/android/external/wpt/css/cssom-view/cssom-view-window-screen-interface-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/android/external/wpt/cssom-view/cssom-view-window-screen-interface-expected.txt
rename to third_party/WebKit/LayoutTests/platform/android/external/wpt/css/cssom-view/cssom-view-window-screen-interface-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/android/external/wpt/cssom-view/cssom-view/media-query-list-interface-expected.txt b/third_party/WebKit/LayoutTests/platform/android/external/wpt/css/cssom-view/cssom-view/media-query-list-interface-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/android/external/wpt/cssom-view/cssom-view/media-query-list-interface-expected.txt
rename to third_party/WebKit/LayoutTests/platform/android/external/wpt/css/cssom-view/cssom-view/media-query-list-interface-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/android/external/wpt/cssom-view/ttwf-scrollintoview-expected.txt b/third_party/WebKit/LayoutTests/platform/android/external/wpt/css/cssom-view/ttwf-scrollintoview-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/android/external/wpt/cssom-view/ttwf-scrollintoview-expected.txt
rename to third_party/WebKit/LayoutTests/platform/android/external/wpt/css/cssom-view/ttwf-scrollintoview-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/android/external/wpt/cssom/cssom-cssText-serialize-expected.txt b/third_party/WebKit/LayoutTests/platform/android/external/wpt/css/cssom/cssom-cssText-serialize-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/android/external/wpt/cssom/cssom-cssText-serialize-expected.txt
rename to third_party/WebKit/LayoutTests/platform/android/external/wpt/css/cssom/cssom-cssText-serialize-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/android/external/wpt/cssom/medialist-interfaces-004-expected.txt b/third_party/WebKit/LayoutTests/platform/android/external/wpt/css/cssom/medialist-interfaces-004-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/android/external/wpt/cssom/medialist-interfaces-004-expected.txt
rename to third_party/WebKit/LayoutTests/platform/android/external/wpt/css/cssom/medialist-interfaces-004-expected.txt
diff --git a/third_party/WebKit/LayoutTests/virtual/scalefactor200/external/wpt/css-paint-api/hidpi/README.txt b/third_party/WebKit/LayoutTests/virtual/scalefactor200/external/wpt/css-paint-api/hidpi/README.txt
deleted file mode 100644
index 75f0fdf..0000000
--- a/third_party/WebKit/LayoutTests/virtual/scalefactor200/external/wpt/css-paint-api/hidpi/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# This suite runs the tests in LayoutTests/external/wpt/css-paint-api/hidpi/
-# with the flag --force-device-scale-factor=2.
diff --git a/third_party/WebKit/LayoutTests/virtual/scalefactor200/external/wpt/css/css-paint-api/hidpi/README.txt b/third_party/WebKit/LayoutTests/virtual/scalefactor200/external/wpt/css/css-paint-api/hidpi/README.txt
new file mode 100644
index 0000000..bfd285b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/scalefactor200/external/wpt/css/css-paint-api/hidpi/README.txt
@@ -0,0 +1,2 @@
+# This suite runs the tests in LayoutTests/external/wpt/css/css-paint-api/hidpi/
+# with the flag --force-device-scale-factor=2.