Changeset 181279 in webkit

Timestamp:

Mar 9, 2015 1:22:15 PM (9 years ago)

Author:

roger_fong@apple.com

Message:

Only call showControls if controls are hidden.
​https://bugs.webkit.org/show_bug.cgi?id=142496.
<rdar://problem/20083732>
Reviewed by Dean Jackson.

• Modules/mediacontrols/mediaControlsApple.js:

(Controller.prototype.handleWrapperMouseMove):
(Controller.prototype.controlsAreHidden):
Controls are hidden if the ‘show’ class name is not present,
not if the ‘hidden’ class name is.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ -20 +20 @@
         * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
         (WebCore::MediaPlayerPrivateGStreamer::load):
+
+2015-03-09  Roger Fong  <roger_fong@apple.com>
+
+        Only call showControls if controls are hidden.
+        https://bugs.webkit.org/show_bug.cgi?id=142496.
+        <rdar://problem/20083732>
+
+        Reviewed by Dean Jackson.
+
+        * Modules/mediacontrols/mediaControlsApple.js:
+        (Controller.prototype.handleWrapperMouseMove):
+        (Controller.prototype.controlsAreHidden):
+        Controls are hidden if the ‘show’ class name is not present,
+        not if the ‘hidden’ class name is.
 
 2015-03-09  Roger Fong  <roger_fong@apple.com>

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

@@ -140 +140 @@
 video::-webkit-media-controls-play-button.paused,
 audio::-webkit-media-controls-play-button.paused {
-    background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 15" fill="white"><path d="M 0,.5 12,7 0,13.5 z"/></svg>');
+    background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 15" fill="white"><path d="M 0,0 12,7 0,13 z"/></svg>');
     width: 12px;
 }

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

@@ -677 +677 @@
     handleWrapperMouseMove: function(event)
     {
-        this.showControls();
+        if (this.controlsAreHidden())
+            this.showControls();
         this.resetHideControlsTimer();
 
@@ -1231 +1232 @@
     controlsAreHidden: function()
     {
-        return !this.isAudio() && this.controls.panel.classList.contains(this.ClassNames.hidden);
+        return !this.isAudio() && !this.controls.panel.classList.contains(this.ClassNames.show);
     },