From b5618de0bdd440dd8567ef1677dc4e514905dc0b Mon Sep 17 00:00:00 2001 From: Teng-Hui Zhu Date: Wed, 24 Aug 2011 11:16:07 -0700 Subject: The real fix for the video forward/back button. Since the code move to the /shadow part, revert the previous change c/130242 and put in this new change. bug:4598827 Change-Id: I6592050e198d2801d87ccc1558ceb2bf6dfc25d5 --- Source/WebCore/html/shadow/MediaControlRootElement.cpp | 2 ++ Source/WebCore/platform/android/RenderThemeAndroid.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'Source') diff --git a/Source/WebCore/html/shadow/MediaControlRootElement.cpp b/Source/WebCore/html/shadow/MediaControlRootElement.cpp index 23a25f5..e063c4c 100644 --- a/Source/WebCore/html/shadow/MediaControlRootElement.cpp +++ b/Source/WebCore/html/shadow/MediaControlRootElement.cpp @@ -131,6 +131,7 @@ PassRefPtr MediaControlRootElement::create(HTMLMediaEle if (ec) return 0; +#if !PLATFORM(ANDROID) // FIXME: Only create when needed RefPtr seekBackButton = MediaControlSeekBackButtonElement::create(mediaElement); controls->m_seekBackButton = seekBackButton.get(); @@ -144,6 +145,7 @@ PassRefPtr MediaControlRootElement::create(HTMLMediaEle panel->appendChild(seekForwardButton.release(), ec, true); if (ec) return 0; +#endif if (mediaElement->document()->page()->theme()->supportsClosedCaptioning()) { RefPtr toggleClosedCaptionsButton = MediaControlToggleClosedCaptionsButtonElement::create(mediaElement); diff --git a/Source/WebCore/platform/android/RenderThemeAndroid.cpp b/Source/WebCore/platform/android/RenderThemeAndroid.cpp index aed65f8..c6e3bc5 100644 --- a/Source/WebCore/platform/android/RenderThemeAndroid.cpp +++ b/Source/WebCore/platform/android/RenderThemeAndroid.cpp @@ -264,7 +264,7 @@ bool RenderThemeAndroid::shouldRenderMediaControlPart(ControlPart part, Element* case MediaSeekForwardButtonPart: return false; case MediaRewindButtonPart: - return false; + return mediaElement->movieLoadType() != MediaPlayer::LiveStream; case MediaReturnToRealtimeButtonPart: return mediaElement->movieLoadType() == MediaPlayer::LiveStream; case MediaFullscreenButtonPart: -- cgit v1.1