<!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>[211130] trunk/LayoutTests</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/211130">211130</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-24 18:56:40 -0800 (Tue, 24 Jan 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Work around a crash when running media/modern-media-controls/pip-support/pip-support-enabled.html
https://bugs.webkit.org/show_bug.cgi?id=167381

Patch by Antoine Quint &lt;graouts@apple.com&gt; on 2017-01-24
Reviewed by Dean Jackson.

The test at media/modern-media-controls/pip-support/pip-support-enabled.html would crash because the test that
preceded it, media/modern-media-controls/pip-support/pip-support-click.html, would not exit the PiP presentation mode
before exiting the test. We now exit PiP before proceeding to the next test which avoid hitting the assertion
and the crash in Debug builds.

* media/modern-media-controls/pip-support/pip-support-click.html:
* platform/mac-wk1/TestExpectations:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolspipsupportpipsupportclickhtml">trunk/LayoutTests/media/modern-media-controls/pip-support/pip-support-click.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211129 => 211130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2017-01-25 02:52:51 UTC (rev 211129)
+++ trunk/LayoutTests/ChangeLog        2017-01-25 02:56:40 UTC (rev 211130)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-01-24  Antoine Quint  &lt;graouts@apple.com&gt;
+
+        Work around a crash when running media/modern-media-controls/pip-support/pip-support-enabled.html
+        https://bugs.webkit.org/show_bug.cgi?id=167381
+
+        Reviewed by Dean Jackson.
+
+        The test at media/modern-media-controls/pip-support/pip-support-enabled.html would crash because the test that
+        preceded it, media/modern-media-controls/pip-support/pip-support-click.html, would not exit the PiP presentation mode
+        before exiting the test. We now exit PiP before proceeding to the next test which avoid hitting the assertion
+        and the crash in Debug builds.
+
+        * media/modern-media-controls/pip-support/pip-support-click.html:
+        * platform/mac-wk1/TestExpectations:
+
</ins><span class="cx"> 2017-01-24  Brent Fulgham  &lt;bfulgham@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Bug 167392: REGRESSION(r210531): Relax same-volume display requirement for iOS
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolspipsupportpipsupportclickhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/pip-support/pip-support-click.html (211129 => 211130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/pip-support/pip-support-click.html        2017-01-25 02:52:51 UTC (rev 211129)
+++ trunk/LayoutTests/media/modern-media-controls/pip-support/pip-support-click.html        2017-01-25 02:56:40 UTC (rev 211130)
</span><span class="lines">@@ -24,8 +24,6 @@
</span><span class="cx"> 
</span><span class="cx"> description(&quot;Testing the &lt;code&gt;PiPSupport&lt;/code&gt; behavior when clicking the PiP button.&quot;);
</span><span class="cx"> 
</span><del>-iconService.directoryPath = &quot;../../../../Source/WebCore/Modules/modern-media-controls/images&quot;;
-
</del><span class="cx"> if (window.internals)
</span><span class="cx">     window.internals.settings.setAllowsPictureInPictureMediaPlayback(true);
</span><span class="cx"> 
</span><span class="lines">@@ -48,6 +46,11 @@
</span><span class="cx"> 
</span><span class="cx"> media.addEventListener(&quot;webkitpresentationmodechanged&quot;, () =&gt; {
</span><span class="cx">     shouldBeEqualToString(&quot;media.webkitPresentationMode&quot;, &quot;picture-in-picture&quot;);
</span><ins>+
+    // FIXME: We exit PiP so we leave things in a clean state, otherwise the following
+    // test pip-support-enabled.html may crash, see webkit.org/b/164336.
+    media.webkitSetPresentationMode(&quot;inline&quot;);
+
</ins><span class="cx">     container.remove();
</span><span class="cx">     media.remove();
</span><span class="cx">     finishMediaControlsTest();
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (211129 => 211130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations        2017-01-25 02:52:51 UTC (rev 211129)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations        2017-01-25 02:56:40 UTC (rev 211130)
</span><span class="lines">@@ -301,8 +301,6 @@
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/167253 media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html [ Pass Failure ]
</span><span class="cx"> 
</span><del>-webkit.org/b/164336 [ Sierra Debug ] media/modern-media-controls/pip-support/pip-support-enabled.html [ Crash ]
-
</del><span class="cx"> webkit.org/b/167320 [ Sierra Release ] media/modern-media-controls/placard-support/placard-support-pip.html [ Pass Crash ]
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/167352 [ ElCapitan Debug ] media/modern-media-controls/rewind-button/rewind-button.html [ Pass Timeout ]
</span></span></pre>
</div>
</div>

</body>
</html>