<!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>[161623] 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/161623">161623</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-01-09 23:26:15 -0800 (Thu, 09 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] .mp3 media document controls missing their background
https://bugs.webkit.org/show_bug.cgi?id=126683
Reviewed by Eric Carlson.
Source/WebCore:
Test: media/media-document-audio-controls-visible.html
<video> elements in a media document are created with an intrinsic size of 300x1,
with the expectation that either the size will be updated if the media has a video
track, or the controls will visibly overflow if the media is audio-only. Since the
shadow root is a flex-box, the panel was being collapsed to 1px high, so give the panel
a minimum height to prevent that. Also, disable "fading out" the controls in a
media document for an audio-only file by adding a "no-video" class to the panel
and adding a media document-only rule to force the controls to always be visible.
* Modules/mediacontrols/mediaControlsApple.css:
(video:-webkit-full-page-media::-webkit-media-controls-panel.no-video):
(audio::-webkit-media-controls-panel):
* Modules/mediacontrols/mediaControlsApple.js:
(Controller): Call updateHasVideo().
(Controller.prototype.addVideoListeners): Add video track listeners.
(Controller.prototype.removeVideoListeners): Remove same.
(Controller.prototype.updateHasVideo): Add a 'no-video' class to the panel if
the video element has no video tracks.
LayoutTests:
* media/media-document-audio-controls-visible-expected.txt: Added.
* media/media-document-audio-controls-visible.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="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplecss">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamediadocumentaudiocontrolsvisibleexpectedtxt">trunk/LayoutTests/media/media-document-audio-controls-visible-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamediadocumentaudiocontrolsvisiblehtml">trunk/LayoutTests/media/media-document-audio-controls-visible.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (161622 => 161623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-10 07:19:29 UTC (rev 161622)
+++ trunk/LayoutTests/ChangeLog 2014-01-10 07:26:15 UTC (rev 161623)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-01-09 Jer Noble <jer.noble@apple.com>
+
+ [Mac] .mp3 media document controls missing their background
+ https://bugs.webkit.org/show_bug.cgi?id=126683
+
+ Reviewed by Eric Carlson.
+
+ * media/media-document-audio-controls-visible-expected.txt: Added.
+ * media/media-document-audio-controls-visible.html: Added.
+
</ins><span class="cx"> 2014-01-09 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> text-decoration-skip: ink does not work with line wraps
</span></span></pre></div>
<a id="trunkLayoutTestsmediamediadocumentaudiocontrolsvisibleexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-document-audio-controls-visible-expected.txt (0 => 161623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-document-audio-controls-visible-expected.txt (rev 0)
+++ trunk/LayoutTests/media/media-document-audio-controls-visible-expected.txt 2014-01-10 07:26:15 UTC (rev 161623)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+This tests that in a standalone media document with audio content, the media element has visible controls.
+
+
+EXPECTED (panel.offsetWidth > '1') OK
+EXPECTED (panel.offsetHeight > '1') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamediadocumentaudiocontrolsvisiblehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-document-audio-controls-visible.html (0 => 161623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-document-audio-controls-visible.html (rev 0)
+++ trunk/LayoutTests/media/media-document-audio-controls-visible.html 2014-01-10 07:26:15 UTC (rev 161623)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script src='video-test.js'></script>
+ <script src='media-controls.js'></script>
+ <script>
+ var panel;
+
+ function runTest()
+ {
+ if (!window.internals) {
+ failTest('This test must be run in DumpRenderTree or WebKitTestRunner.');
+ return;
+ }
+
+ video = document.getElementById('fr').contentDocument.querySelector('video');
+ panel = mediaControlsElement(internals.shadowRoot(video).firstChild, '-webkit-media-controls-panel');
+
+ testExpected('panel.offsetWidth', 1, '>');
+ testExpected('panel.offsetHeight', 1, '>');
+
+ endTest();
+ }
+ </script>
+</head>
+<body>
+ <p>
+ This tests that in a standalone media document with audio content, the media element has visible controls.
+ </p>
+ <pre id='console'></pre>
+ <iframe src='content/test.wav' id='fr' width=380 height=330 onload='runTest()'></iframe>
+</body>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161622 => 161623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-10 07:19:29 UTC (rev 161622)
+++ trunk/Source/WebCore/ChangeLog 2014-01-10 07:26:15 UTC (rev 161623)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-01-09 Jer Noble <jer.noble@apple.com>
+
+ [Mac] .mp3 media document controls missing their background
+ https://bugs.webkit.org/show_bug.cgi?id=126683
+
+ Reviewed by Eric Carlson.
+
+ Test: media/media-document-audio-controls-visible.html
+
+ <video> elements in a media document are created with an intrinsic size of 300x1,
+ with the expectation that either the size will be updated if the media has a video
+ track, or the controls will visibly overflow if the media is audio-only. Since the
+ shadow root is a flex-box, the panel was being collapsed to 1px high, so give the panel
+ a minimum height to prevent that. Also, disable "fading out" the controls in a
+ media document for an audio-only file by adding a "no-video" class to the panel
+ and adding a media document-only rule to force the controls to always be visible.
+
+ * Modules/mediacontrols/mediaControlsApple.css:
+ (video:-webkit-full-page-media::-webkit-media-controls-panel.no-video):
+ (audio::-webkit-media-controls-panel):
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller): Call updateHasVideo().
+ (Controller.prototype.addVideoListeners): Add video track listeners.
+ (Controller.prototype.removeVideoListeners): Remove same.
+ (Controller.prototype.updateHasVideo): Add a 'no-video' class to the panel if
+ the video element has no video tracks.
+
</ins><span class="cx"> 2014-01-09 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up ProgressTracker a little
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplecss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (161622 => 161623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2014-01-10 07:19:29 UTC (rev 161622)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2014-01-10 07:26:15 UTC (rev 161623)
</span><span class="lines">@@ -44,6 +44,10 @@
</span><span class="cx"> bottom: 0px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+video:-webkit-full-page-media::-webkit-media-controls-panel.no-video {
+ opacity: 1;
+}
+
</ins><span class="cx"> ::-webkit-media-controls {
</span><span class="cx"> width: inherit;
</span><span class="cx"> height: inherit;
</span><span class="lines">@@ -67,6 +71,7 @@
</span><span class="cx"> bottom: 0;
</span><span class="cx"> width: 100%;
</span><span class="cx"> padding-top: 1px;
</span><ins>+ min-height: 25px;
</ins><span class="cx"> height: 25px;
</span><span class="cx"> line-height: 25px;
</span><span class="cx"> -webkit-user-select: none;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (161622 => 161623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-01-10 07:19:29 UTC (rev 161622)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-01-10 07:26:15 UTC (rev 161623)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> this.updateCaptionContainer();
</span><span class="cx"> this.updateVolume();
</span><span class="cx"> this.updateHasAudio();
</span><ins>+ this.updateHasVideo();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* Enums */
</span><span class="lines">@@ -75,6 +76,7 @@
</span><span class="cx"> thumbnailImage: 'thumbnail-image',
</span><span class="cx"> thumbnailTrack: 'thumbnail-track',
</span><span class="cx"> volumeBox: 'volume-box',
</span><ins>+ noVideo: 'no-video',
</ins><span class="cx"> },
</span><span class="cx"> KeyCodes: {
</span><span class="cx"> enter: 13,
</span><span class="lines">@@ -167,6 +169,11 @@
</span><span class="cx"> this.listenFor(this.video.audioTracks, 'addtrack', this.updateHasAudio);
</span><span class="cx"> this.listenFor(this.video.audioTracks, 'removetrack', this.updateHasAudio);
</span><span class="cx">
</span><ins>+ /* video tracks */
+ this.listenFor(this.video.videoTracks, 'change', this.updateHasVideo);
+ this.listenFor(this.video.videoTracks, 'addtrack', this.updateHasVideo);
+ this.listenFor(this.video.videoTracks, 'removetrack', this.updateHasVideo);
+
</ins><span class="cx"> /* controls attribute */
</span><span class="cx"> this.controlsObserver = new MutationObserver(this.handleControlsChange.bind(this));
</span><span class="cx"> this.controlsObserver.observe(this.video, { attributes: true, attributeFilter: ['controls'] });
</span><span class="lines">@@ -188,6 +195,11 @@
</span><span class="cx"> this.stopListeningFor(this.video.audioTracks, 'addtrack', this.updateHasAudio);
</span><span class="cx"> this.stopListeningFor(this.video.audioTracks, 'removetrack', this.updateHasAudio);
</span><span class="cx">
</span><ins>+ /* video tracks */
+ this.stopListeningFor(this.video.videoTracks, 'change', this.updateHasVideo);
+ this.stopListeningFor(this.video.videoTracks, 'addtrack', this.updateHasVideo);
+ this.stopListeningFor(this.video.videoTracks, 'removetrack', this.updateHasVideo);
+
</ins><span class="cx"> /* controls attribute */
</span><span class="cx"> this.controlsObserver.disconnect();
</span><span class="cx"> delete(this.controlsObserver);
</span><span class="lines">@@ -1101,6 +1113,14 @@
</span><span class="cx"> this.controls.muteBox.classList.add(this.ClassNames.hidden);
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ updateHasVideo: function()
+ {
+ if (this.video.videoTracks.length)
+ this.controls.panel.classList.remove(this.ClassNames.noVideo);
+ else
+ this.controls.panel.classList.add(this.ClassNames.noVideo);
+ },
+
</ins><span class="cx"> updateVolume: function()
</span><span class="cx"> {
</span><span class="cx"> if (this.video.muted || !this.video.volume) {
</span></span></pre>
</div>
</div>
</body>
</html>