[WPT] Move green-100x100 images Move the images from the css-masking directory to the general /images directory as they will shortly be used by a host of HTML-in-Canvas tests. Bug: 507356242 Change-Id: I5916994dd4796410e03ee7fa61652407439894ac Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7851076 Commit-Queue: Philip Rogers <pdr@chromium.org> Reviewed-by: Philip Rogers <pdr@chromium.org> Auto-Submit: Stephen Chenney <schenney@chromium.org> Cr-Commit-Position: refs/heads/main@{#1631808} NOKEYCHECK=True GitOrigin-RevId: 23b7263ae16fd94391c47d38e14ef00a6062abf3

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/backdrop-filter-mask-image-while-loading.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/backdrop-filter-mask-image-while-loading.html
index c46f99e..9b04683 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/backdrop-filter-mask-image-while-loading.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/backdrop-filter-mask-image-while-loading.html

@@ -13,7 +13,7 @@
 <script>
   onload = () => {
     const p = document.getElementById('target');
-    p.style.maskImage = `url("support/transparent-100x50-blue-100x50.svg?pipe=trickle(d10)")`;
+    p.style.maskImage = `url("/images/transparent-100x50-blue-100x50.svg?pipe=trickle(d10)")`;
     waitForAtLeastOneFrame().then(takeScreenshot);
   };
 </script>

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-clip-1.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-clip-1.html
index 9c14484..c2ae866 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-clip-1.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-clip-1.html

@@ -30,7 +30,7 @@
       div.mask {
         mask-size: 100% 100%;
         mask-origin: border-box;
-        mask-image: url(support/transparent-100x50-blue-100x50.svg);
+        mask-image: url(/images/transparent-100x50-blue-100x50.svg);
       }
 
       div.border {

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-clip-3.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-clip-3.html
index d79baa3..8794b89 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-clip-3.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-clip-3.html

@@ -29,7 +29,7 @@
       div.mask {
         mask-size: 100% 100%;
         mask-origin: border-box;
-        mask-image: url(support/transparent-100x50-blue-100x50.svg);
+        mask-image: url(/images/transparent-100x50-blue-100x50.svg);
       }
 
       div.stroke {

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-clip-8-ref.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-clip-8-ref.html
index d7276bd..a0ff904 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-clip-8-ref.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-clip-8-ref.html

@@ -20,7 +20,7 @@
         width: 40px;
         height: 20px;
         mask-size: 100% 100%;
-        mask-image: url(support/transparent-100x50-blue-100x50.svg);
+        mask-image: url(/images/transparent-100x50-blue-100x50.svg);
       }
 
       div.first {

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-clip-8.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-clip-8.html
index 924920f..ddbedfc 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-clip-8.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-clip-8.html

@@ -24,7 +24,7 @@
         width: 40px;
         height: 20px;
         mask-size: 100% 100%;
-        mask-image: url(support/transparent-100x50-blue-100x50.svg);
+        mask-image: url(/images/transparent-100x50-blue-100x50.svg);
       }
 
       div.first {

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-1-ref.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-1-ref.html
index 9249622..4da4ad7 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-1-ref.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-1-ref.html

@@ -17,12 +17,12 @@
 
       div.add {
         left: 10px;
-        background-image: url(support/blue-100x50-transparent-100x50.svg);
+        background-image: url(/images/blue-100x50-transparent-100x50.svg);
       }
 
       div.intersect {
         left: 230px;
-        background-image: url(support/blue-100x50-transparent-100x50.svg);
+        background-image: url(/images/blue-100x50-transparent-100x50.svg);
       }
     </style>
   </head>

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-1a.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-1a.html
index 795e52b..f9f6477 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-1a.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-1a.html

@@ -17,8 +17,8 @@
         width: 100px;
         height: 100px;
         top:10px;
-        mask-image: url(support/blue-100x50-transparent-100x50.svg),
-                    url(support/blue-100x50-transparent-100x50.svg);
+        mask-image: url(/images/blue-100x50-transparent-100x50.svg),
+                    url(/images/blue-100x50-transparent-100x50.svg);
       }
 
       div.add {

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-1b.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-1b.html
index be158c9..6426da4 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-1b.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-1b.html

@@ -17,8 +17,8 @@
         width: 100px;
         height: 100px;
         top:10px;
-        mask-image: url(support/blue-100x50-transparent-100x50.png),
-                    url(support/blue-100x50-transparent-100x50.png);
+        mask-image: url(/images/blue-100x50-transparent-100x50.png),
+                    url(/images/blue-100x50-transparent-100x50.png);
       }
 
       div.add {

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-1d.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-1d.html
index efd26ec..206642e 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-1d.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-1d.html

@@ -22,33 +22,33 @@
       div.add {
         left: 10px;
         mask-composite: add;
-        mask-image: url(support/blue-100x50-transparent-100x50.svg),
-                    url(support/blue-100x50-transparent-100x50.svg),
-                    url(support/blue-100x50-transparent-100x50.svg);
+        mask-image: url(/images/blue-100x50-transparent-100x50.svg),
+                    url(/images/blue-100x50-transparent-100x50.svg),
+                    url(/images/blue-100x50-transparent-100x50.svg);
       }
 
       div.intersect {
         left: 120px;
         mask-composite: intersect;
-        mask-image: url(support/blue-100x50-transparent-100x50.svg),
-                    url(support/transparent-100x50-blue-100x50.svg),
+        mask-image: url(/images/blue-100x50-transparent-100x50.svg),
+                    url(/images/transparent-100x50-blue-100x50.svg),
                     linear-gradient(rgba(0, 0, 0, 1) 0%, rgba(0, 0, 0, 1) 100%);
       }
 
       div.subtract {
         left: 230px;
         mask-composite: subtract;
-        mask-image: url(support/blue-100x50-transparent-100x50.svg),
-                    url(support/blue-100x50-transparent-100x50.svg),
-                    url(support/blue-100x50-transparent-100x50.svg);
+        mask-image: url(/images/blue-100x50-transparent-100x50.svg),
+                    url(/images/blue-100x50-transparent-100x50.svg),
+                    url(/images/blue-100x50-transparent-100x50.svg);
       }
 
       div.exclude {
         left: 340px;
         mask-composite: exclude;
-        mask-image: url(support/transparent-100x50-blue-100x50.svg),
+        mask-image: url(/images/transparent-100x50-blue-100x50.svg),
                     linear-gradient(rgba(0, 0, 0, 1) 0%, rgba(0, 0, 0, 1) 100%),
-                    url(support/blue-100x50-transparent-100x50.svg);
+                    url(/images/blue-100x50-transparent-100x50.svg);
       }
     </style>
   </head>

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-2-ref.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-2-ref.html
index cbf91da..5c7537d 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-2-ref.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-2-ref.html

@@ -22,7 +22,7 @@
 
       div.subtract {
         left: 120px;
-        background-image: url(support/blue-100x50-transparent-100x50.svg);
+        background-image: url(/images/blue-100x50-transparent-100x50.svg);
       }
 
       div.exclude {

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-2a.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-2a.html
index 7db8008..a3587e4 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-2a.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-2a.html

@@ -17,8 +17,8 @@
         width: 100px;
         height: 100px;
         top:10px;
-        mask-image: url(support/blue-100x50-transparent-100x50.svg),
-                    url(support/transparent-100x50-blue-100x50.svg);
+        mask-image: url(/images/blue-100x50-transparent-100x50.svg),
+                    url(/images/transparent-100x50-blue-100x50.svg);
       }
 
       div.add {

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-2b.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-2b.html
index 3fd983f..12fc5d9 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-2b.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-2b.html

@@ -17,8 +17,8 @@
         width: 100px;
         height: 100px;
         top:10px;
-        mask-image: url(support/blue-100x50-transparent-100x50.png),
-                    url(support/transparent-100x50-blue-100x50.png);
+        mask-image: url(/images/blue-100x50-transparent-100x50.png),
+                    url(/images/transparent-100x50-blue-100x50.png);
       }
 
       div.add {

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-2d.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-2d.html
index feb70df..66c73e5 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-2d.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-composite-2d.html

@@ -15,8 +15,8 @@
     width: 100px;
     height: 100px;
     y: 10px;
-    mask-image: url(support/blue-100x50-transparent-100x50.svg),
-                url(support/transparent-100x50-blue-100x50.svg);
+    mask-image: url(/images/blue-100x50-transparent-100x50.svg),
+                url(/images/transparent-100x50-blue-100x50.svg);
   }
 
   rect.add {

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-image-1a.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-image-1a.html
index 62e0066..aa38bc4 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-image-1a.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-image-1a.html

@@ -16,7 +16,7 @@
       }
 
       div.mask-by-png {
-        mask-image: url(support/transparent-100x50-blue-100x50.png);
+        mask-image: url(/images/transparent-100x50-blue-100x50.png);
       }
     </style>
   </head>

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-image-1b.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-image-1b.html
index 9bf7410..7be5358 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-image-1b.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-image-1b.html

@@ -16,7 +16,7 @@
       }
 
       div.mask-by-svg {
-        mask-image: url(support/transparent-100x50-blue-100x50.svg);
+        mask-image: url(/images/transparent-100x50-blue-100x50.svg);
       }
     </style>
   </head>

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-image-6-ref.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-image-6-ref.html
index d85e075..443fdcb 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-image-6-ref.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-image-6-ref.html

@@ -14,7 +14,7 @@
       }
 
       div.mask-by-png {
-        mask-image: url(support/transparent-100x50-blue-100x50.png);
+        mask-image: url(/images/transparent-100x50-blue-100x50.png);
       }
     </style>
   </head>

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-image-6.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-image-6.html
index 3132efb..77ba5e5 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-image-6.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-image-6.html

@@ -17,7 +17,7 @@
       span {
         font-size: 100px;
         line-height: 100px;
-        mask-image: url(support/transparent-100x50-blue-100x50.png);
+        mask-image: url(/images/transparent-100x50-blue-100x50.png);
         mask-position: center;
         mask-repeat: repeat;
       }

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-image-svg-loading-error.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-image-svg-loading-error.html
index 342a961..baacc47 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-image-svg-loading-error.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-image-svg-loading-error.html

@@ -5,7 +5,7 @@
 <link rel="match" href="reference/mask-image-ref.html">
 <style>
   svg > rect {
-    mask-image: image-set(url("support/green-100x100.png?pipe=slice(1,200)"));
+    mask-image: image-set(url("/images/green-100x100.png?pipe=slice(1,200)"));
   }
 </style>
 <p>The test passes if there is a green square and no red below.</p>

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-mode-a.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-mode-a.html
index d69ca24..54139b0 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-mode-a.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-mode-a.html

@@ -23,31 +23,31 @@
       div.auto {
         left: 10px;
         mask-mode: match-source;
-        mask-image: url(support/blue-100x100.svg);
+        mask-image: url(/images/blue-100x100.svg);
       }
 
       div.alpha {
         left: 120px;
         mask-mode: alpha;
-        mask-image: url(support/blue-100x100.svg);
+        mask-image: url(/images/blue-100x100.svg);
       }
 
       div.luminance1 {
         left: 230px;
         mask-mode: luminance;
-        mask-image: url(support/blue-100x100.svg);
+        mask-image: url(/images/blue-100x100.svg);
       }
 
       div.luminance2 {
         left: 340px;
         mask-mode: luminance;
-        mask-image: url(support/red-100x100.svg);
+        mask-image: url(/images/red-100x100.svg);
       }
 
       div.luminance3 {
         left: 450px;
         mask-mode: luminance;
-        mask-image: url(support/green-100x100.svg);
+        mask-image: url(/images/green-100x100.svg);
       }
     </style>
   </head>

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-mode-b.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-mode-b.html
index 961411d..5860129 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-mode-b.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-mode-b.html

@@ -23,31 +23,31 @@
       div.auto {
         left: 10px;
         mask-mode: match-source;
-        mask-image: url(support/blue-100x100.png);
+        mask-image: url(/images/blue-100x100.png);
       }
 
       div.alpha {
         left: 120px;
         mask-mode: alpha;
-        mask-image: url(support/blue-100x100.png);
+        mask-image: url(/images/blue-100x100.png);
       }
 
       div.luminance1 {
         left: 230px;
         mask-mode: luminance;
-        mask-image: url(support/blue-100x100.png);
+        mask-image: url(/images/blue-100x100.png);
       }
 
       div.luminance2 {
         left: 340px;
         mask-mode: luminance;
-        mask-image: url(support/red-100x100.png);
+        mask-image: url(/images/red-100x100.png);
       }
 
       div.luminance3 {
         left: 450px;
         mask-mode: luminance;
-        mask-image: url(support/green-100x100.png);
+        mask-image: url(/images/green-100x100.png);
       }
     </style>
   </head>

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-mode-luminance-with-mask-size.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-mode-luminance-with-mask-size.html
index 8979857..47e7d00 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-mode-luminance-with-mask-size.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-mode-luminance-with-mask-size.html

@@ -21,7 +21,7 @@
 
         mask-mode: luminance;
         mask-size: 100px 50px;
-        mask-image: url(support/transparent-100x50-blue-100x50.png);
+        mask-image: url(/images/transparent-100x50-blue-100x50.png);
       }
 
     </style>

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-mode-ref.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-mode-ref.html
index 0f7dbd5..a6a2604 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-mode-ref.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-mode-ref.html

