<!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>[179612] 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/179612">179612</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-02-04 10:16:06 -0800 (Wed, 04 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>video.attribute should not return true just because of fullscreen
https://bugs.webkit.org/show_bug.cgi?id=141219
Reviewed by Dean Jackson.
Source/WebCore:
No new tests, updated media/video-fullscreeen-only-controls.html
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.shouldHaveControls):
* Modules/mediacontrols/mediaControlsiOS.js:
(ControllerIOS.prototype.isFullScreen):
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::controls): Don't consider fullscreen status.
(WebCore::HTMLMediaElement::configureMediaControls): Create controls if a video element
isn't allowed to play inline, or if it is in fullscreen.
LayoutTests:
* media/video-fullscreeen-only-controls-expected.txt: Update.
* media/video-fullscreeen-only-controls.html: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediavideofullscreeenonlycontrolsexpectedtxt">trunk/LayoutTests/media/video-fullscreeen-only-controls-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideofullscreeenonlycontrolshtml">trunk/LayoutTests/media/video-fullscreeen-only-controls.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>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (179611 => 179612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-02-04 18:08:38 UTC (rev 179611)
+++ trunk/LayoutTests/ChangeLog 2015-02-04 18:16:06 UTC (rev 179612)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-02-04 Eric Carlson <eric.carlson@apple.com>
+
+ video.attribute should not return true just because of fullscreen
+ https://bugs.webkit.org/show_bug.cgi?id=141219
+
+ Reviewed by Dean Jackson.
+
+ * media/video-fullscreeen-only-controls-expected.txt: Update.
+ * media/video-fullscreeen-only-controls.html: Ditto.
+
</ins><span class="cx"> 2015-02-04 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> inspector/css/selector-dynamic-specificity.html is very slow on Yosemite
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideofullscreeenonlycontrolsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/video-fullscreeen-only-controls-expected.txt (179611 => 179612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-fullscreeen-only-controls-expected.txt 2015-02-04 18:08:38 UTC (rev 179611)
+++ trunk/LayoutTests/media/video-fullscreeen-only-controls-expected.txt 2015-02-04 18:16:06 UTC (rev 179612)
</span><span class="lines">@@ -2,6 +2,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> RUN(internals.setMediaSessionRestrictions('video', 'InlineVideoPlaybackRestricted'))
</span><ins>+EXPECTED (video.hasAttribute('controls') == 'false') OK
+EXPECTED (video.controls == 'false') OK
</ins><span class="cx"> EXPECTED (shadowRoot = internals.shadowRoot(video) != 'null') OK
</span><span class="cx"> EXPECTED (panel = mediaControlsElement(shadowRoot.firstChild, '-webkit-media-controls-panel') != 'null') OK
</span><span class="cx"> EXPECTED (internals.shadowPseudoId(panel) == '-webkit-media-controls-panel') OK
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideofullscreeenonlycontrolshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/video-fullscreeen-only-controls.html (179611 => 179612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-fullscreeen-only-controls.html 2015-02-04 18:08:38 UTC (rev 179611)
+++ trunk/LayoutTests/media/video-fullscreeen-only-controls.html 2015-02-04 18:16:06 UTC (rev 179612)
</span><span class="lines">@@ -14,6 +14,9 @@
</span><span class="cx"> var video = document.getElementById('video');
</span><span class="cx"> video.src = findMediaFile("video", "content/test");
</span><span class="cx">
</span><ins>+ testExpected("video.hasAttribute('controls')", false);
+ testExpected("video.controls", false);
+
</ins><span class="cx"> if (window.internals) {
</span><span class="cx"> testExpected("shadowRoot = internals.shadowRoot(video)", null, "!=");
</span><span class="cx"> testExpected("panel = mediaControlsElement(shadowRoot.firstChild, '-webkit-media-controls-panel')", null, "!=");
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179611 => 179612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-04 18:08:38 UTC (rev 179611)
+++ trunk/Source/WebCore/ChangeLog 2015-02-04 18:16:06 UTC (rev 179612)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-02-04 Eric Carlson <eric.carlson@apple.com>
+
+ video.attribute should not return true just because of fullscreen
+ https://bugs.webkit.org/show_bug.cgi?id=141219
+
+ Reviewed by Dean Jackson.
+
+ No new tests, updated media/video-fullscreeen-only-controls.html
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.shouldHaveControls):
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.isFullScreen):
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::controls): Don't consider fullscreen status.
+ (WebCore::HTMLMediaElement::configureMediaControls): Create controls if a video element
+ isn't allowed to play inline, or if it is in fullscreen.
+
</ins><span class="cx"> 2015-02-04 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove concept of makeUsableFromMultipleThreads().
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (179611 => 179612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-02-04 18:08:38 UTC (rev 179611)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-02-04 18:16:06 UTC (rev 179612)
</span><span class="lines">@@ -250,6 +250,9 @@
</span><span class="cx">
</span><span class="cx"> shouldHaveControls: function()
</span><span class="cx"> {
</span><ins>+ if (!this.isAudio() && !this.host.mediaPlaybackAllowsInline)
+ return true;
+
</ins><span class="cx"> return this.video.controls || this.isFullScreen();
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (179611 => 179612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-02-04 18:08:38 UTC (rev 179611)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-02-04 18:16:06 UTC (rev 179612)
</span><span class="lines">@@ -413,7 +413,7 @@
</span><span class="cx">
</span><span class="cx"> isFullScreen: function()
</span><span class="cx"> {
</span><del>- return this.video.webkitDisplayingFullscreen;
</del><ins>+ return this.video.webkitDisplayingFullscreen && this.presentationMode() != 'optimized';
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleFullscreenButtonClicked: function(event) {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (179611 => 179612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-02-04 18:08:38 UTC (rev 179611)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-02-04 18:16:06 UTC (rev 179612)
</span><span class="lines">@@ -2966,14 +2966,6 @@
</span><span class="cx"> if (frame && !frame->script().canExecuteScripts(NotAboutToExecuteScript))
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- // always show controls for video when fullscreen playback is required.
- if (isVideo() && m_mediaSession->requiresFullscreenForVideoPlayback(*this))
- return true;
-
- // Always show controls when in full screen mode.
- if (isFullscreen())
- return true;
-
</del><span class="cx"> return fastHasAttribute(controlsAttr);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5256,13 +5248,23 @@
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::configureMediaControls()
</span><span class="cx"> {
</span><ins>+ bool requireControls = controls();
+
+ // Always create controls for video when fullscreen playback is required.
+ if (isVideo() && m_mediaSession->requiresFullscreenForVideoPlayback(*this))
+ requireControls = true;
+
+ // Always create controls when in full screen mode.
+ if (isFullscreen())
+ requireControls = true;
+
</ins><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><del>- if (!controls() || !inDocument())
</del><ins>+ if (!requireControls || !inDocument())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ensureUserAgentShadowRoot();
</span><span class="cx"> #else
</span><del>- if (!controls() || !inDocument()) {
</del><ins>+ if (!requireControls || !inDocument()) {
</ins><span class="cx"> if (hasMediaControls())
</span><span class="cx"> mediaControls()->hide();
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>