<!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>[202509] 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/202509">202509</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2016-06-27 13:37:48 -0700 (Mon, 27 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] PiP placeholder should remain visible when 'controls' attribute is removed
https://bugs.webkit.org/show_bug.cgi?id=159158
<rdar://problem/26727435>
Reviewed by Jer Noble.
Source/WebCore:
No new tests, existing test updated.
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.shouldHaveControls): Always return true when in PiP or AirPlay mode.
LayoutTests:
* media/controls/picture-in-picture-expected.txt: Updated.
* media/controls/picture-in-picture.html: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediacontrolspictureinpictureexpectedtxt">trunk/LayoutTests/media/controls/picture-in-picture-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediacontrolspictureinpicturehtml">trunk/LayoutTests/media/controls/picture-in-picture.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202508 => 202509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-27 19:52:26 UTC (rev 202508)
+++ trunk/LayoutTests/ChangeLog 2016-06-27 20:37:48 UTC (rev 202509)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-27 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] PiP placeholder should remain visible when 'controls' attribute is removed
+ https://bugs.webkit.org/show_bug.cgi?id=159158
+ <rdar://problem/26727435>
+
+ Reviewed by Jer Noble.
+
+ * media/controls/picture-in-picture-expected.txt: Updated.
+ * media/controls/picture-in-picture.html: Ditto.
+
</ins><span class="cx"> 2016-06-27 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Media controls are too cramped with small video
</span></span></pre></div>
<a id="trunkLayoutTestsmediacontrolspictureinpictureexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/controls/picture-in-picture-expected.txt (202508 => 202509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/controls/picture-in-picture-expected.txt 2016-06-27 19:52:26 UTC (rev 202508)
+++ trunk/LayoutTests/media/controls/picture-in-picture-expected.txt 2016-06-27 20:37:48 UTC (rev 202509)
</span><span class="lines">@@ -23,5 +23,11 @@
</span><span class="cx"> PASS: Should be in pip mode
</span><span class="cx"> PASS: Inline placeholder should be visible at this point
</span><span class="cx">
</span><ins>+Test for the pip placeholder visibility in pip mode without a 'controls' attribute
+
+PASS: Should still be in pip mode
+PASS: No controls attribute
+PASS: Inline placeholder should still be visible
+
</ins><span class="cx"> Testing finished.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediacontrolspictureinpicturehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/controls/picture-in-picture.html (202508 => 202509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/controls/picture-in-picture.html 2016-06-27 19:52:26 UTC (rev 202508)
+++ trunk/LayoutTests/media/controls/picture-in-picture.html 2016-06-27 20:37:48 UTC (rev 202509)
</span><span class="lines">@@ -7,13 +7,13 @@
</span><span class="cx"> if (window.internals)
</span><span class="cx"> window.internals.settings.setAllowsPictureInPictureMediaPlayback(true);
</span><span class="cx">
</span><del>- var tester = new ControlsTest("non-existent-media-file", "error")
</del><ins>+ const tester = new ControlsTest("non-existent-media-file", "error")
</ins><span class="cx"> .whenReady(runTestsWithoutVideo)
</span><span class="cx"> .start();
</span><span class="cx">
</span><span class="cx"> function runTestsWithoutVideo()
</span><span class="cx"> {
</span><del>- var currentState = tester.currentState;
</del><ins>+ const currentState = tester.currentState;
</ins><span class="cx"> tester.test("We are using the apple idiom")
</span><span class="cx"> .value(currentState.idiom)
</span><span class="cx"> .isEqualTo("apple");
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx">
</span><span class="cx"> tester.startNewSection("Test the picture-in-picture button without video", true);
</span><span class="cx">
</span><del>- var stateForPictureInPictureButton = tester.stateForControlsElement("Picture-in-picture Button");
</del><ins>+ const stateForPictureInPictureButton = tester.stateForControlsElement("Picture-in-picture Button");
</ins><span class="cx"> tester.test("Picture-in-picture button should not be visible if there's no video")
</span><span class="cx"> .value(stateForPictureInPictureButton.className)
</span><span class="cx"> .contains("hidden");
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> {
</span><span class="cx"> tester.startNewSection("Test the picture-in-picture button with valid video");
</span><span class="cx">
</span><del>- var stateForPictureInPictureButton = tester.stateForControlsElement("Picture-in-picture Button", true);
</del><ins>+ const stateForPictureInPictureButton = tester.stateForControlsElement("Picture-in-picture Button", true);
</ins><span class="cx"> tester.test("Picture-in-picture button should be visible if there's video")
</span><span class="cx"> .value(stateForPictureInPictureButton.className)
</span><span class="cx"> .doesNotContain("hidden");
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> .value(stateForPictureInPictureButton.parentElement)
</span><span class="cx"> .isNotEqualTo(undefined);
</span><span class="cx">
</span><del>- var stateForPlaceholder = tester.stateForControlsElement("Inline playback placeholder", true);
</del><ins>+ const stateForPlaceholder = tester.stateForControlsElement("Inline playback placeholder", true);
</ins><span class="cx"> tester.test("Inline placeholder should not be visible at this point")
</span><span class="cx"> .value(stateForPlaceholder.className)
</span><span class="cx"> .contains("hidden");
</span><span class="lines">@@ -62,12 +62,36 @@
</span><span class="cx"> .value(tester.media.webkitPresentationMode)
</span><span class="cx"> .isEqualTo("picture-in-picture");
</span><span class="cx">
</span><del>- var stateForPlaceholder = tester.stateForControlsElement("Inline playback placeholder", true);
</del><ins>+ const stateForPlaceholder = tester.stateForControlsElement("Inline playback placeholder", true);
</ins><span class="cx"> tester.test("Inline placeholder should be visible at this point")
</span><span class="cx"> .value(stateForPlaceholder.className)
</span><span class="cx"> .doesNotContain("hidden");
</span><span class="cx">
</span><ins>+ const controlsObserver = new MutationObserver(controlsDidChange);
+ controlsObserver.observe(tester.media, { attributes: true, attributeFilter: ['controls'] });
+
+ tester.media.removeAttribute('controls');
+ }
+
+ function controlsDidChange()
+ {
+ tester.startNewSection("Test for the pip placeholder visibility in pip mode without a 'controls' attribute");
+
+ tester.test("Should still be in pip mode")
+ .value(tester.media.webkitPresentationMode)
+ .isEqualTo("picture-in-picture");
+
+ tester.test("No controls attribute")
+ .value(tester.media.hasAttribute('controls'))
+ .isFalse();
+
+ const stateForPlaceholder = tester.stateForControlsElement("Inline playback placeholder", true);
+ tester.test("Inline placeholder should still be visible")
+ .value(stateForPlaceholder.className)
+ .doesNotContain("hidden");
+
</ins><span class="cx"> tester.media.webkitSetPresentationMode("inline");
</span><ins>+
</ins><span class="cx"> tester.end();
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202508 => 202509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-27 19:52:26 UTC (rev 202508)
+++ trunk/Source/WebCore/ChangeLog 2016-06-27 20:37:48 UTC (rev 202509)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-06-27 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] PiP placeholder should remain visible when 'controls' attribute is removed
+ https://bugs.webkit.org/show_bug.cgi?id=159158
+ <rdar://problem/26727435>
+
+ Reviewed by Jer Noble.
+
+ No new tests, existing test updated.
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.shouldHaveControls): Always return true when in PiP or AirPlay mode.
+
</ins><span class="cx"> 2016-06-27 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Update ATS WebContent exception for more robust framework information
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (202508 => 202509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2016-06-27 19:52:26 UTC (rev 202508)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2016-06-27 20:37:48 UTC (rev 202509)
</span><span class="lines">@@ -306,7 +306,10 @@
</span><span class="cx"> if (!this.isAudio() && !this.host.allowsInlineMediaPlayback)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- return this.video.controls || this.isFullScreen();
</del><ins>+ if (this.isFullScreen() || this.presentationMode() === 'picture-in-picture' || this.currentPlaybackTargetIsWireless())
+ return true;
+
+ return this.video.controls;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> setNeedsTimelineMetricsUpdate: function()
</span></span></pre>
</div>
</div>
</body>
</html>