<!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>[176714] 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/176714">176714</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2014-12-03 02:09:06 -0800 (Wed, 03 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Media] Audio content shouldn't have fullscreen buttons, even if in a video element
https://bugs.webkit.org/show_bug.cgi?id=139200
<rdar://problem/18914506>
Reviewed by Eric Carlson.
Source/WebCore:
An audio-only resource, even if loaded into a <video> element, should not
present the fullscreen or optimised fullscreen controls. This includes a
MediaDocument, which is always a <video> element. We can detect this by
examining the length of the videoTracks property as our content loads.
Test: media/audio-as-video-fullscreen.html
* Modules/mediacontrols/mediaControlsApple.js:
(Controller): Initialize a hasVisualMedia to false.
(Controller.prototype.handleReadyStateChange): If we see a videoTrack, hasVisualMedia is now true.
(Controller.prototype.updateFullscreenButtons): Merge the updateFullscreenButton and
updateOptimizedFullscreenButton methods into this single spot, and check for
hasVisualMedia.
(Controller.prototype.updateFullscreenButton): Deleted.
(Controller.prototype.updateOptimizedFullscreenButton): Deleted.
* Modules/mediacontrols/mediaControlsBase.js: Do the same for the other ports.
LayoutTests:
Loads an audio file via the video element and checks if the
fullscreen button is visible.
* media/audio-as-video-fullscreen-expected.txt: Added.
* media/audio-as-video-fullscreen.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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="#trunkSourceWebCoreModulesmediacontrolsmediaControlsBasejs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsBase.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediaaudioasvideofullscreenexpectedtxt">trunk/LayoutTests/media/audio-as-video-fullscreen-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediaaudioasvideofullscreenhtml">trunk/LayoutTests/media/audio-as-video-fullscreen.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (176713 => 176714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-12-03 10:08:41 UTC (rev 176713)
+++ trunk/LayoutTests/ChangeLog 2014-12-03 10:09:06 UTC (rev 176714)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-12-02 Dean Jackson <dino@apple.com>
+
+ [Media] Audio content shouldn't have fullscreen buttons, even if in a video element
+ https://bugs.webkit.org/show_bug.cgi?id=139200
+ <rdar://problem/18914506>
+
+ Reviewed by Eric Carlson.
+
+ Loads an audio file via the video element and checks if the
+ fullscreen button is visible.
+
+ * media/audio-as-video-fullscreen-expected.txt: Added.
+ * media/audio-as-video-fullscreen.html: Added.
+
</ins><span class="cx"> 2014-12-03 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Add subtle crypto to the build system
</span></span></pre></div>
<a id="trunkLayoutTestsmediaaudioasvideofullscreenexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/audio-as-video-fullscreen-expected.txt (0 => 176714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/audio-as-video-fullscreen-expected.txt (rev 0)
+++ trunk/LayoutTests/media/audio-as-video-fullscreen-expected.txt 2014-12-03 10:09:06 UTC (rev 176714)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+Tests that an audio file in a video element should not have a fullscreen button
+
+
+** Playing the video **
+RUN(video.play())
+** Testing if the fullscreen button is hidden **
+EXPECTED (fullscreenButton.classList.contains('hidden') == 'true') OK
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/media/audio-as-video-fullscreen-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsmediaaudioasvideofullscreenhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/audio-as-video-fullscreen.html (0 => 176714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/audio-as-video-fullscreen.html (rev 0)
+++ trunk/LayoutTests/media/audio-as-video-fullscreen.html 2014-12-03 10:09:06 UTC (rev 176714)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+<html>
+<head>
+ <title>Test that an audio file in a video element should not have a fullscreen button</title>
+ <script src=media-file.js></script>
+ <script src=media-controls.js></script>
+ <script src=video-test.js></script>
+ <script>
+ var video;
+ var panel;
+ var fullscreenButton;
+
+ function init()
+ {
+ video = document.querySelector("video");
+
+ consoleWrite("");
+ consoleWrite("** Playing the video **");
+ run("video.play()");
+ }
+
+ function test()
+ {
+ consoleWrite("** Testing if the fullscreen button is hidden **");
+ if (window.internals) {
+ fullscreenButton = mediaControlsElement(internals.shadowRoot(video).firstChild, "-webkit-media-controls-fullscreen-button");
+ testExpected("fullscreenButton.classList.contains('hidden')", true);
+ testRunner.notifyDone();
+ }
+ }
+
+ </script>
+</head>
+<body onload="init()">
+ Tests that an audio file in a video element should not have a fullscreen button<br>
+ <video src="content/silence.wav" onplay="test()" controls></video>
+</body>
+</html>
</ins><span class="cx">Property changes on: trunk/LayoutTests/media/audio-as-video-fullscreen.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176713 => 176714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-03 10:08:41 UTC (rev 176713)
+++ trunk/Source/WebCore/ChangeLog 2014-12-03 10:09:06 UTC (rev 176714)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2014-12-02 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><ins>+ [Media] Audio content shouldn't have fullscreen buttons, even if in a video element
+ https://bugs.webkit.org/show_bug.cgi?id=139200
+ <rdar://problem/18914506>
+
+ Reviewed by Eric Carlson.
+
+ An audio-only resource, even if loaded into a <video> element, should not
+ present the fullscreen or optimised fullscreen controls. This includes a
+ MediaDocument, which is always a <video> element. We can detect this by
+ examining the length of the videoTracks property as our content loads.
+
+ Test: media/audio-as-video-fullscreen.html
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller): Initialize a hasVisualMedia to false.
+ (Controller.prototype.handleReadyStateChange): If we see a videoTrack, hasVisualMedia is now true.
+ (Controller.prototype.updateFullscreenButtons): Merge the updateFullscreenButton and
+ updateOptimizedFullscreenButton methods into this single spot, and check for
+ hasVisualMedia.
+ (Controller.prototype.updateFullscreenButton): Deleted.
+ (Controller.prototype.updateOptimizedFullscreenButton): Deleted.
+
+ * Modules/mediacontrols/mediaControlsBase.js: Do the same for the other ports.
+
+2014-12-02 Dean Jackson <dino@apple.com>
+
</ins><span class="cx"> Missing support for innerHTML on SVGElement
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=136903
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (176713 => 176714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-12-03 10:08:41 UTC (rev 176713)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-12-03 10:09:06 UTC (rev 176714)
</span><span class="lines">@@ -12,6 +12,7 @@
</span><span class="cx"> this.listeners = {};
</span><span class="cx"> this.isLive = false;
</span><span class="cx"> this.statusHidden = true;
</span><ins>+ this.hasVisualMedia = false;
</ins><span class="cx">
</span><span class="cx"> this.addVideoListeners();
</span><span class="cx"> this.createBase();
</span><span class="lines">@@ -26,7 +27,7 @@
</span><span class="cx"> this.updateThumbnail();
</span><span class="cx"> this.updateCaptionButton();
</span><span class="cx"> this.updateCaptionContainer();
</span><del>- this.updateFullscreenButton();
</del><ins>+ this.updateFullscreenButtons();
</ins><span class="cx"> this.updateVolume();
</span><span class="cx"> this.updateHasAudio();
</span><span class="cx"> this.updateHasVideo();
</span><span class="lines">@@ -554,12 +555,12 @@
</span><span class="cx">
</span><span class="cx"> handleReadyStateChange: function(event)
</span><span class="cx"> {
</span><ins>+ this.hasVisualMedia = this.video.videoTracks && this.video.videoTracks.length > 0;
</ins><span class="cx"> this.updateReadyState();
</span><span class="cx"> this.updateDuration();
</span><span class="cx"> this.updateCaptionButton();
</span><span class="cx"> this.updateCaptionContainer();
</span><del>- this.updateFullscreenButton();
- this.updateOptimizedFullscreenButton();
</del><ins>+ this.updateFullscreenButtons();
</ins><span class="cx"> this.updateProgress();
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -860,16 +861,13 @@
</span><span class="cx"> return true;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- updateFullscreenButton: function()
</del><ins>+ updateFullscreenButtons: function()
</ins><span class="cx"> {
</span><del>- this.controls.fullscreenButton.classList.toggle(this.ClassNames.hidden, !this.video.webkitSupportsFullscreen);
</del><ins>+ var shouldBeHidden = !this.video.webkitSupportsFullscreen || !this.hasVisualMedia;
+ this.controls.fullscreenButton.classList.toggle(this.ClassNames.hidden, shouldBeHidden);
+ this.controls.optimizedFullscreenButton.classList.toggle(this.ClassNames.hidden, shouldBeHidden);
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- updateOptimizedFullscreenButton: function()
- {
- this.controls.optimizedFullscreenButton.classList.toggle(this.ClassNames.hidden, !this.video.webkitSupportsFullscreen);
- },
-
</del><span class="cx"> handleFullscreenButtonClicked: function(event)
</span><span class="cx"> {
</span><span class="cx"> if (this.isFullScreen())
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsBasejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsBase.js (176713 => 176714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsBase.js 2014-12-03 10:08:41 UTC (rev 176713)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsBase.js 2014-12-03 10:09:06 UTC (rev 176714)
</span><span class="lines">@@ -12,6 +12,7 @@
</span><span class="cx"> this.listeners = {};
</span><span class="cx"> this.isLive = false;
</span><span class="cx"> this.statusHidden = true;
</span><ins>+ this.hasVisualMedia = false;
</ins><span class="cx">
</span><span class="cx"> this.addVideoListeners();
</span><span class="cx"> this.createBase();
</span><span class="lines">@@ -554,6 +555,7 @@
</span><span class="cx">
</span><span class="cx"> handleReadyStateChange: function(event)
</span><span class="cx"> {
</span><ins>+ this.hasVisualMedia = this.video.videoTracks && this.video.videoTracks.length > 0;
</ins><span class="cx"> this.updateReadyState();
</span><span class="cx"> this.updateDuration();
</span><span class="cx"> this.updateCaptionButton();
</span><span class="lines">@@ -836,7 +838,7 @@
</span><span class="cx">
</span><span class="cx"> updateFullscreenButton: function()
</span><span class="cx"> {
</span><del>- this.controls.fullscreenButton.classList.toggle(this.ClassNames.hidden, !this.video.webkitSupportsFullscreen);
</del><ins>+ this.controls.fullscreenButton.classList.toggle(this.ClassNames.hidden, (!this.video.webkitSupportsFullscreen || !this.hasVisualMedia));
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleFullscreenButtonClicked: function(event)
</span></span></pre>
</div>
</div>
</body>
</html>