@@ -18,12 +18,12 @@
 
       div.auto {
         left: 10px;
-        background-image: url(support/blue-100x100.svg);
+        background-image: url(/images/blue-100x100.svg);
       }
 
       div.alpha {
         left: 120px;
-        background-image: url(support/blue-100x100.svg);
+        background-image: url(/images/blue-100x100.svg);
       }
 
       div.luminance1 {

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-opacity-1a.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-opacity-1a.html
index 9182371..924d272 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-opacity-1a.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-opacity-1a.html

@@ -18,7 +18,7 @@
         width: 100px;
         height: 100px;
         filter: invert(100%);
-        mask-image: url(support/blue-100x50-transparent-100x50.png);
+        mask-image: url(/images/blue-100x50-transparent-100x50.png);
         opacity: 0.5;
       }
     </style>

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-opacity-1b.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-opacity-1b.html
index 681ec36..cae6feb 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-opacity-1b.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-opacity-1b.html

@@ -22,7 +22,7 @@
         background-color: rgb(0,0,255);
         width: 100px;
         height: 100px;
-        mask-image: url(support/blue-100x50-transparent-100x50.png);
+        mask-image: url(/images/blue-100x50-transparent-100x50.png);
         opacity: 0.5;
       }
     </style>

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-opacity-1e.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-opacity-1e.html
index ad7aa88..7f0e471 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-opacity-1e.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-opacity-1e.html

@@ -15,8 +15,8 @@
         top: 10px;
         width: 100px;
         height: 100px;
-        mask-image: url(support/blue-100x50-transparent-100x50.png),
-                    url(support/blue-100x50-transparent-100x50.png);
+        mask-image: url(/images/blue-100x50-transparent-100x50.png),
+                    url(/images/blue-100x50-transparent-100x50.png);
         opacity: 0.5;
       }
 

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-size-percent-percent-stretch.html b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-size-percent-percent-stretch.html
index 69f89b8..cc93a07 100644
--- a/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-size-percent-percent-stretch.html
+++ b/blink/web_tests/external/wpt/css/css-masking/mask-image/mask-size-percent-percent-stretch.html

@@ -20,7 +20,7 @@
 
       #inner {
         background-color: purple;
-        mask-image: url(support/transparent-100x50-blue-100x50.svg);
+        mask-image: url(/images/transparent-100x50-blue-100x50.svg);
         mask-repeat: no-repeat;
         mask-position: left top;
         mask-size: 100% 100%;

diff --git a/blink/web_tests/external/wpt/css/css-shapes/shape-outside/shape-image/reference/shape-image-000-ref.html b/blink/web_tests/external/wpt/css/css-shapes/shape-outside/shape-image/reference/shape-image-000-ref.html
index a5752dc..7e6fb57 100644
--- a/blink/web_tests/external/wpt/css/css-shapes/shape-outside/shape-image/reference/shape-image-000-ref.html
+++ b/blink/web_tests/external/wpt/css/css-shapes/shape-outside/shape-image/reference/shape-image-000-ref.html

