<!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>[202871] trunk/Source/WebCore</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/202871">202871</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-06 13:02:11 -0700 (Wed, 06 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Signal that media element is prepared for inline when being stopped since script won't be able to.
https://bugs.webkit.org/show_bug.cgi?id=159163
rdar://problem/26844557
Patch by Jeremy Jones <jeremyj@apple.com> on 2016-07-06
Reviewed by Jer Noble.
No new tests since this don't change behavior in the DOM. It prevents a race that could cause
fullscreen and picture in picture to fail to tear down completely.
When an element exits a fullscreen mode and is immediately removed from the DOM by the page,
its JavaScript stops running. The fullscreen code is then blocked waiting for JS to signal
that it has updated its state in preparation for inline mode. This change explicitly signals
this since JS wont be able to.
Additionally, when going from PiP back to inline, don't go through fullscreen first, when the
request comes from the DOM. This was causing the presentation mode to become confused. The
page requests inline. PiP would exit back to fullscreen and set the presentation mode to
fullscreen. Then it would exit fullscreen back to inline, but the DOM still had the wrong
presentation mode. Skipping this removes an unnecessary step in the animation and keeps the
presentation mode state consistent.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::stopWithoutDestroyingMediaPlayer):
* platform/ios/WebVideoFullscreenInterfaceAVKit.mm: Set prepared for inline.
(WebVideoFullscreenInterfaceAVKit::exitFullscreen): Return directly to inlne.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202870 => 202871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-06 19:54:07 UTC (rev 202870)
+++ trunk/Source/WebCore/ChangeLog 2016-07-06 20:02:11 UTC (rev 202871)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-07-06 Jeremy Jones <jeremyj@apple.com>
+
+ Signal that media element is prepared for inline when being stopped since script won't be able to.
+ https://bugs.webkit.org/show_bug.cgi?id=159163
+ rdar://problem/26844557
+
+ Reviewed by Jer Noble.
+
+ No new tests since this don't change behavior in the DOM. It prevents a race that could cause
+ fullscreen and picture in picture to fail to tear down completely.
+
+ When an element exits a fullscreen mode and is immediately removed from the DOM by the page,
+ its JavaScript stops running. The fullscreen code is then blocked waiting for JS to signal
+ that it has updated its state in preparation for inline mode. This change explicitly signals
+ this since JS wont be able to.
+
+ Additionally, when going from PiP back to inline, don't go through fullscreen first, when the
+ request comes from the DOM. This was causing the presentation mode to become confused. The
+ page requests inline. PiP would exit back to fullscreen and set the presentation mode to
+ fullscreen. Then it would exit fullscreen back to inline, but the DOM still had the wrong
+ presentation mode. Skipping this removes an unnecessary step in the animation and keeps the
+ presentation mode state consistent.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::stopWithoutDestroyingMediaPlayer):
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm: Set prepared for inline.
+ (WebVideoFullscreenInterfaceAVKit::exitFullscreen): Return directly to inlne.
+
</ins><span class="cx"> 2016-07-06 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for Node.isConnected
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (202870 => 202871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-07-06 19:54:07 UTC (rev 202870)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-07-06 20:02:11 UTC (rev 202871)
</span><span class="lines">@@ -5067,6 +5067,8 @@
</span><span class="cx"> if (m_videoFullscreenMode != VideoFullscreenModeNone)
</span><span class="cx"> exitFullscreen();
</span><span class="cx">
</span><ins>+ setPreparedForInline(true);
+
</ins><span class="cx"> updatePlaybackControlsManager();
</span><span class="cx"> m_inActiveDocument = false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (202870 => 202871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2016-07-06 19:54:07 UTC (rev 202870)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2016-07-06 20:02:11 UTC (rev 202871)
</span><span class="lines">@@ -770,6 +770,7 @@
</span><span class="cx"> [[m_playerViewController view] layoutIfNeeded];
</span><span class="cx">
</span><span class="cx"> if (isMode(HTMLMediaElementEnums::VideoFullscreenModePictureInPicture)) {
</span><ins>+ m_shouldReturnToFullscreenWhenStoppingPiP = false;
</ins><span class="cx"> [m_window setHidden:NO];
</span><span class="cx"> [m_playerViewController stopPictureInPicture];
</span><span class="cx"> } else if (isMode(HTMLMediaElementEnums::VideoFullscreenModePictureInPicture | HTMLMediaElementEnums::VideoFullscreenModeStandard)) {
</span></span></pre>
</div>
</div>
</body>
</html>