Merge pull request #337 from brave/autoplay-fix

Actually wait for playing to fix autoplay intermittent fails
brave · Aug 18, 2018 · 4d79b46 · 4d79b46
2 parents 71a21bf + 2654feb
commit 4d79b46
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/test/data/autoplay/autoplay_by_attr.html b/test/data/autoplay/autoplay_by_attr.html
@@ -6,22 +6,22 @@
   </head>
   <body>
 
-    <video width="320" height="240" controls autoplay onplay="playing()">
+    <video width="320" height="240" controls autoplay onplay="onPlay()">
       <source src="autoplay.mp4" type="video/mp4">
     </video>
 
     <div id='status'>Video not playing</div>
 
     <script>
-      function playing () {
+      function onPlay () {
         let status = document.getElementById('status')
         status.textContent = 'Video playing'
         window.playing = true;
         if (window.notifyBrowser)
           notifyWhenPlaying();
       }
       function notifyWhenPlaying() {
-        if (playing)
+        if (window.playing)
           window.domAutomationController.send("PLAYING");
         else
           window.notifyBrowser = true;

diff --git a/test/data/autoplay/autoplay_by_attr_muted.html b/test/data/autoplay/autoplay_by_attr_muted.html
@@ -6,22 +6,22 @@
   </head>
   <body>
 
-    <video width="320" height="240" controls autoplay onplay="playing()" muted>
+    <video width="320" height="240" controls autoplay onplay="onPlay()" muted>
       <source src="autoplay.mp4" type="video/mp4">
     </video>
 
     <div id='status'>Video not playing</div>
 
     <script>
-      function playing () {
+      function onPlay () {
         let status = document.getElementById('status')
         status.textContent = 'Video playing'
         window.playing = true;
         if (window.notifyBrowser)
           notifyWhenPlaying();
       }
       function notifyWhenPlaying() {
-        if (playing)
+        if (this.playing)
           window.domAutomationController.send("PLAYING");
         else
           window.notifyBrowser = true;

diff --git a/test/data/autoplay/autoplay_by_method.html b/test/data/autoplay/autoplay_by_method.html
@@ -6,22 +6,22 @@
   </head>
   <body onload="autoplay()">
 
-    <video id="autoplay" width="320" height="240" controls onplay="playing()">
+    <video id="autoplay" width="320" height="240" controls onplay="onPlay()">
       <source src="autoplay.mp4" type="video/mp4">
     </video>
 
     <div id='status'>Video not playing</div>
 
     <script>
-      function playing () {
+      function onPlay () {
         let status = document.getElementById('status')
         status.textContent = 'Video playing'
         window.playing = true;
         if (window.notifyBrowser)
           notifyWhenPlaying();
       }
       function notifyWhenPlaying() {
-        if (playing)
+        if (window.playing)
           window.domAutomationController.send("PLAYING");
         else
           window.notifyBrowser = true;

diff --git a/test/data/autoplay/autoplay_by_method_muted.html b/test/data/autoplay/autoplay_by_method_muted.html
@@ -6,22 +6,22 @@
   </head>
   <body onload="autoplay()">
 
-    <video id="autoplay" width="320" height="240" controls onplay="playing()" muted>
+    <video id="autoplay" width="320" height="240" controls onplay="onPlay()" muted>
       <source src="autoplay.mp4" type="video/mp4">
     </video>
 
     <div id='status'>Video not playing</div>
 
     <script>
-      function playing () {
+      function onPlay () {
         let status = document.getElementById('status')
         status.textContent = 'Video playing'
         window.playing = true;
         if (window.notifyBrowser)
           notifyWhenPlaying();
       }
       function notifyWhenPlaying() {
-        if (playing)
+        if (window.playing)
           window.domAutomationController.send("PLAYING");
         else
           window.notifyBrowser = true;