Changeset 183782 in webkit

Timestamp:

May 4, 2015 5:08:28 PM (9 years ago)

Author:

eric.carlson@apple.com

Message:

[Mac] Audio-only files should not have a device picker
​https://bugs.webkit.org/show_bug.cgi?id=144606
<rdar://problem/20806387>

Reviewed by Dean Jackson.

• Modules/mediacontrols/mediaControlsApple.js:

(Controller.prototype.hasVideo): New.
(Controller.prototype.updateFullscreenButtons): Use hasVideo.
(Controller.prototype.updateHasVideo): Ditto.
(Controller.prototype.updateWirelessTargetAvailable): Don't show the target picker button
unless a file has video.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediacontrols/mediaControlsApple.js (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-04  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] Audio-only files should not have a device picker
+        https://bugs.webkit.org/show_bug.cgi?id=144606
+        <rdar://problem/20806387>
+
+        Reviewed by Dean Jackson.
+
+        * Modules/mediacontrols/mediaControlsApple.js:
+        (Controller.prototype.hasVideo): New.
+        (Controller.prototype.updateFullscreenButtons): Use hasVideo.
+        (Controller.prototype.updateHasVideo): Ditto.
+        (Controller.prototype.updateWirelessTargetAvailable): Don't show the target picker button
+        unless a file has video.
+
 2015-05-04  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js

@@ -987 +987 @@
     },
 
+    hasVideo: function()
+    {
+        return this.video.videoTracks && this.video.videoTracks.length;
+    },
+
     updateFullscreenButtons: function()
     {
-        var hasVisualMedia = this.video.videoTracks && this.video.videoTracks.length > 0;
-        var shouldBeHidden = !this.video.webkitSupportsFullscreen || !hasVisualMedia;
+        var shouldBeHidden = !this.video.webkitSupportsFullscreen || !this.hasVideo();
         this.controls.fullscreenButton.classList.toggle(this.ClassNames.hidden, shouldBeHidden);
         this.controls.optimizedFullscreenButton.classList.toggle(this.ClassNames.hidden, shouldBeHidden);
@@ -1726 +1730 @@
     updateHasVideo: function()
     {
-        if (this.video.videoTracks.length)
+        if (this.hasVideo())
             this.controls.panel.classList.remove(this.ClassNames.noVideo);
         else
@@ -1839 +1843 @@
             wirelessPlaybackTargetsAvailable = false;
 
-        if (wirelessPlaybackTargetsAvailable && this.isPlayable())
+        if (wirelessPlaybackTargetsAvailable && this.isPlayable() && this.hasVideo())
             this.controls.wirelessTargetPicker.classList.remove(this.ClassNames.hidden);
         else