summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-08-24 13:07:49 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-24 13:07:49 -0700
commit58e496cb1af06fa0e2854172cd14edd42348906e (patch)
tree38a0dab3f471a8aa803bbc332b1da6f138b6c68e /Source/WebCore/platform
parent5a1bad665e3c27495e4ccb9a73996ce3a84b0a26 (diff)
parentb5618de0bdd440dd8567ef1677dc4e514905dc0b (diff)
downloadexternal_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/WebCore/platform')
-rw-r--r--Source/WebCore/platform/android/RenderThemeAndroid.cpp2
1 files changed, 1 insertions, 1 deletions
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: