Update web-platform-tests to revision b'2d7c53f5bc604132d2c83955537e454ee9c788c0'

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-content-rendering.html

@@ -5,11 +5,13 @@
 <link rel="author" title="Traian Captan" href="mailto:tcaptan@chromium.org">
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
 <link rel="help" href="https://drafts.csswg.org/css-content/#content-property">
-<link rel="match"  href="reference/image-set-content-rendering-ref.html">
+<link rel="match"  href="reference/image-set-rendering-ref.html">
 <meta name="assert" content="image-set content rendering">
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     content: image-set(url("/images/green.png") 1x);
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-dpi-rendering-2.html

@@ -5,12 +5,14 @@
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
 <link rel="match" href="reference/image-set-rendering-ref.html">
 <meta name="assert" content="image-set dpi rendering">
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     background-image: image-set(
       url("/images/green.png") 96dpi,
       url("/images/red.png") 100dpi
     );
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-dpi-rendering.html

@@ -5,9 +5,11 @@
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
 <link rel="match" href="reference/image-set-rendering-ref.html">
 <meta name="assert" content="image-set dpi rendering">
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     background-image: image-set(url("/images/green.png") 96dpi);
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-dppx-rendering.html

@@ -5,9 +5,11 @@
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
 <link rel="match" href="reference/image-set-rendering-ref.html">
 <meta name="assert" content="image-set dppx rendering">
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     background-image: image-set(url("/images/green.png") 1dppx);
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-empty-url-rendering.html

@@ -5,12 +5,14 @@
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
 <link rel="match" href="reference/image-set-rendering-ref.html">
 <meta name="assert" content="image-set rendering when 2x url is empty">
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     background-image: image-set(
       url("/images/green.png") 1x,
       url("") 2x
     );
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-first-match-rendering.html

@@ -5,12 +5,14 @@
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
 <link rel="match" href="reference/image-set-rendering-ref.html">
 <meta name="assert" content="image-set rendering picks first valid match">
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     background-image: image-set(
       url("/images/green.png") 1x,
       url("/images/red.png") 1x
     );
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-invalid-resolution-rendering-2.html

@@ -5,7 +5,6 @@
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
 <link rel="match" href="reference/image-set-rendering-ref.html">
 <meta name="assert" content="image-set rendering when resolution is invalid">
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     background-image: url("/images/green.png");
@@ -13,5 +12,8 @@
       url("/images/red.png") 0x,
       url("/images/red.png") 2x
     );
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-invalid-resolution-rendering.html

@@ -5,10 +5,12 @@
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
 <link rel="match" href="reference/image-set-rendering-ref.html">
 <meta name="assert" content="image-set rendering when resolution is invalid">
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     background-image: url("/images/green.png");
     background-image: image-set(url("/images/red.png") 0x);
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-linear-gradient-rendering.html

@@ -5,9 +5,11 @@
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
 <link rel="match" href="reference/image-set-linear-gradient-rendering-ref.html">
 <meta name="assert" content="image-set linear-gradient rendering">
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     background-image: image-set(linear-gradient(green, lightgreen) 1x);
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-no-res-rendering-2.html

@@ -5,9 +5,11 @@
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
 <link rel="match" href="reference/image-set-rendering-ref.html">
 <meta name="assert" content="image-set rendering with no resolution defined">
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     background-image: image-set(url("/images/green.png"), url("/images/green.png"));
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-no-res-rendering.html

@@ -5,9 +5,11 @@
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
 <link rel="match" href="reference/image-set-rendering-ref.html">
 <meta name="assert" content="image-set rendering with no resolution defined">
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     background-image: image-set(url("/images/green.png"));
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-no-url-rendering.html

@@ -5,9 +5,11 @@
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
 <link rel="match" href="reference/image-set-rendering-ref.html">
 <meta name="assert" content="image-set without url functional notation rendering">
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     background-image: image-set("/images/green.png" 1x);
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-radial-gradient-rendering.html

@@ -5,9 +5,11 @@
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
 <link rel="match" href="reference/image-set-radial-gradient-rendering-ref.html">
 <meta name="assert" content="image-set radial-gradient rendering">
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     background-image: image-set(radial-gradient(green, lightgreen) 1x);
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-rendering-2.html

@@ -5,12 +5,14 @@
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
 <link rel="match" href="reference/image-set-rendering-ref.html">
 <meta name="assert" content="image-set rendering">
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     background-image: image-set(
       url("/images/green.png") 1x,
       url("/images/red.png") 2x
     );
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-rendering.html

@@ -5,9 +5,11 @@
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
 <link rel="match" href="reference/image-set-rendering-ref.html">
 <meta name="assert" content="image-set rendering">
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     background-image: image-set(url("/images/green.png") 1x);
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-type-first-match-rendering.html

@@ -5,12 +5,14 @@
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
 <link rel="match" href="reference/image-set-rendering-ref.html">
 <meta name="assert" content="image-set rendering with type picks first valid match">
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     background-image: image-set(
       url("/images/green.png") 1x type('image/png'),
       url("/images/red.png") 1x type('image/png')
     );
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-type-rendering-2.html

