<!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>[212575] 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/212575">212575</a></dd>
<dt>Author</dt> <dd>graouts@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-17 13:48:04 -0800 (Fri, 17 Feb 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Modern Media Controls] Improve handling of &lt;video&gt; with only audio tracks
https://bugs.webkit.org/show_bug.cgi?id=167836
&lt;rdar://problem/30255812&gt;

Reviewed by Dean Jackson.

Source/WebCore:

We now check for the availability of video tracks before considering a &lt;video&gt;
element is displaying an actual video file and turning auto-hide on. We also
check that we have video tracks before enabling the fullscreen button. This
brings the behavior of a &lt;video&gt; pointing to a resource with no video tracks
to be the same as an &lt;audio&gt; element.

Test: media/modern-media-controls/media-controller/media-controller-video-with-only-audio.html

* Modules/modern-media-controls/media/controls-visibility-support.js:
(ControlsVisibilitySupport.prototype.get tracksToMonitor):
(ControlsVisibilitySupport.prototype._updateControls):
(ControlsVisibilitySupport):
* Modules/modern-media-controls/media/fullscreen-support.js:
(FullscreenSupport.prototype.syncControl):
(FullscreenSupport):

LayoutTests:

Add a new test to check that a &lt;video&gt; with a resource that only has audio tracks
does not auto-hide nor show the fullscreen button. We also rebaseline a few existing
tests for this change of behavior.

