Changeset 182262 in webkit

Timestamp:

Apr 1, 2015, 4:43:50 PM (10 years ago)

Author:

eric.carlson@apple.com

Message:

Media controls should not always auto-hide
​https://bugs.webkit.org/show_bug.cgi?id=143322

Reviewed by Dean Jackson.

• Modules/mediacontrols/mediaControlsApple.js:

(Controller): Intialize new properties.
(Controller.prototype.hideControls): Do nothing if controlsAlwaysVisible() returns true;
(Controller.prototype.controlsAlwaysVisible): New.
(Controller.prototype.controlsAreHidden): Consult controlsAlwaysVisible().
(Controller.prototype.currentPlaybackTargetIsWireless): Use new properties.
(Controller.prototype.updateWirelessTargetAvailable): Cache video.webkitCurrentPlaybackTargetIsWireless

and video.webkitWirelessVideoPlaybackDisabled because we know when they change and
use them frequently.

• Modules/mediacontrols/mediaControlsiOS.js:

(ControllerIOS.prototype.controlsAlwaysVisible): New.

• platform/graphics/MediaPlaybackTarget.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2015-04-01  Eric Carlson  <eric.carlson@apple.com>
+
+        Media controls should not always auto-hide
+        https://bugs.webkit.org/show_bug.cgi?id=143322
+
+        Reviewed by Dean Jackson.
+
+        * Modules/mediacontrols/mediaControlsApple.js:
+        (Controller): Intialize new properties.
+        (Controller.prototype.hideControls): Do nothing if controlsAlwaysVisible() returns true;
+        (Controller.prototype.controlsAlwaysVisible): New.
+        (Controller.prototype.controlsAreHidden): Consult controlsAlwaysVisible().
+        (Controller.prototype.currentPlaybackTargetIsWireless): Use new properties.
+        (Controller.prototype.updateWirelessTargetAvailable): Cache video.webkitCurrentPlaybackTargetIsWireless
+            and video.webkitWirelessVideoPlaybackDisabled because we know when they change and
+            use them frequently.
+        * Modules/mediacontrols/mediaControlsiOS.js:
+        (ControllerIOS.prototype.controlsAlwaysVisible): New.
+        * platform/graphics/MediaPlaybackTarget.h:
+
 2015-04-01  Alexey Proskuryakov  <ap@apple.com>
 

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

@@ -16 +16 @@
     this.hasWirelessPlaybackTargets = false;
     this.isListeningForPlaybackTargetAvailabilityEvent = false;
+    this.currentTargetIsWireless = false;
+    this.wirelessPlaybackDisabled = false;
 
     this.addVideoListeners();
@@ -1286 +1288 @@
     hideControls: function()
     {
+        if (this.controlsAlwaysVisible())
+            return;
+
         this.updateShouldListenForPlaybackTargetAvailabilityEvent();
         this.controls.panel.classList.remove(this.ClassNames.show);
@@ -1292 +1297 @@
     },
 
+    controlsAlwaysVisible: function()
+    {
+        return this.isAudio() || this.currentPlaybackTargetIsWireless();
+    },
+
     controlsAreHidden: function()
     {
-        return !this.isAudio() && !this.controls.panel.classList.contains(this.ClassNames.show);
+        return !this.controlsAlwaysVisible() && !this.controls.panel.classList.contains(this.ClassNames.show);
     },
 
@@ -1699 +1709 @@
             return true;
 
-        if (!this.video.webkitCurrentPlaybackTargetIsWireless || this.video.webkitWirelessVideoPlaybackDisabled)
+        if (!this.currentTargetIsWireless || this.wirelessPlaybackDisabled)
             return false;
 
@@ -1747 +1757 @@
 
     updateWirelessTargetAvailable: function() {
+        this.currentTargetIsWireless = this.video.webkitCurrentPlaybackTargetIsWireless;
+        this.wirelessPlaybackDisabled = this.video.webkitWirelessVideoPlaybackDisabled;
+
         var wirelessPlaybackTargetsAvailable = Controller.gSimulateWirelessPlaybackTarget || this.hasWirelessPlaybackTargets;
-        if (this.video.webkitWirelessVideoPlaybackDisabled)
+        if (this.wirelessPlaybackDisabled)
             wirelessPlaybackTargetsAvailable = false;
 

trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js ¶

@@ -652 +652 @@
     },
 
+    controlsAlwaysVisible: function()
+    {
+        if (this.presentationMode() === 'optimized')
+            return true;
+
+        return Controller.prototype.controlsAlwaysVisible.call(this);
+    },
+
+
 };