diff options
author | Teng-Hui Zhu <ztenghui@google.com> | 2011-08-24 11:16:07 -0700 |
---|---|---|
committer | Teng-Hui Zhu <ztenghui@google.com> | 2011-08-24 11:16:07 -0700 |
commit | b5618de0bdd440dd8567ef1677dc4e514905dc0b (patch) | |
tree | 23b5339921cf5eadfec5be3c77949654f43fd330 | |
parent | 03bf81b42efaff1c4185f7e9570d1abb0475e7ef (diff) | |
download | external_webkit-b5618de0bdd440dd8567ef1677dc4e514905dc0b.zip external_webkit-b5618de0bdd440dd8567ef1677dc4e514905dc0b.tar.gz external_webkit-b5618de0bdd440dd8567ef1677dc4e514905dc0b.tar.bz2 |
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
-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: |