Changeset 184794 in webkit

Timestamp:

May 22, 2015, 2:01:39 PM (10 years ago)

Author:

eric.carlson@apple.com

Message:

[Mac] Don't show default controls after playing to wireless target
​https://bugs.webkit.org/show_bug.cgi?id=145317

Reviewed by Dean Jackson.

• Modules/mediacontrols/mediaControlsApple.js:

(Controller.prototype.handlePanelTransitionEnd): Don't show controls unless the video
element has the 'controls' attribute.
(Controller.prototype.setPlaying): Check this.video.controls directly because we never want
to show controls unless the attribute is present.
(Controller.prototype.showControls): Ditto.
(Controller.prototype.updateWirelessPlaybackStatus): Call reconnectControls.
(Controller.prototype.handleWirelessPlaybackChange): Don't call reconnectControls, it will
happen in updateWirelessPlaybackStatus.
(Controller.prototype.showInlinePlaybackPlaceholderOnly): Deleted.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-22  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] Don't show default controls after playing to wireless target
+        https://bugs.webkit.org/show_bug.cgi?id=145317
+
+        Reviewed by Dean Jackson.
+
+        * Modules/mediacontrols/mediaControlsApple.js:
+        (Controller.prototype.handlePanelTransitionEnd): Don't show controls unless the video
+        element has the 'controls' attribute.
+        (Controller.prototype.setPlaying): Check this.video.controls directly because we never want
+        to show controls unless the attribute is present.
+        (Controller.prototype.showControls): Ditto.
+        (Controller.prototype.updateWirelessPlaybackStatus): Call reconnectControls.
+        (Controller.prototype.handleWirelessPlaybackChange): Don't call reconnectControls, it will
+        happen in updateWirelessPlaybackStatus.
+        (Controller.prototype.showInlinePlaybackPlaceholderOnly): Deleted.
+
 2015-05-22  Chris Dumez  <cdumez@apple.com>
 

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

@@ -824 +824 @@
     {
         var opacity = window.getComputedStyle(this.controls.panel).opacity;
-        if (!parseInt(opacity) && !this.controlsAlwaysVisible()) {
+        if (!parseInt(opacity) && !this.controlsAlwaysVisible() && this.video.controls) {
             this.base.removeChild(this.controls.inlinePlaybackPlaceholder);
             this.base.removeChild(this.controls.panel);
@@ -1334 +1334 @@
     setPlaying: function(isPlaying)
     {
-        if (this.showInlinePlaybackPlaceholderOnly())
+        if (!this.video.controls)
             return;
 
@@ -1377 +1377 @@
     {
         this.updateShouldListenForPlaybackTargetAvailabilityEvent();
-        if (this.showInlinePlaybackPlaceholderOnly())
+        if (!this.video.controls)
             return;
 
@@ -1935 +1935 @@
         this.setNeedsUpdateForDisplayedWidth();
         this.updateLayoutForDisplayedWidth();
+        this.reconnectControls();
         this.updateWirelessTargetPickerButton();
     },
@@ -1964 +1965 @@
         this.updateWirelessPlaybackStatus();
         this.setNeedsTimelineMetricsUpdate();
-        if (this.showInlinePlaybackPlaceholderOnly())
-            this.reconnectControls();
     },
 
@@ -1992 +1991 @@
     },
 
-    showInlinePlaybackPlaceholderOnly: function(event)
-    {
-        return this.currentPlaybackTargetIsWireless() && !this.video.controls;
-    },
-
     get scrubbing()
     {