Title: [87970] branches/safari-534-branch/Source/WebCore
Diff
Modified: branches/safari-534-branch/Source/WebCore/ChangeLog (87969 => 87970)
--- branches/safari-534-branch/Source/WebCore/ChangeLog 2011-06-03 00:30:58 UTC (rev 87969)
+++ branches/safari-534-branch/Source/WebCore/ChangeLog 2011-06-03 00:42:10 UTC (rev 87970)
@@ -1,3 +1,21 @@
+2011-06-02 Lucas Forschler <[email protected]>
+
+ Merged 87703.
+
+ 2011-05-30 Jer Noble <[email protected]>
+
+ 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 Mark Rowe <[email protected]>
Merge r87692.
Modified: branches/safari-534-branch/Source/WebCore/html/shadow/MediaControlRootElement.cpp (87969 => 87970)
--- branches/safari-534-branch/Source/WebCore/html/shadow/MediaControlRootElement.cpp 2011-06-03 00:30:58 UTC (rev 87969)
+++ branches/safari-534-branch/Source/WebCore/html/shadow/MediaControlRootElement.cpp 2011-06-03 00:42:10 UTC (rev 87970)
@@ -310,6 +310,8 @@
m_toggleClosedCaptionsButton->hide();
}
+ m_playButton->updateDisplayType();
+
#if ENABLE(FULLSCREEN_API)
if (document()->webkitIsFullScreen() && document()->webkitCurrentFullScreenElement() == m_mediaElement) {
if (m_mediaElement->movieLoadType() == MediaPlayer::LiveStream) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
