diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-08-24 13:07:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-24 13:07:49 -0700 |
| commit | 58e496cb1af06fa0e2854172cd14edd42348906e (patch) | |
| tree | 38a0dab3f471a8aa803bbc332b1da6f138b6c68e /Source | |
| parent | 5a1bad665e3c27495e4ccb9a73996ce3a84b0a26 (diff) | |
| parent | b5618de0bdd440dd8567ef1677dc4e514905dc0b (diff) | |
| download | external_webkit-58e496cb1af06fa0e2854172cd14edd42348906e.zip external_webkit-58e496cb1af06fa0e2854172cd14edd42348906e.tar.gz external_webkit-58e496cb1af06fa0e2854172cd14edd42348906e.tar.bz2 | |
Merge "The real fix for the video forward/back button."
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/html/shadow/MediaControlRootElement.cpp | 2 | ||||
| -rw-r--r-- | Source/WebCore/platform/android/RenderThemeAndroid.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
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> MediaControlRootElement::create(HTMLMediaEle if (ec) return 0; +#if !PLATFORM(ANDROID) // FIXME: Only create when needed <http://webkit.org/b/57163> RefPtr<MediaControlSeekBackButtonElement> seekBackButton = MediaControlSeekBackButtonElement::create(mediaElement); controls->m_seekBackButton = seekBackButton.get(); @@ -144,6 +145,7 @@ PassRefPtr<MediaControlRootElement> MediaControlRootElement::create(HTMLMediaEle panel->appendChild(seekForwardButton.release(), ec, true); if (ec) return 0; +#endif if (mediaElement->document()->page()->theme()->supportsClosedCaptioning()) { RefPtr<MediaControlToggleClosedCaptionsButtonElement> 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: |