Changeset 185207 in webkit

Timestamp:

Jun 4, 2015, 11:26:05 AM (10 years ago)

Author:

eric.carlson@apple.com

Message:

[Mac] Don't show default controls after playing to wireless target, again
​https://bugs.webkit.org/show_bug.cgi?id=145620
<rdar://problem/21145806>

Reviewed by Dean Jackson.

• Modules/mediacontrols/mediaControlsApple.js:

(Controller.prototype.updateControls): Show or hide the panel as appropriate.
(Controller.prototype.handleWrapperMouseMove): Early return if !video.controls.
(Controller.prototype.addControls): Call updateControls instead of this.setNeedsTimelineMetricsUpdate

so all needed setup is done.

(Controller.prototype.resetHideControlsTimer): Only start the hide timer if playing.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-04  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] Don't show default controls after playing to wireless target, again
+        https://bugs.webkit.org/show_bug.cgi?id=145620
+        <rdar://problem/21145806>
+
+        Reviewed by Dean Jackson.
+
+        * Modules/mediacontrols/mediaControlsApple.js:
+        (Controller.prototype.updateControls): Show or hide the panel as appropriate.
+        (Controller.prototype.handleWrapperMouseMove): Early return if !video.controls.
+        (Controller.prototype.addControls): Call updateControls instead of this.setNeedsTimelineMetricsUpdate
+          so all needed setup is done.
+        (Controller.prototype.resetHideControlsTimer): Only start the hide timer if playing.
+
 2015-06-04  Chris Dumez  <cdumez@apple.com>
 

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

@@ -612 +612 @@
         this.updateLayoutForDisplayedWidth();
         this.setNeedsTimelineMetricsUpdate();
+
+        if (this.video.controls) {
+            this.controls.panel.classList.add(this.ClassNames.show);
+            this.controls.panel.classList.remove(this.ClassNames.hidden);
+            this.resetHideControlsTimer();
+        } else {
+            this.controls.panel.classList.remove(this.ClassNames.show);
+            this.controls.panel.classList.add(this.ClassNames.hidden);
+        }
     },
 
@@ -780 +789 @@
     handleWrapperMouseMove: function(event)
     {
+        if (!this.video.controls)
+            return;
+
         if (this.controlsAreHidden())
             this.showControls();
@@ -1476 +1488 @@
         this.base.appendChild(this.controls.inlinePlaybackPlaceholder);
         this.base.appendChild(this.controls.panel);
-        this.setNeedsTimelineMetricsUpdate();
+        this.updateControls();
     },
 
@@ -1868 +1880 @@
         if (this.hideTimer)
             clearTimeout(this.hideTimer);
-        this.hideTimer = setTimeout(this.hideControls.bind(this), this.HideControlsDelay);
+
+        if (this.isPlaying)
+            this.hideTimer = setTimeout(this.hideControls.bind(this), this.HideControlsDelay);
     },