2011-05-30 Jer Noble <jer.noble@apple.com>

        Reviewed by Dan Bernstein.

        Play/Pause button in wrong state when entering full screen on Vimeo
        https://bugs.webkit.org/show_bug.cgi?id=61754

        Update the play/pause button inside reset().  This ensures the button is in
        the correct state when the controls are created after playback has already
        started.

        * html/shadow/MediaControlRootElement.cpp:
        (WebCore::MediaControlRootElement::reset):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@87703 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index e2ea0a9..3d4de4b 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-05-30  Jer Noble  <jer.noble@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Play/Pause button in wrong state when entering full screen on Vimeo
+        https://bugs.webkit.org/show_bug.cgi?id=61754
+
+        Update the play/pause button inside reset().  This ensures the button is in
+        the correct state when the controls are created after playback has already
+        started.
+
+        * html/shadow/MediaControlRootElement.cpp:
+        (WebCore::MediaControlRootElement::reset):
+
 2011-05-30  No'am Rosenthal  <noam.rosenthal@nokia.com>
 
         Reviewed by Simon Hausmann.

diff --git a/Source/WebCore/html/shadow/MediaControlRootElement.cpp b/Source/WebCore/html/shadow/MediaControlRootElement.cpp
index 4458d4d..42360f0 100644 (file)
--- a/Source/WebCore/html/shadow/MediaControlRootElement.cpp
+++ b/Source/WebCore/html/shadow/MediaControlRootElement.cpp
@@ -310,6 +310,8 @@ void MediaControlRootElement::reset()
             m_toggleClosedCaptionsButton->hide();
     }
 
+    m_playButton->updateDisplayType();
+
 #if ENABLE(FULLSCREEN_API)
     if (document()->webkitIsFullScreen() && document()->webkitCurrentFullScreenElement() == m_mediaElement) {
         if (m_mediaElement->movieLoadType() == MediaPlayer::LiveStream) {