* media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-expected.txt:
* media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on.html:
* media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle-expected.txt:
* media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle.html:
* media/modern-media-controls/media-controller/media-controller-video-with-only-audio-expected.txt: Added.
* media/modern-media-controls/media-controller/media-controller-video-with-only-audio.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolscontrolsvisibilitysupportcontrolsvisibilitysupportcontrolsonexpectedtxt">trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolscontrolsvisibilitysupportcontrolsvisibilitysupportcontrolsonhtml">trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on.html</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolscontrolsvisibilitysupportcontrolsvisibilitysupportcontrolstoggleexpectedtxt">trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolscontrolsvisibilitysupportcontrolsvisibilitysupportcontrolstogglehtml">trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsmediacontrolsvisibilitysupportjs">trunk/Source/WebCore/Modules/modern-media-controls/media/controls-visibility-support.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsmediafullscreensupportjs">trunk/Source/WebCore/Modules/modern-media-controls/media/fullscreen-support.js</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrollervideowithonlyaudioexpectedtxt">trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-video-with-only-audio-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrollervideowithonlyaudiohtml">trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-video-with-only-audio.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (212574 => 212575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2017-02-17 21:43:41 UTC (rev 212574)
+++ trunk/LayoutTests/ChangeLog        2017-02-17 21:48:04 UTC (rev 212575)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2017-02-17  Antoine Quint  &lt;graouts@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        [Modern Media Controls] Improve handling of &lt;video&gt; with only audio tracks
+        https://bugs.webkit.org/show_bug.cgi?id=167836
+        &lt;rdar://problem/30255812&gt;
+
+        Reviewed by Dean Jackson.
+
+        Add a new test to check that a &lt;video&gt; with a resource that only has audio tracks
+        does not auto-hide nor show the fullscreen button. We also rebaseline a few existing
+        tests for this change of behavior.
+
+        * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-expected.txt:
+        * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on.html:
+        * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle-expected.txt:
+        * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle.html:
+        * media/modern-media-controls/media-controller/media-controller-video-with-only-audio-expected.txt: Added.
+        * media/modern-media-controls/media-controller/media-controller-video-with-only-audio.html: Added.
+
+2017-02-17  Antoine Quint  &lt;graouts@apple.com&gt;
+
</ins><span class="cx">         [Modern Media Controls] Toggle playback when clicking on the video on macOS
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=168515
</span><span class="cx">         &lt;rdar://problem/30577441&gt;
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolscontrolsvisibilitysupportcontrolsvisibilitysupportcontrolsonexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-expected.txt (212574 => 212575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-expected.txt        2017-02-17 21:43:41 UTC (rev 212574)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-expected.txt        2017-02-17 21:48:04 UTC (rev 212575)
</span><span class="lines">@@ -3,11 +3,9 @@
</span><span class="cx"> On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-Media has not begun loading yet
-PASS mediaController.controls.controlsBar.visible is false
-PASS mediaController.controls.startButton.visible is false
</del><span class="cx"> 
</span><span class="cx"> Media has loaded metadata
</span><ins>+PASS media.videoTracks.length is 1
</ins><span class="cx"> PASS mediaController.controls.controlsBar.visible is true
</span><span class="cx"> PASS mediaController.controls.startButton.visible is true
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolscontrolsvisibilitysupportcontrolsvisibilitysupportcontrolsonhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on.html (212574 => 212575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on.html        2017-02-17 21:43:41 UTC (rev 212574)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on.html        2017-02-17 21:48:04 UTC (rev 212575)
</span><span class="lines">@@ -13,13 +13,10 @@
</span><span class="cx"> const media = document.querySelector(&quot;video&quot;);
</span><span class="cx"> const mediaController = createControls(shadowRoot, media, null);
</span><span class="cx"> 
</span><del>-debug(&quot;Media has not begun loading yet&quot;);
-shouldBeFalse(&quot;mediaController.controls.controlsBar.visible&quot;);
-shouldBeFalse(&quot;mediaController.controls.startButton.visible&quot;);
-
</del><span class="cx"> media.addEventListener(&quot;loadedmetadata&quot;, function() {
</span><span class="cx">     debug(&quot;&quot;);
</span><span class="cx">     debug(&quot;Media has loaded metadata&quot;);
</span><ins>+    shouldBe(&quot;media.videoTracks.length&quot;, &quot;1&quot;);
</ins><span class="cx">     shouldBeTrue(&quot;mediaController.controls.controlsBar.visible&quot;);
</span><span class="cx">     shouldBeTrue(&quot;mediaController.controls.startButton.visible&quot;);
</span><span class="cx">     debug(&quot;&quot;);
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolscontrolsvisibilitysupportcontrolsvisibilitysupportcontrolstoggleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle-expected.txt (212574 => 212575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle-expected.txt        2017-02-17 21:43:41 UTC (rev 212574)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle-expected.txt        2017-02-17 21:48:04 UTC (rev 212575)
</span><span class="lines">@@ -3,11 +3,9 @@
</span><span class="cx"> On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-Media has not begun loading yet
-PASS mediaController.controls.controlsBar.visible is false
-PASS mediaController.controls.startButton.visible is false
</del><span class="cx"> 
</span><span class="cx"> Media has loaded metadata
</span><ins>+PASS media.videoTracks.length is 1
</ins><span class="cx"> PASS mediaController.controls.controlsBar.visible is true
</span><span class="cx"> PASS mediaController.controls.startButton.visible is true
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolscontrolsvisibilitysupportcontrolsvisibilitysupportcontrolstogglehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle.html (212574 => 212575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle.html        2017-02-17 21:43:41 UTC (rev 212574)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle.html        2017-02-17 21:48:04 UTC (rev 212575)
</span><span class="lines">@@ -35,13 +35,10 @@
</span><span class="cx">     }
</span><span class="cx"> }).observe(media, { attributes: true, attributeFilter: [&quot;controls&quot;] });
</span><span class="cx"> 
</span><del>-debug(&quot;Media has not begun loading yet&quot;);
-shouldBeFalse(&quot;mediaController.controls.controlsBar.visible&quot;);
-shouldBeFalse(&quot;mediaController.controls.startButton.visible&quot;);
-
</del><span class="cx"> media.addEventListener(&quot;loadedmetadata&quot;, function() {
</span><span class="cx">     debug(&quot;&quot;);
</span><span class="cx">     debug(&quot;Media has loaded metadata&quot;);
</span><ins>+    shouldBe(&quot;media.videoTracks.length&quot;, &quot;1&quot;);
</ins><span class="cx">     shouldBeTrue(&quot;mediaController.controls.controlsBar.visible&quot;);
</span><span class="cx">     shouldBeTrue(&quot;mediaController.controls.startButton.visible&quot;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrollervideowithonlyaudioexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-video-with-only-audio-expected.txt (0 => 212575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-video-with-only-audio-expected.txt                                (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-video-with-only-audio-expected.txt        2017-02-17 21:48:04 UTC (rev 212575)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Testing that we only show appropriate controls for a video element with only audio tracks.
+
+On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
+
+
+PASS mediaControls.querySelector('button.fullscreen') is null
+PASS mediaControls.querySelector('.controls-bar').classList.contains('faded') is false
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrollervideowithonlyaudiohtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-video-with-only-audio.html (0 => 212575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-video-with-only-audio.html                                (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-video-with-only-audio.html        2017-02-17 21:48:04 UTC (rev 212575)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;script src=&quot;../../../resources/js-test-pre.js&quot;&gt;&lt;/script&gt;
+&lt;body&gt;
+&lt;video src=&quot;../../content/test.wav&quot; style=&quot;width: 800px; height: 240px;&quot; controls autoplay data-auto-hide-delay=&quot;100&quot;&gt;&lt;/video&gt;
+&lt;script type=&quot;text/javascript&quot;&gt;
+
+window.jsTestIsAsync = true;
+
+description(&quot;Testing that we only show appropriate controls for a video element with only audio tracks.&quot;);
+
+const media = document.querySelector(&quot;video&quot;);
+const shadowRoot = window.internals.shadowRoot(media);
+let mediaControls;
+
+media.addEventListener(&quot;play&quot;, event =&gt; {
+    mediaControls = shadowRoot.lastElementChild.lastElementChild;
+
+    // We should not show the fullscreen button if we have a &lt;video&gt; with no audio tracks.
+    window.requestAnimationFrame(() =&gt; shouldBeNull(&quot;mediaControls.querySelector('button.fullscreen')&quot;));
+
+    setTimeout(() =&gt; {
+        // Controls should not auto-hide if we have a &lt;video&gt; with no audio tracks.
+        shouldBeFalse(&quot;mediaControls.querySelector('.controls-bar').classList.contains('faded')&quot;);
+
+        debug(&quot;&quot;);
+        media.remove();
+        finishJSTest();
+    }, 250);
+});
+
+&lt;/script&gt;
+&lt;script src=&quot;../../../resources/js-test-post.js&quot;&gt;&lt;/script&gt;
+&lt;/body&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212574 => 212575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2017-02-17 21:43:41 UTC (rev 212574)
+++ trunk/Source/WebCore/ChangeLog        2017-02-17 21:48:04 UTC (rev 212575)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2017-02-17  Antoine Quint  &lt;graouts@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        [Modern Media Controls] Improve handling of &lt;video&gt; with only audio tracks
+        https://bugs.webkit.org/show_bug.cgi?id=167836
+        &lt;rdar://problem/30255812&gt;
+
+        Reviewed by Dean Jackson.
+
+        We now check for the availability of video tracks before considering a &lt;video&gt;
+        element is displaying an actual video file and turning auto-hide on. We also
+        check that we have video tracks before enabling the fullscreen button. This
+        brings the behavior of a &lt;video&gt; pointing to a resource with no video tracks
+        to be the same as an &lt;audio&gt; element.
+
+        Test: media/modern-media-controls/media-controller/media-controller-video-with-only-audio.html
+
+        * Modules/modern-media-controls/media/controls-visibility-support.js:
+        (ControlsVisibilitySupport.prototype.get tracksToMonitor):
+        (ControlsVisibilitySupport.prototype._updateControls):
+        (ControlsVisibilitySupport):
+        * Modules/modern-media-controls/media/fullscreen-support.js:
+        (FullscreenSupport.prototype.syncControl):
+        (FullscreenSupport):
+
+2017-02-17  Antoine Quint  &lt;graouts@apple.com&gt;
+
</ins><span class="cx">         [Modern Media Controls] Toggle playback when clicking on the video on macOS
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=168515
</span><span class="cx">         &lt;rdar://problem/30577441&gt;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsmediacontrolsvisibilitysupportjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/controls-visibility-support.js (212574 => 212575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/media/controls-visibility-support.js        2017-02-17 21:43:41 UTC (rev 212574)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/controls-visibility-support.js        2017-02-17 21:48:04 UTC (rev 212575)
</span><span class="lines">@@ -48,6 +48,11 @@
</span><span class="cx">         return [&quot;loadedmetadata&quot;, &quot;play&quot;, &quot;pause&quot;];
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    get tracksToMonitor()
+    {
+        return [this.mediaController.media.videoTracks];
+    }
+
</ins><span class="cx">     handleEvent()
</span><span class="cx">     {
</span><span class="cx">         this._updateControls();
</span><span class="lines">@@ -58,8 +63,8 @@
</span><span class="cx">     _updateControls()
</span><span class="cx">     {
</span><span class="cx">         const media = this.mediaController.media;
</span><del>-        const isVideo = media instanceof HTMLVideoElement;
-        let shouldShowControls = this.mediaController.media.controls &amp;&amp; !!media.currentSrc;
</del><ins>+        const isVideo = media instanceof HTMLVideoElement &amp;&amp; media.videoTracks.length &gt; 0;
+        let shouldShowControls = media.controls &amp;&amp; !!media.currentSrc;
</ins><span class="cx">         if (isVideo)
</span><span class="cx">             shouldShowControls = shouldShowControls &amp;&amp; media.readyState &gt; HTMLMediaElement.HAVE_NOTHING;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsmediafullscreensupportjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/fullscreen-support.js (212574 => 212575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/media/fullscreen-support.js        2017-02-17 21:43:41 UTC (rev 212574)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/fullscreen-support.js        2017-02-17 21:48:04 UTC (rev 212575)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">     {
</span><span class="cx">         const control = this.control;
</span><span class="cx">         const media = this.mediaController.media;
</span><del>-        control.enabled = media.webkitSupportsFullscreen;
</del><ins>+        control.enabled = media.webkitSupportsFullscreen &amp;&amp; media.videoTracks.length &gt; 0;
</ins><span class="cx">         control.isFullScreen = media.webkitDisplayingFullscreen;
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>