Changeset 176714 in webkit

Timestamp:

Dec 3, 2014, 2:09:06 AM (12 years ago)

Author:

dino@apple.com

Message:

[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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/audio-as-video-fullscreen-expected.txt (added)
• LayoutTests/media/audio-as-video-fullscreen.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (modified) (4 diffs)
• Source/WebCore/Modules/mediacontrols/mediaControlsBase.js (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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.
+
 2014-12-03  Eva Balazsfalvi  <evab.u-szeged@partner.samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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.
+
+        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>
 

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

@@ -13 +13 @@
     this.isLive = false;
     this.statusHidden = true;
+    this.hasVisualMedia = false;
 
     this.addVideoListeners();
@@ -27 +28 @@
     this.updateCaptionButton();
     this.updateCaptionContainer();
-    this.updateFullscreenButton();
+    this.updateFullscreenButtons();
     this.updateVolume();
     this.updateHasAudio();
@@ -555 +556 @@
     handleReadyStateChange: function(event)
     {
+        this.hasVisualMedia = this.video.videoTracks && this.video.videoTracks.length > 0;
         this.updateReadyState();
         this.updateDuration();
         this.updateCaptionButton();
         this.updateCaptionContainer();
-        this.updateFullscreenButton();
-        this.updateOptimizedFullscreenButton();
+        this.updateFullscreenButtons();
         this.updateProgress();
     },
@@ -861 +862 @@
     },
 
-    updateFullscreenButton: function()
-    {
-        this.controls.fullscreenButton.classList.toggle(this.ClassNames.hidden, !this.video.webkitSupportsFullscreen);
-    },
-
-    updateOptimizedFullscreenButton: function()
-    {
-        this.controls.optimizedFullscreenButton.classList.toggle(this.ClassNames.hidden, !this.video.webkitSupportsFullscreen);
-    },
-    
+    updateFullscreenButtons: function()
+    {
+        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);
+    },
+
     handleFullscreenButtonClicked: function(event)
     {

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

@@ -13 +13 @@
     this.isLive = false;
     this.statusHidden = true;
+    this.hasVisualMedia = false;
 
     this.addVideoListeners();
@@ -555 +556 @@
     handleReadyStateChange: function(event)
     {
+        this.hasVisualMedia = this.video.videoTracks && this.video.videoTracks.length > 0;
         this.updateReadyState();
         this.updateDuration();
@@ -837 +839 @@
     updateFullscreenButton: function()
     {
-        this.controls.fullscreenButton.classList.toggle(this.ClassNames.hidden, !this.video.webkitSupportsFullscreen);
+        this.controls.fullscreenButton.classList.toggle(this.ClassNames.hidden, (!this.video.webkitSupportsFullscreen || !this.hasVisualMedia));
     },