<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[212314] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/212314">212314</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-14 11:34:09 -0800 (Tue, 14 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>When playing inline after fullscreen, set a flag instead of adding attribute plays inline, and use in requiresFullscreenForVideoPlayback.
https://bugs.webkit.org/show_bug.cgi?id=167815
rdar://problem/27685077
Patch by Jeremy Jones <jeremyj@apple.com> on 2017-02-14
Reviewed by Jer Noble.
Source/WebCore:
Test: media/media-fullscreen-loop-inline.html
When video is allowed to play inline after fullscreen. Looped video causes play state to update, which can send video back to fullscreen when
allowsInline is false. This change will set a new flag when allowsInlineMediaPlaybackAfterFullscreen allows inline playback that can be tested
in requiresFullscreenForVideoPlayback to prevent sending video back into fullscreen when video loops.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::enterFullscreen):
(WebCore::HTMLMediaElement::exitFullscreen):
* html/HTMLMediaElement.h:
(WebCore::HTMLMediaElement::isTemporarilyAllowingInlinePlaybackAfterFullscreen): Added.
* html/MediaElementSession.cpp:
(WebCore::MediaElementSession::requiresFullscreenForVideoPlayback):
LayoutTests:
Add a new test that tests inline after fullscreen behavior of looping video.
* media/media-fullscreen-loop-inline-expected.txt: Added.
* media/media-fullscreen-loop-inline.html: Added.
* platform/mac-wk2/TestExpectations: Skipped on webkit2.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaElementSessioncpp">trunk/Source/WebCore/html/MediaElementSession.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamediafullscreenloopinlineexpectedtxt">trunk/LayoutTests/media/media-fullscreen-loop-inline-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamediafullscreenloopinlinehtml">trunk/LayoutTests/media/media-fullscreen-loop-inline.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (212313 => 212314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-14 19:24:34 UTC (rev 212313)
+++ trunk/LayoutTests/ChangeLog 2017-02-14 19:34:09 UTC (rev 212314)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-02-14 Jeremy Jones <jeremyj@apple.com>
+
+ When playing inline after fullscreen, set a flag instead of adding attribute plays inline, and use in requiresFullscreenForVideoPlayback.
+ https://bugs.webkit.org/show_bug.cgi?id=167815
+ rdar://problem/27685077
+
+ Reviewed by Jer Noble.
+
+ Add a new test that tests inline after fullscreen behavior of looping video.
+
+ * media/media-fullscreen-loop-inline-expected.txt: Added.
+ * media/media-fullscreen-loop-inline.html: Added.
+ * platform/mac-wk2/TestExpectations: Skipped on webkit2.
+
</ins><span class="cx"> 2017-02-14 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Rebaseline media/modern-media-controls/airplay-button/airplay-button-on.html for ios-simulator.
</span></span></pre></div>
<a id="trunkLayoutTestsmediamediafullscreenloopinlineexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-fullscreen-loop-inline-expected.txt (0 => 212314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-fullscreen-loop-inline-expected.txt (rev 0)
+++ trunk/LayoutTests/media/media-fullscreen-loop-inline-expected.txt 2017-02-14 19:34:09 UTC (rev 212314)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+
+RUN(internals.settings.setAllowsInlineMediaPlayback(false))
+RUN(internals.settings.setAllowsInlineMediaPlaybackAfterFullscreen(true))
+RUN(internals.settings.setFullScreenEnabled(false))
+RUN(internals.setMediaElementRestrictions(video, "NoRestrictions"))
+RUN(video.loop = true)
+RUN(video.src = findMediaFile("video", "content/test"))
+RUN(video.play())
+EVENT(webkitbeginfullscreen)
+RUN(video.currentTime = 5)
+RUN(video.webkitExitFullscreen())
+EVENT(webkitendfullscreen)
+EXPECTED (video.paused == 'false') OK
+RUN(video.ontimeupdate = timeupdate)
+RUN(video.ontimeupdate = null)
+Looped
+EXPECTED (video.playsInline == 'false') OK
+EXPECTED (video.paused == 'false') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamediafullscreenloopinlinehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-fullscreen-loop-inline.html (0 => 212314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-fullscreen-loop-inline.html (rev 0)
+++ trunk/LayoutTests/media/media-fullscreen-loop-inline.html 2017-02-14 19:34:09 UTC (rev 212314)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+<!DOCTYPE html><!-- webkit-test-runner [ enableModernMediaControls=false ] -->
+<html>
+<head>
+ <title>media-fullscreen-return-to-inline</title>
+
+ <script src="video-test.js"></script>
+ <script src="media-file.js"></script>
+
+ <script>
+ function go()
+ {
+ findMediaElement();
+ run('internals.settings.setAllowsInlineMediaPlayback(false)');
+ run('internals.settings.setAllowsInlineMediaPlaybackAfterFullscreen(true)');
+ run('internals.settings.setFullScreenEnabled(false)');
+ run('internals.setMediaElementRestrictions(video, "NoRestrictions")');
+ run('video.loop = true');
+ run('video.src = findMediaFile("video", "content/test")');
+ waitForEventOnce('webkitbeginfullscreen', beginfullscreen);
+ run('video.play()');
+ }
+
+ function beginfullscreen()
+ {
+ run('video.currentTime = 5');
+ run('video.webkitExitFullscreen()');
+ waitForEventOnce('webkitendfullscreen', endfullscreen);
+ }
+
+ function endfullscreen()
+ {
+ testExpected('video.paused', false);
+ run('video.ontimeupdate = timeupdate');
+ waitForEventAndFail('webkitbeginfullscreen');
+ }
+
+ function timeupdate()
+ {
+ if (video.currentTime == 0) {
+ run('video.ontimeupdate = null');
+ consoleWrite("Looped");
+ testExpected('video.playsInline', false);
+ setTimeout(function loopCompleted() {
+ testExpected('video.paused', false);
+ endTest();
+ }, 0);
+ }
+ }
+
+ </script>
+
+</head>
+
+<body onload="go()">
+ <video controls></video>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (212313 => 212314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2017-02-14 19:24:34 UTC (rev 212313)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2017-02-14 19:34:09 UTC (rev 212314)
</span><span class="lines">@@ -321,6 +321,9 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/156077 inspector/heap/getRemoteObject.html [ Pass Failure ]
</span><span class="cx">
</span><ins>+# Video fullscreen is not implemented for mac wk2 in webkittestrunner
+media/media-fullscreen-loop-inline.html [ Skip ]
+
</ins><span class="cx"> ### END OF (1) Classified failures with bug reports
</span><span class="cx"> ########################################
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212313 => 212314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-14 19:24:34 UTC (rev 212313)
+++ trunk/Source/WebCore/ChangeLog 2017-02-14 19:34:09 UTC (rev 212314)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-02-14 Jeremy Jones <jeremyj@apple.com>
+
+ When playing inline after fullscreen, set a flag instead of adding attribute plays inline, and use in requiresFullscreenForVideoPlayback.
+ https://bugs.webkit.org/show_bug.cgi?id=167815
+ rdar://problem/27685077
+
+ Reviewed by Jer Noble.
+
+ Test: media/media-fullscreen-loop-inline.html
+
+ When video is allowed to play inline after fullscreen. Looped video causes play state to update, which can send video back to fullscreen when
+ allowsInline is false. This change will set a new flag when allowsInlineMediaPlaybackAfterFullscreen allows inline playback that can be tested
+ in requiresFullscreenForVideoPlayback to prevent sending video back into fullscreen when video loops.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::enterFullscreen):
+ (WebCore::HTMLMediaElement::exitFullscreen):
+ * html/HTMLMediaElement.h:
+ (WebCore::HTMLMediaElement::isTemporarilyAllowingInlinePlaybackAfterFullscreen): Added.
+ * html/MediaElementSession.cpp:
+ (WebCore::MediaElementSession::requiresFullscreenForVideoPlayback):
+
</ins><span class="cx"> 2017-02-14 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Video elements with MediaSource objects set by srcObject are not cleared when srcObject is set to null
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (212313 => 212314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2017-02-14 19:24:34 UTC (rev 212313)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2017-02-14 19:34:09 UTC (rev 212314)
</span><span class="lines">@@ -5452,6 +5452,8 @@
</span><span class="cx"> if (m_videoFullscreenMode == mode)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ m_temporarilyAllowingInlinePlaybackAfterFullscreen = false;
+
</ins><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> if (document().settings().fullScreenEnabled()) {
</span><span class="cx"> if (mode == VideoFullscreenModeStandard) {
</span><span class="lines">@@ -5515,9 +5517,9 @@
</span><span class="cx"> if (!document().settings().allowsInlineMediaPlaybackAfterFullscreen() || isVideoTooSmallForInlinePlayback())
</span><span class="cx"> pauseInternal();
</span><span class="cx"> else {
</span><del>- // Allow inline playback, but set 'playsinline' so pausing and starting again (e.g. when scrubbing) won't go back to fullscreen.
</del><ins>+ // Allow inline playback, but set a flag so pausing and starting again (e.g. when scrubbing or looping) won't go back to fullscreen.
</ins><span class="cx"> // Also set the controls attribute so the user will be able to control playback.
</span><del>- setBooleanAttribute(HTMLNames::playsinlineAttr, true);
</del><ins>+ m_temporarilyAllowingInlinePlaybackAfterFullscreen = true;
</ins><span class="cx"> setControls(true);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (212313 => 212314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2017-02-14 19:24:34 UTC (rev 212313)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2017-02-14 19:34:09 UTC (rev 212314)
</span><span class="lines">@@ -493,6 +493,8 @@
</span><span class="cx">
</span><span class="cx"> double playbackStartedTime() const { return m_playbackStartedTime; }
</span><span class="cx">
</span><ins>+ bool isTemporarilyAllowingInlinePlaybackAfterFullscreen() const {return m_temporarilyAllowingInlinePlaybackAfterFullscreen; }
+
</ins><span class="cx"> protected:
</span><span class="cx"> HTMLMediaElement(const QualifiedName&, Document&, bool createdByParser);
</span><span class="cx"> virtual ~HTMLMediaElement();
</span><span class="lines">@@ -891,6 +893,8 @@
</span><span class="cx"> bool m_preparedForInline;
</span><span class="cx"> std::function<void()> m_preparedForInlineCompletionHandler;
</span><span class="cx">
</span><ins>+ bool m_temporarilyAllowingInlinePlaybackAfterFullscreen { false };
+
</ins><span class="cx"> #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
</span><span class="cx"> RetainPtr<PlatformLayer> m_videoFullscreenLayer;
</span><span class="cx"> FloatRect m_videoFullscreenFrame;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaElementSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (212313 => 212314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaElementSession.cpp 2017-02-14 19:24:34 UTC (rev 212313)
+++ trunk/Source/WebCore/html/MediaElementSession.cpp 2017-02-14 19:34:09 UTC (rev 212314)
</span><span class="lines">@@ -540,6 +540,9 @@
</span><span class="cx"> if (is<HTMLAudioElement>(element))
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (element.isTemporarilyAllowingInlinePlaybackAfterFullscreen())
+ return false;
+
</ins><span class="cx"> if (!element.document().settings().allowsInlineMediaPlayback())
</span><span class="cx"> return true;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>