@@ -25,7 +25,7 @@
         The test passes if you see a solid green square. There should be no red.
     </p>
     <div class="container">
-        <img src="../support/left-half-rectangle-50.png"/>
+        <img src="/images/left-half-rectangle-50.png"/>
         <div class="green"></div>
     </div>
 </body>

diff --git a/blink/web_tests/external/wpt/css/css-shapes/shape-outside/shape-image/shape-image-004.html b/blink/web_tests/external/wpt/css/css-shapes/shape-outside/shape-image/shape-image-004.html
index 117f3a8..5871d82 100644
--- a/blink/web_tests/external/wpt/css/css-shapes/shape-outside/shape-image/shape-image-004.html
+++ b/blink/web_tests/external/wpt/css/css-shapes/shape-outside/shape-image/shape-image-004.html

@@ -23,7 +23,7 @@
         }
         #image {
             float: left;
-            shape-outside: url("support/left-half-rectangle-50.png");
+            shape-outside: url("/images/left-half-rectangle-50.png");
             shape-image-threshold: 0.6;
         }
     </style>
@@ -33,7 +33,7 @@
         The test passes if you see a solid green square. There should be no red.
     </p>
     <div id="test" class="container">
-        <img id="image" src="support/left-half-rectangle-50.png"/>
+        <img id="image" src="/images/left-half-rectangle-50.png"/>
         X
         X
     </div>