@@ -5,12 +5,14 @@
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
 <link rel="match" href="reference/image-set-rendering-ref.html">
 <meta name="assert" content="image-set rendering for images with same type but different resolutions">
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     background-image: image-set(
       url("/images/green.png") type('image/png') 1x,
       url("/images/red.png") type('image/png') 2x
     );
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-type-rendering-3.html

@@ -5,9 +5,11 @@
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
 <link rel="match" href="reference/image-set-rendering-ref.html">
 <meta name="assert" content="image-set rendering with type before resolution">
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     background-image: image-set(url("/images/green.png") type('image/png') 1x);
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-type-rendering.html

@@ -5,9 +5,11 @@
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
 <link rel="match" href="reference/image-set-rendering-ref.html">
 <meta name="assert" content="image-set rendering with type">
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     background-image: image-set(url("/images/green.png") 1x type('image/png'));
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-type-skip-unsupported-rendering.html

@@ -5,12 +5,14 @@
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
 <link rel="match" href="reference/image-set-rendering-ref.html">
 <meta name="assert" content="image-set rendering with type skips unsupported type">
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     background-image: image-set(
       url("/images/red.png") 1x type('image/unsupported'),
       url("/images/green.png") 1x type('image/png')
     );
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-type-unsupported-rendering-2.html

@@ -15,7 +15,6 @@ Spec definition:
 If all the values in the image set are of an unsupported type,
 the set should be empty.
 -->
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     background-image: url("/images/green.png");
@@ -23,5 +22,8 @@ the set should be empty.
       url("/images/red.png") 1x type('image/unsupported'),
       url("/images/red.png") 1x type('image/unsupported')
     );
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-type-unsupported-rendering.html

@@ -15,10 +15,12 @@ Spec definition:
 If all the values in the image set are of an unsupported type,
 the set should be empty.
 -->
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     background-image: url("/images/green.png");
     background-image: image-set(url("/images/red.png") 1x type('image/unsupported'));
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/image-set-unordered-res-rendering.html

@@ -5,12 +5,14 @@
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
 <link rel="match" href="reference/image-set-rendering-ref.html">
 <meta name="assert" content="image-set rendering when resolutions are unordered">
-<script src="resources/image-set-rendering-helper.js"></script>
 <style>
   #test {
     background-image: image-set(
       url("/images/red.png") 2x,
       url("/images/green.png") 1x
     );
+    width: 100px;
+    height: 100px;
   }
 </style>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/reference/image-set-content-rendering-ref.html

@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<title>Image set is supported in the content property</title>
-<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
-<link rel="author" title="Noam Rosenthal" href="mailto:noam@webkit.org">
-<link rel="author" title="Traian Captan" href="mailto:tcaptan@chromium.org">
-<style>
-  #test {
-    content: url("/images/green.png");
-  }
-</style>
-<script src="../resources/image-set-rendering-helper.js"></script>

tests/wpt/web-platform-tests/css/css-images/image-set/reference/image-set-linear-gradient-rendering-ref.html

@@ -4,7 +4,9 @@
 <link rel="author" title="Traian Captan" href="mailto:tcaptan@chromium.org">
 <style>
   #test {
-    background-image: linear-gradient(green, lightgreen);
+    width: 100px;
+    height: 100px;
+    background: linear-gradient(green, lightgreen);
   }
 </style>
-<script src="../resources/image-set-rendering-helper.js"></script>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/reference/image-set-radial-gradient-rendering-ref.html

@@ -4,7 +4,9 @@
 <link rel="author" title="Traian Captan" href="mailto:tcaptan@chromium.org">
 <style>
   #test {
-    background-image: radial-gradient(green, lightgreen);
+    width: 100px;
+    height: 100px;
+    background: radial-gradient(green, lightgreen);
   }
 </style>
-<script src="../resources/image-set-rendering-helper.js"></script>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/reference/image-set-rendering-ref.html

@@ -4,7 +4,9 @@
 <link rel="author" title="Traian Captan" href="mailto:tcaptan@chromium.org">
 <style>
   #test {
-    background-image: url("/images/green.png");
+    width: 100px;
+    height: 100px;
+    background-color: lime;
   }
 </style>
-<script src="../resources/image-set-rendering-helper.js"></script>
+<div id="test"></div>

tests/wpt/web-platform-tests/css/css-images/image-set/resources/image-set-rendering-helper.js

@@ -1,27 +0,0 @@
-function setupTest() {
-  createPassingNotice();
-  createTestDiv();
-}
-
-function createPassingNotice() {
-  const notice = document.createElement('p');
-
-  notice.textContent =
-      'Test passes if the image below is green when devicePixelRatio is 1, not red.';
-
-  document.body.appendChild(notice);
-}
-
-function createTestDiv() {
-  const testDiv = document.createElement('div');
-
-  testDiv.id = 'test';
-
-  testDiv.style.width = '100px';
-  testDiv.style.height = '100px';
-  testDiv.style.backgroundColor = 'red';
-
-  document.body.appendChild(testDiv);
-}
-
-document.addEventListener("DOMContentLoaded", setupTest);