Changeset 84611 in webkit

Timestamp:

Apr 22, 2011 1:31:42 AM (13 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/9322486> REGRESSION (r83397): Default controls fade out when playing audio-only media
​https://bugs.webkit.org/show_bug.cgi?id=59180

Reviewed by Maciej Stachowiak.

Source/WebCore:

Test: media/audio-controls-do-not-fade-out.html

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::playbackProgressTimerFired): Only start fading out the controls if there is
a video track.

LayoutTests:

• media/audio-controls-do-not-fade-out-expected.txt: Added.
• media/audio-controls-do-not-fade-out.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/audio-controls-do-not-fade-out-expected.txt (added)
• LayoutTests/media/audio-controls-do-not-fade-out.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-22  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        <rdar://problem/9322486> REGRESSION (r83397): Default controls fade out when playing audio-only media
+        https://bugs.webkit.org/show_bug.cgi?id=59180
+
+        * media/audio-controls-do-not-fade-out-expected.txt: Added.
+        * media/audio-controls-do-not-fade-out.html: Added.
+
 2011-04-22  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-22  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        <rdar://problem/9322486> REGRESSION (r83397): Default controls fade out when playing audio-only media
+        https://bugs.webkit.org/show_bug.cgi?id=59180
+
+        Test: media/audio-controls-do-not-fade-out.html
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::playbackProgressTimerFired): Only start fading out the controls if there is
+        a video track.
+
 2011-04-22  Luke Macpherson   <macpherson@chromium.org>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -1616 +1616 @@
     scheduleTimeupdateEvent(true);
     if (hasMediaControls()) {
-        if (!m_mouseOver && controls())
+        if (!m_mouseOver && controls() && hasVideo())
             mediaControls()->makeTransparent();
         mediaControls()->playbackProgressed();