Title: [87571] branches/safari-534-branch/Source/WebCore
- Revision
- 87571
- Author
- mr...@apple.com
- Date
- 2011-05-27 14:33:11 -0700 (Fri, 27 May 2011)
Log Message
Merge r87557.
Modified Paths
Diff
Modified: branches/safari-534-branch/Source/WebCore/ChangeLog (87570 => 87571)
--- branches/safari-534-branch/Source/WebCore/ChangeLog 2011-05-27 21:25:30 UTC (rev 87570)
+++ branches/safari-534-branch/Source/WebCore/ChangeLog 2011-05-27 21:33:11 UTC (rev 87571)
@@ -1,5 +1,22 @@
2011-05-27 Mark Rowe <mr...@apple.com>
+ Merge r87557.
+
+ 2011-05-27 Jer Noble <jer.no...@apple.com>
+
+ Reviewed by Maciej Stachowiak.
+
+ 30 second rewind button obscured in fullscreen controller
+ https://bugs.webkit.org/show_bug.cgi?id=61663
+
+ If reset() is called while in full-screen mode, make sure to show and hide
+ the correct controls for that mode.
+
+ * html/shadow/MediaControlRootElement.cpp:
+ (WebCore::MediaControlRootElement::reset):
+
+2011-05-27 Mark Rowe <mr...@apple.com>
+
Merge r87414.
2011-05-25 Jer Noble <jer.no...@apple.com>
Modified: branches/safari-534-branch/Source/WebCore/html/shadow/MediaControlRootElement.cpp (87570 => 87571)
--- branches/safari-534-branch/Source/WebCore/html/shadow/MediaControlRootElement.cpp 2011-05-27 21:25:30 UTC (rev 87570)
+++ branches/safari-534-branch/Source/WebCore/html/shadow/MediaControlRootElement.cpp 2011-05-27 21:33:11 UTC (rev 87571)
@@ -305,6 +305,21 @@
m_toggleClosedCaptionsButton->hide();
}
+#if ENABLE(FULLSCREEN_API)
+ if (document()->webkitIsFullScreen() && document()->webkitCurrentFullScreenElement() == m_mediaElement) {
+ if (m_mediaElement->movieLoadType() == MediaPlayer::LiveStream) {
+ m_seekBackButton->hide();
+ m_seekForwardButton->hide();
+ m_rewindButton->show();
+ m_returnToRealTimeButton->show();
+ } else {
+ m_seekBackButton->show();
+ m_seekForwardButton->show();
+ m_rewindButton->hide();
+ m_returnToRealTimeButton->hide();
+ }
+ } else
+#endif
if (m_mediaElement->movieLoadType() != MediaPlayer::LiveStream) {
m_returnToRealTimeButton->hide();
m_rewindButton->show();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
