Auto merge of #26831 - servo-wpt-sync:wpt_update_09-06-2020, r=jdm

Sync WPT with upstream (09-06-2020)

Automated downstream sync of changes from upstream as of 09-06-2020.
[no-wpt-sync]
r? @servo-wpt-sync

1 files changed, 22 insertions, 0 deletions

diff --git a/tests/wpt/web-platform-tests/scroll-animations/testcommon.js b/tests/wpt/web-platform-tests/scroll-animations/testcommon.js
index 96bafdb396b..d9fc153887c 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/testcommon.js
+++ b/tests/wpt/web-platform-tests/scroll-animations/testcommon.js
@@ -7,6 +7,19 @@ function createScroller(test) {
   return scroller;
 }
 
+function createScrollerWithStartAndEnd(test, orientationClass = 'vertical') {
+  var scroller = createDiv(test);
+  scroller.innerHTML =
+    `<div class='contents'>
+        <div id='start'></div>
+        <div id='end'></div>
+      </div>`;
+  scroller.classList.add('scroller');
+  scroller.classList.add(orientationClass);
+
+  return scroller;
+}
+
 function createScrollTimeline(test, options) {
   options = options || {
     scrollSource: createScroller(test),
@@ -33,3 +46,12 @@ function createScrollLinkedAnimation(test, timeline) {
   return new Animation(
     new KeyframeEffect(createDiv(test), KEYFRAMES, DURATION), timeline);
 }
+
+function assert_approx_equals_or_null(actual, expected, tolerance, name){
+  if (actual === null || expected === null){
+    assert_equals(actual, expected, name);
+  }
+  else {
+    assert_approx_equals(actual, expected, tolerance, name);
+  }
+}