<!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>[186183] 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/186183">186183</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-07-01 12:08:22 -0700 (Wed, 01 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Hide the inline controls when going into PiP
https://bugs.webkit.org/show_bug.cgi?id=146487
<rdar://problem/19881159>
Reviewed by Eric Carlson.
When the presentation mode is PiP, toggle a class
on the container element so that we can completely
hide the control toolbar. The placard should still
remain visible.
* Modules/mediacontrols/mediaControlsiOS.css:
(video::-webkit-media-controls-panel-container.picture-in-picture): Add
a rule that hides the toolbar when PiP is active.
* Modules/mediacontrols/mediaControlsiOS.js:
(ControllerIOS.prototype.showControls):
(ControllerIOS.prototype.handlePresentationModeChange): Toggle a
class. Also fix a bug I noticed where exiting from PiP was
not auto-hiding the controls until the user tapped.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOScss">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186182 => 186183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-01 18:44:27 UTC (rev 186182)
+++ trunk/Source/WebCore/ChangeLog 2015-07-01 19:08:22 UTC (rev 186183)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-06-30 Dean Jackson <dino@apple.com>
+
+ Hide the inline controls when going into PiP
+ https://bugs.webkit.org/show_bug.cgi?id=146487
+ <rdar://problem/19881159>
+
+ Reviewed by Eric Carlson.
+
+ When the presentation mode is PiP, toggle a class
+ on the container element so that we can completely
+ hide the control toolbar. The placard should still
+ remain visible.
+
+ * Modules/mediacontrols/mediaControlsiOS.css:
+ (video::-webkit-media-controls-panel-container.picture-in-picture): Add
+ a rule that hides the toolbar when PiP is active.
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.showControls):
+ (ControllerIOS.prototype.handlePresentationModeChange): Toggle a
+ class. Also fix a bug I noticed where exiting from PiP was
+ not auto-hiding the controls until the user tapped.
+
</ins><span class="cx"> 2015-07-01 Matthew Daiter <mdaiter@apple.com>
</span><span class="cx">
</span><span class="cx"> Enable MEDIA_STREAM flag
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOScss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css (186182 => 186183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-07-01 18:44:27 UTC (rev 186182)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-07-01 19:08:22 UTC (rev 186183)
</span><span class="lines">@@ -671,3 +671,9 @@
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* When PiP is active, we don't want the controls container showing. */
+video::-webkit-media-controls-panel-container.picture-in-picture {
+ opacity: 0;
+ pointer-events: none;
+}
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (186182 => 186183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-07-01 18:44:27 UTC (rev 186182)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-07-01 19:08:22 UTC (rev 186183)
</span><span class="lines">@@ -539,7 +539,7 @@
</span><span class="cx"> this.updateShouldListenForPlaybackTargetAvailabilityEvent();
</span><span class="cx"> if (!this.video.controls)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> this.updateForShowingControls();
</span><span class="cx"> if (this.shouldHaveControls() && !this.controls.panelContainer.parentElement) {
</span><span class="cx"> this.base.appendChild(this.controls.inlinePlaybackPlaceholder);
</span><span class="lines">@@ -561,6 +561,7 @@
</span><span class="cx">
</span><span class="cx"> switch (presentationMode) {
</span><span class="cx"> case 'inline':
</span><ins>+ this.controls.panelContainer.classList.remove(this.ClassNames.pictureInPicture);
</ins><span class="cx"> this.controls.inlinePlaybackPlaceholder.classList.add(this.ClassNames.hidden);
</span><span class="cx"> this.controls.inlinePlaybackPlaceholder.classList.remove(this.ClassNames.pictureInPicture);
</span><span class="cx"> this.controls.inlinePlaybackPlaceholderTextTop.classList.remove(this.ClassNames.pictureInPicture);
</span><span class="lines">@@ -569,6 +570,7 @@
</span><span class="cx"> this.controls.pictureInPictureButton.classList.remove(this.ClassNames.returnFromPictureInPicture);
</span><span class="cx"> break;
</span><span class="cx"> case 'picture-in-picture':
</span><ins>+ this.controls.panelContainer.classList.add(this.ClassNames.pictureInPicture);
</ins><span class="cx"> this.controls.inlinePlaybackPlaceholder.classList.add(this.ClassNames.pictureInPicture);
</span><span class="cx"> this.controls.inlinePlaybackPlaceholder.classList.remove(this.ClassNames.hidden);
</span><span class="cx">
</span><span class="lines">@@ -580,6 +582,7 @@
</span><span class="cx"> this.controls.pictureInPictureButton.classList.add(this.ClassNames.returnFromPictureInPicture);
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><ins>+ this.controls.panelContainer.classList.remove(this.ClassNames.pictureInPicture);
</ins><span class="cx"> this.controls.inlinePlaybackPlaceholder.classList.remove(this.ClassNames.pictureInPicture);
</span><span class="cx"> this.controls.inlinePlaybackPlaceholderTextTop.classList.remove(this.ClassNames.pictureInPicture);
</span><span class="cx"> this.controls.inlinePlaybackPlaceholderTextBottom.classList.remove(this.ClassNames.pictureInPicture);
</span><span class="lines">@@ -590,6 +593,7 @@
</span><span class="cx">
</span><span class="cx"> this.updateControls();
</span><span class="cx"> this.updateCaptionContainer();
</span><ins>+ this.resetHideControlsTimer();
</ins><span class="cx"> if (presentationMode != 'fullscreen' && this.video.paused && this.controlsAreHidden())
</span><span class="cx"> this.showControls();
</span><span class="cx"> },
</span></span></pre>
</div>
</div>
</body>
</html>