diff --git a/blink/web_tests/external/wpt/css/css-shapes/shape-outside/shape-image/shape-image-011.html b/blink/web_tests/external/wpt/css/css-shapes/shape-outside/shape-image/shape-image-011.html
index a1286f0..3c8a38e 100644
--- a/blink/web_tests/external/wpt/css/css-shapes/shape-outside/shape-image/shape-image-011.html
+++ b/blink/web_tests/external/wpt/css/css-shapes/shape-outside/shape-image/shape-image-011.html

@@ -39,7 +39,7 @@
             float: left;
             width: 100px;
             height: 100px;
-            shape-outside: url("support/left-half-rectangle-50.svg");
+            shape-outside: url("/images/left-half-rectangle-50.svg");
             shape-margin: 10px;
             shape-image-threshold: 0.55;
         }
@@ -66,7 +66,7 @@
         The test passes if the green rectangle on the right is completely between the two blue lines.
         There should be no red.
     </p>
-    <img id="image" src="support/left-half-rectangle-50.svg"/>
+    <img id="image" src="/images/left-half-rectangle-50.svg"/>
     <div id="white"></div>
     <div id="test">
         <div id="shape-image"></div>

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/support/blue-100x100.png b/blink/web_tests/external/wpt/images/blue-100x100.png
similarity index 100%
rename from blink/web_tests/external/wpt/css/css-masking/mask-image/support/blue-100x100.png
rename to blink/web_tests/external/wpt/images/blue-100x100.png
Binary files differ

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/support/blue-100x100.svg b/blink/web_tests/external/wpt/images/blue-100x100.svg
similarity index 100%
rename from blink/web_tests/external/wpt/css/css-masking/mask-image/support/blue-100x100.svg
rename to blink/web_tests/external/wpt/images/blue-100x100.svg


diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/support/blue-100x50-transparent-100x50.png b/blink/web_tests/external/wpt/images/blue-100x50-transparent-100x50.png
similarity index 100%
rename from blink/web_tests/external/wpt/css/css-masking/mask-image/support/blue-100x50-transparent-100x50.png
rename to blink/web_tests/external/wpt/images/blue-100x50-transparent-100x50.png
Binary files differ

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/support/blue-100x50-transparent-100x50.svg b/blink/web_tests/external/wpt/images/blue-100x50-transparent-100x50.svg
similarity index 100%
rename from blink/web_tests/external/wpt/css/css-masking/mask-image/support/blue-100x50-transparent-100x50.svg
rename to blink/web_tests/external/wpt/images/blue-100x50-transparent-100x50.svg


diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/support/green-100x100.png b/blink/web_tests/external/wpt/images/green-100x100.png
similarity index 100%
rename from blink/web_tests/external/wpt/css/css-masking/mask-image/support/green-100x100.png
rename to blink/web_tests/external/wpt/images/green-100x100.png
Binary files differ

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/support/green-100x100.svg b/blink/web_tests/external/wpt/images/green-100x100.svg
similarity index 100%
rename from blink/web_tests/external/wpt/css/css-masking/mask-image/support/green-100x100.svg
rename to blink/web_tests/external/wpt/images/green-100x100.svg


diff --git a/blink/web_tests/external/wpt/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-50.png b/blink/web_tests/external/wpt/images/left-half-rectangle-50.png
similarity index 100%
rename from blink/web_tests/external/wpt/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-50.png
rename to blink/web_tests/external/wpt/images/left-half-rectangle-50.png
Binary files differ

diff --git a/blink/web_tests/external/wpt/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-50.svg b/blink/web_tests/external/wpt/images/left-half-rectangle-50.svg
similarity index 100%
rename from blink/web_tests/external/wpt/css/css-shapes/shape-outside/shape-image/support/left-half-rectangle-50.svg
rename to blink/web_tests/external/wpt/images/left-half-rectangle-50.svg


diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/support/red-100x100.png b/blink/web_tests/external/wpt/images/red-100x100.png
similarity index 100%
rename from blink/web_tests/external/wpt/css/css-masking/mask-image/support/red-100x100.png
rename to blink/web_tests/external/wpt/images/red-100x100.png
Binary files differ

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/support/red-100x100.svg b/blink/web_tests/external/wpt/images/red-100x100.svg
similarity index 100%
rename from blink/web_tests/external/wpt/css/css-masking/mask-image/support/red-100x100.svg
rename to blink/web_tests/external/wpt/images/red-100x100.svg


diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/support/transparent-100x50-blue-100x50.png b/blink/web_tests/external/wpt/images/transparent-100x50-blue-100x50.png
similarity index 100%
rename from blink/web_tests/external/wpt/css/css-masking/mask-image/support/transparent-100x50-blue-100x50.png
rename to blink/web_tests/external/wpt/images/transparent-100x50-blue-100x50.png
Binary files differ

diff --git a/blink/web_tests/external/wpt/css/css-masking/mask-image/support/transparent-100x50-blue-100x50.svg b/blink/web_tests/external/wpt/images/transparent-100x50-blue-100x50.svg
similarity index 100%
rename from blink/web_tests/external/wpt/css/css-masking/mask-image/support/transparent-100x50-blue-100x50.svg
rename to blink/web_tests/external/wpt/images/transparent-100x50-blue-100x50.svg