Changeset 213316 in webkit

Timestamp:

Mar 2, 2017 3:50:59 PM (7 years ago)

Author:

mrajca@apple.com

Message:

Media: send "did interfere with playback" events when the user pauses an autoplaying element
​https://bugs.webkit.org/show_bug.cgi?id=169006

Reviewed by Alex Christensen.

Source/WebCore:

Added API tests.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::pauseInternal):

Tools:

• TestWebKitAPI/Tests/WebKit2/js-play-with-controls.html:
• TestWebKitAPI/Tests/WebKit2Cocoa/WebsitePolicies.mm:

(TEST): Added.

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit2/js-play-with-controls.html (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsitePolicies.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-28  Matt Rajca  <mrajca@apple.com>
+
+        Media: send "did interfere with playback" events when the user pauses an autoplaying element
+        https://bugs.webkit.org/show_bug.cgi?id=169006
+
+        Reviewed by Alex Christensen.
+
+        Added API tests.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::pauseInternal):
+
 2017-03-02  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -3257 +3257 @@
 
     m_autoplaying = false;
+
+    if (ScriptController::processingUserGestureForMedia() && m_playbackWithoutUserGesture == PlaybackWithoutUserGesture::Started) {
+        if (Page* page = document().page())
+            page->chrome().client().handleAutoplayEvent(AutoplayEvent::UserDidInterfereWithPlayback);
+    }
+
     m_playbackWithoutUserGesture = PlaybackWithoutUserGesture::None;
 

trunk/Tools/ChangeLog

@@ +1 @@
+2017-02-28  Matt Rajca  <mrajca@apple.com>
+
+        Media: send "did interfere with playback" events when the user pauses an autoplaying element
+        https://bugs.webkit.org/show_bug.cgi?id=169006
+
+        Reviewed by Alex Christensen.
+
+        * TestWebKitAPI/Tests/WebKit2/js-play-with-controls.html:
+        * TestWebKitAPI/Tests/WebKit2Cocoa/WebsitePolicies.mm:
+        (TEST): Added.
+
 2017-03-02  Srinivasan Vijayaraghavan  <svijayaraghavan@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit2/js-play-with-controls.html

@@ -10 +10 @@
 
             function play() {
-                document.getElementById("video").play();
+                var video = document.getElementById("video");
+                if (video.paused)
+                    video.play();
+                else
+                    video.pause();
             }
 

trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsitePolicies.mm

@@ -391 +391 @@
     [webView mouseUpAtPoint:muteButtonClickPoint];
     runUntilReceivesAutoplayEvent(kWKAutoplayEventUserDidInterfereWithPlayback);
+
+    receivedAutoplayEvent = std::nullopt;
+    [webView loadRequest:jsPlayRequest];
+    [webView waitForMessage:@"playing"];
+    ASSERT_TRUE(receivedAutoplayEvent == std::nullopt);
+
+    const NSPoint playButtonClickPoint = NSMakePoint(20, 256);
+    [webView mouseDownAtPoint:playButtonClickPoint simulatePressure:NO];
+    [webView mouseUpAtPoint:playButtonClickPoint];
+    runUntilReceivesAutoplayEvent(kWKAutoplayEventUserDidInterfereWithPlayback);
 }
 #endif