Attachment 370061 Details for Bug 197959 – Patch

[patch] Patch

bug-197959-20190516133023.patch (text/plain), 16.67 KB, created by Eric Carlson on 2019-05-16 13:30:24 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Carlson

Created: 2019-05-16 13:30:24 PDT

Size: 16.67 KB

patch

obsolete

>Subversion Revision: 245235
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 0702237834a7edb1da138c7d8322d90ae5c4130e..86a1b22df42de667c4a5c0c840b635fbd92e7a84 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,42 @@
>+2019-05-16  Eric Carlson  <eric.carlson@apple.com>
>+
>+        Allow sequential playback of media files when initial playback started with a user gesture
>+        https://bugs.webkit.org/show_bug.cgi?id=197959
>+        <rdar://problem/50655207>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Test: media/playlist-inherits-user-gesture.html
>+
>+        * dom/Document.cpp:
>+        (WebCore::Document::processingUserGestureForMedia const): Return true if it is within
>+        one second of the last HTMLMediaElement 'ended' event.
>+        * dom/Document.h:
>+        (WebCore::Document::mediaFinishedPlaying):
>+
>+        * html/HTMLMediaElement.cpp:
>+        (WebCore::HTMLMediaElement::parseAttribute): removeBehaviorsRestrictionsAfterFirstUserGesture -> 
>+        removeBehaviorRestrictionsAfterFirstUserGesture.
>+        (WebCore::HTMLMediaElement::load): Ditto. Don't call removeBehaviorsRestrictionsAfterFirstUserGesture,
>+        it will be done in prepareForLoad.
>+        (WebCore::HTMLMediaElement::prepareForLoad): removeBehaviorsRestrictionsAfterFirstUserGesture -> 
>+        removeBehaviorRestrictionsAfterFirstUserGesture.
>+        (WebCore::HTMLMediaElement::audioTrackEnabledChanged): Ditto.
>+        (WebCore::HTMLMediaElement::play): Ditto.
>+        (WebCore::HTMLMediaElement::pause): Ditto.
>+        (WebCore::HTMLMediaElement::setVolume): Ditto.
>+        (WebCore::HTMLMediaElement::setMuted): Ditto.
>+        (WebCore::HTMLMediaElement::webkitShowPlaybackTargetPicker): Ditto.
>+        (WebCore::HTMLMediaElement::dispatchEvent): Call document().mediaFinishedPlaying()
>+        when dispatching the 'ended' event.
>+        (WebCore::HTMLMediaElement::removeBehaviorRestrictionsAfterFirstUserGesture): Rename. Set
>+        m_removedBehaviorRestrictionsAfterFirstUserGesture.
>+        (WebCore::HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture): Deleted.
>+        * html/HTMLMediaElement.h:
>+
>+        * html/MediaElementSession.cpp:
>+        (WebCore::MediaElementSession::removeBehaviorRestriction): Update log message.
>+
> 2019-05-13  Darin Adler  <darin@apple.com>
> 
>         WHLSLPrepare.cpp always recompiles, even if nothing was changed
>diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
>index a2fbd8fdc8a6cec210aee04cbafb9eca45e80f49..93f0c041e8bcb5f7b808a9d2d0fc523fdef78696 100644
>--- a/Source/WebCore/dom/Document.cpp
>+++ b/Source/WebCore/dom/Document.cpp
>@@ -328,6 +328,7 @@ using namespace WTF::Unicode;
> 
> static const unsigned cMaxWriteRecursionDepth = 21;
> bool Document::hasEverCreatedAnAXObjectCache = false;
>+static const Seconds maxIntervalForUserGestureForwardingAfterMediaFinishesPlaying { 1_s };
> 
> // DOM Level 2 says (letters added):
> //
>@@ -6576,6 +6577,9 @@ bool Document::processingUserGestureForMedia() const
>     if (UserGestureIndicator::processingUserGestureForMedia())
>         return true;
> 
>+    if (m_mediaFinishedPlayingTimestamp + maxIntervalForUserGestureForwardingAfterMediaFinishesPlaying >= MonotonicTime::now())
>+        return true;
>+
>     if (settings().mediaUserGestureInheritsFromDocument())
>         return topDocument().hasHadUserInteraction();
> 
>diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h
>index 135ef0b6cd8ce5515ce471eac2023ffa8e48757b..86a5086addcbc2279d716c3fa392ffb51a8733e4 100644
>--- a/Source/WebCore/dom/Document.h
>+++ b/Source/WebCore/dom/Document.h
>@@ -1220,6 +1220,7 @@ public:
>     bool hasHadUserInteraction() const { return static_cast<bool>(m_lastHandledUserGestureTimestamp); }
>     void updateLastHandledUserGestureTimestamp(MonotonicTime);
>     bool processingUserGestureForMedia() const;
>+    void mediaFinishedPlaying() { m_mediaFinishedPlayingTimestamp = MonotonicTime::now(); }
> 
>     void setUserDidInteractWithPage(bool userDidInteractWithPage) { ASSERT(&topDocument() == this); m_userDidInteractWithPage = userDidInteractWithPage; }
>     bool userDidInteractWithPage() const { ASSERT(&topDocument() == this); return m_userDidInteractWithPage; }
>@@ -1834,6 +1835,7 @@ private:
>     std::unique_ptr<EventTargetSet> m_wheelEventTargets;
> 
>     MonotonicTime m_lastHandledUserGestureTimestamp;
>+    MonotonicTime m_mediaFinishedPlayingTimestamp;
> 
>     void clearScriptedAnimationController();
>     RefPtr<ScriptedAnimationController> m_scriptedAnimationController;
>diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp
>index 6d87bddeeaa33eafbd75ffe67c8e759ceb3852cf..d2e27ab6ef6b4eba627c608e7d22af52532eade3 100644
>--- a/Source/WebCore/html/HTMLMediaElement.cpp
>+++ b/Source/WebCore/html/HTMLMediaElement.cpp
>@@ -839,7 +839,7 @@ void HTMLMediaElement::parseAttribute(const QualifiedName& name, const AtomicStr
>         setMediaGroup(value);
>     else if (name == autoplayAttr) {
>         if (processingUserGestureForMedia())
>-            removeBehaviorsRestrictionsAfterFirstUserGesture();
>+            removeBehaviorRestrictionsAfterFirstUserGesture();
>     } else if (name == titleAttr) {
>         if (m_mediaSession)
>             m_mediaSession->clientCharacteristicsChanged();
>@@ -1178,9 +1178,6 @@ void HTMLMediaElement::load()
> 
>     INFO_LOG(LOGIDENTIFIER);
> 
>-    if (processingUserGestureForMedia())
>-        removeBehaviorsRestrictionsAfterFirstUserGesture();
>-
>     prepareForLoad();
>     m_resourceSelectionTaskQueue.enqueueTask([this] {
>         prepareToPlay();
>@@ -1193,7 +1190,10 @@ void HTMLMediaElement::prepareForLoad()
>     // The Media Element Load Algorithm
>     // 12 February 2017
> 
>-    INFO_LOG(LOGIDENTIFIER);
>+    ALWAYS_LOG(LOGIDENTIFIER, "gesture = ", processingUserGestureForMedia());
>+
>+    if (processingUserGestureForMedia())
>+        removeBehaviorRestrictionsAfterFirstUserGesture();
> 
>     // 1 - Abort any already-running instance of the resource selection algorithm for this element.
>     // Perform the cleanup required for the resource load algorithm to run.
>@@ -1951,7 +1951,7 @@ void HTMLMediaElement::audioTrackEnabledChanged(AudioTrack& track)
>     if (m_audioTracks && m_audioTracks->contains(track))
>         m_audioTracks->scheduleChangeEvent();
>     if (processingUserGestureForMedia())
>-        removeBehaviorsRestrictionsAfterFirstUserGesture(MediaElementSession::AllRestrictions & ~MediaElementSession::RequireUserGestureToControlControlsManager);
>+        removeBehaviorRestrictionsAfterFirstUserGesture(MediaElementSession::AllRestrictions & ~MediaElementSession::RequireUserGestureToControlControlsManager);
> }
> 
> void HTMLMediaElement::textTrackModeChanged(TextTrack& track)
>@@ -3515,7 +3515,7 @@ void HTMLMediaElement::play(DOMPromiseDeferred<void>&& promise)
>     }
> 
>     if (processingUserGestureForMedia())
>-        removeBehaviorsRestrictionsAfterFirstUserGesture();
>+        removeBehaviorRestrictionsAfterFirstUserGesture();
> 
>     m_pendingPlayPromises.append(WTFMove(promise));
>     playInternal();
>@@ -3532,7 +3532,7 @@ void HTMLMediaElement::play()
>         return;
>     }
>     if (processingUserGestureForMedia())
>-        removeBehaviorsRestrictionsAfterFirstUserGesture();
>+        removeBehaviorRestrictionsAfterFirstUserGesture();
> 
>     playInternal();
> }
>@@ -3633,7 +3633,7 @@ void HTMLMediaElement::pause()
>         return;
> 
>     if (processingUserGestureForMedia())
>-        removeBehaviorsRestrictionsAfterFirstUserGesture(MediaElementSession::RequireUserGestureToControlControlsManager);
>+        removeBehaviorRestrictionsAfterFirstUserGesture(MediaElementSession::RequireUserGestureToControlControlsManager);
> 
>     pauseInternal();
> }
>@@ -3744,7 +3744,7 @@ ExceptionOr<void> HTMLMediaElement::setVolume(double volume)
> 
> #if !PLATFORM(IOS_FAMILY)
>     if (volume && processingUserGestureForMedia())
>-        removeBehaviorsRestrictionsAfterFirstUserGesture(MediaElementSession::AllRestrictions & ~MediaElementSession::RequireUserGestureToControlControlsManager);
>+        removeBehaviorRestrictionsAfterFirstUserGesture(MediaElementSession::AllRestrictions & ~MediaElementSession::RequireUserGestureToControlControlsManager);
> 
>     m_volume = volume;
>     m_volumeInitialized = true;
>@@ -3783,7 +3783,7 @@ void HTMLMediaElement::setMuted(bool muted)
>     bool mutedStateChanged = m_muted != muted;
>     if (mutedStateChanged || !m_explicitlyMuted) {
>         if (processingUserGestureForMedia()) {
>-            removeBehaviorsRestrictionsAfterFirstUserGesture(MediaElementSession::AllRestrictions & ~MediaElementSession::RequireUserGestureToControlControlsManager);
>+            removeBehaviorRestrictionsAfterFirstUserGesture(MediaElementSession::AllRestrictions & ~MediaElementSession::RequireUserGestureToControlControlsManager);
> 
>             if (hasAudio() && muted)
>                 userDidInterfereWithAutoplay();
>@@ -5878,7 +5878,7 @@ void HTMLMediaElement::webkitShowPlaybackTargetPicker()
> {
>     ALWAYS_LOG(LOGIDENTIFIER);
>     if (processingUserGestureForMedia())
>-        removeBehaviorsRestrictionsAfterFirstUserGesture();
>+        removeBehaviorRestrictionsAfterFirstUserGesture();
>     m_mediaSession->showPlaybackTargetPicker();
> }
> 
>@@ -5917,6 +5917,9 @@ void HTMLMediaElement::dispatchEvent(Event& event)
> {
>     DEBUG_LOG(LOGIDENTIFIER, event.type());
> 
>+    if (m_removedBehaviorRestrictionsAfterFirstUserGesture && event.type() == eventNames().endedEvent)
>+        document().mediaFinishedPlaying();
>+
>     HTMLElement::dispatchEvent(event);
> }
> 
>@@ -7207,7 +7210,7 @@ void HTMLMediaElement::requestInstallMissingPlugins(const String& details, const
> }
> #endif
> 
>-void HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture(MediaElementSession::BehaviorRestrictions mask)
>+void HTMLMediaElement::removeBehaviorRestrictionsAfterFirstUserGesture(MediaElementSession::BehaviorRestrictions mask)
> {
>     MediaElementSession::BehaviorRestrictions restrictionsToRemove = mask &
>         (MediaElementSession::RequireUserGestureForLoad
>@@ -7222,6 +7225,8 @@ void HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture(MediaEle
>         | MediaElementSession::InvisibleAutoplayNotPermitted
>         | MediaElementSession::RequireUserGestureToControlControlsManager);
> 
>+    m_removedBehaviorRestrictionsAfterFirstUserGesture = true;
>+
>     m_mediaSession->removeBehaviorRestriction(restrictionsToRemove);
>     document().topDocument().noteUserInteractionWithMediaElement();
> }
>diff --git a/Source/WebCore/html/HTMLMediaElement.h b/Source/WebCore/html/HTMLMediaElement.h
>index a09162633e4c6213fdb9867d71b82f1c60ac80e7..ec7ca2a9f9c1c1fbc4ded746f882adb446f6d858 100644
>--- a/Source/WebCore/html/HTMLMediaElement.h
>+++ b/Source/WebCore/html/HTMLMediaElement.h
>@@ -851,7 +851,7 @@ private:
> 
>     void changeNetworkStateFromLoadingToIdle();
> 
>-    void removeBehaviorsRestrictionsAfterFirstUserGesture(MediaElementSession::BehaviorRestrictions mask = MediaElementSession::AllRestrictions);
>+    void removeBehaviorRestrictionsAfterFirstUserGesture(MediaElementSession::BehaviorRestrictions mask = MediaElementSession::AllRestrictions);
> 
>     void updateMediaController();
>     bool isBlocked() const;
>@@ -1201,6 +1201,7 @@ private:
> 
>     bool m_isPlayingToWirelessTarget { false };
>     bool m_playingOnSecondScreen { false };
>+    bool m_removedBehaviorRestrictionsAfterFirstUserGesture { false };
> };
> 
> String convertEnumerationToString(HTMLMediaElement::AutoplayEventPlaybackState);
>diff --git a/Source/WebCore/html/MediaElementSession.cpp b/Source/WebCore/html/MediaElementSession.cpp
>index d987c64876aeabffe7a2b65ac1fbedc0e87e50f4..e14cd572d0203ba99ce2f8f760bba0735900049c 100644
>--- a/Source/WebCore/html/MediaElementSession.cpp
>+++ b/Source/WebCore/html/MediaElementSession.cpp
>@@ -242,7 +242,7 @@ void MediaElementSession::removeBehaviorRestriction(BehaviorRestrictions restric
>     if (!(m_restrictions & restriction))
>         return;
> 
>-    INFO_LOG(LOGIDENTIFIER, "removing ", restrictionNames(m_restrictions & restriction));
>+    INFO_LOG(LOGIDENTIFIER, "removed ", restrictionNames(m_restrictions & restriction));
>     m_restrictions &= ~restriction;
> }
> 
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index eb098ea3ddf305b4d74b74b80a01750ea4e1a863..1f8fedc78c91ed6ac014495c6e644ff307d346d1 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-05-16  Eric Carlson  <eric.carlson@apple.com>
>+
>+        Allow sequential playback of media files when initial playback started with a user gesture
>+        https://bugs.webkit.org/show_bug.cgi?id=197959
>+        <rdar://problem/50655207>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * media/playlist-inherits-user-gesture-expected.txt: Added.
>+        * media/playlist-inherits-user-gesture.html: Added.
>+
> 2019-05-13  Sihui Liu  <sihui_liu@apple.com>
> 
>         [ Mojave Debug ] REGRESSION (r242975) Layout Test imported/w3c/IndexedDB-private-browsing/idbobjectstore_createIndex7-event_order.html is a flaky failure
>diff --git a/LayoutTests/media/playlist-inherits-user-gesture-expected.txt b/LayoutTests/media/playlist-inherits-user-gesture-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..a4015d43657b2362e87510b3e81fd007c4cecf40
>--- /dev/null
>+++ b/LayoutTests/media/playlist-inherits-user-gesture-expected.txt
>@@ -0,0 +1,27 @@
>+** Start first video with user gesture.
>+RUN(window.internals.settings.setVideoPlaybackRequiresUserGesture(true);)
>+RUN(video1 = document.createElement("video"))
>+RUN(video1.src = findMediaFile("video", "content/test"))
>+RUN(document.body.appendChild(video1))
>+EXPECTED (window.internals.pageMediaState().includes('HasUserInteractedWithMediaElement') == 'false') OK
>+RUN(video1.play())
>+EXPECTED (window.internals.pageMediaState().includes('HasUserInteractedWithMediaElement') == 'true') OK
>+EVENT(playing)
>+RUN(video1.currentTime = video1.duration - 0.2)
>+EVENT(ended)
>+
>+** Start second video without user gesture but within inheritance window, should succeed.
>+RUN(video2 = document.createElement("video"))
>+RUN(video2.src = findMediaFile("video", "content/test"))
>+RUN(document.body.appendChild(video2))
>+Promise resolved OK
>+RUN(video2.currentTime = video2.duration - 0.2)
>+EVENT(ended)
>+
>+** Start third video without user gesture but after inheritance window, should fail.
>+RUN(video3 = document.createElement("video"))
>+RUN(video3.src = findMediaFile("video", "content/test"))
>+RUN(document.body.appendChild(video3))
>+Promise rejected correctly OK
>+END OF TEST
>+
>diff --git a/LayoutTests/media/playlist-inherits-user-gesture.html b/LayoutTests/media/playlist-inherits-user-gesture.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..810cc3f706425be4caf86d2877dc8f25c5117eea
>--- /dev/null
>+++ b/LayoutTests/media/playlist-inherits-user-gesture.html
>@@ -0,0 +1,54 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+    <title>playlist-inherits-user-gesture</title>
>+    <script src=media-file.js></script>
>+    <script src=video-test.js></script>
>+    <script>
>+    async function runTest() {
>+        consoleWrite("** Start first video with user gesture.")
>+        if (window.internals)
>+            run('window.internals.settings.setVideoPlaybackRequiresUserGesture(true);');
>+        run('video1 = document.createElement("video")');
>+        run('video1.src = findMediaFile("video", "content/test")');
>+        video1.controls = 1;
>+        run('document.body.appendChild(video1)');
>+
>+        if (window.internals)
>+            testExpected("window.internals.pageMediaState().includes('HasUserInteractedWithMediaElement')", false);
>+        runWithKeyDown(() => {
>+            run('video1.play()');
>+        });
>+        if (window.internals)
>+            testExpected("window.internals.pageMediaState().includes('HasUserInteractedWithMediaElement')", true)
>+
>+        await waitFor(video1, 'playing');
>+        run('video1.currentTime = video1.duration - 0.2');
>+        await waitFor(video1, 'ended');
>+
>+        consoleWrite("<br>** Start second video without user gesture but within inheritance window, should succeed.")
>+        run('video2 = document.createElement("video")');
>+        run('video2.src = findMediaFile("video", "content/test")');
>+        video2.controls = 1;
>+        run('document.body.appendChild(video2)');
>+
>+        await shouldResolve(video2.play());
>+        run('video2.currentTime = video2.duration - 0.2');
>+        await waitFor(video2, 'ended');
>+
>+        consoleWrite("<br>** Start third video without user gesture but after inheritance window, should fail.")
>+        await sleepFor(1200);
>+        run('video3 = document.createElement("video")');
>+        run('video3.src = findMediaFile("video", "content/test")');
>+        video3.controls = 1;
>+        run('document.body.appendChild(video3)');
>+
>+        await shouldReject(video3.play());
>+
>+        endTest();
>+    }
>+    </script>
>+</head>
>+<body onload="runTest()">
>+</body>
>+</html>

Flags:

youennf: review+
ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 197959: 370061 | 370072 | 370074 | 370075 | 370114