summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/html
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-08-24 11:16:07 -0700
committerTeng-Hui Zhu <ztenghui@google.com>2011-08-24 11:16:07 -0700
commitb5618de0bdd440dd8567ef1677dc4e514905dc0b (patch)
tree23b5339921cf5eadfec5be3c77949654f43fd330 /Source/WebCore/html
parent03bf81b42efaff1c4185f7e9570d1abb0475e7ef (diff)
downloadexternal_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
Diffstat (limited to 'Source/WebCore/html')
-rw-r--r--Source/WebCore/html/shadow/MediaControlRootElement.cpp2
1 files changed, 2 insertions, 0 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);