Title: [123567] trunk
- Revision
- 123567
- Author
- [email protected]
- Date
- 2012-07-24 19:31:27 -0700 (Tue, 24 Jul 2012)
Log Message
setting playbackRate on a MediaController doesn't change the playbackRate for slaved media
https://bugs.webkit.org/show_bug.cgi?id=92035
Reviewed by Darin Adler.
Source/WebCore:
Allow updatePlaybackRate() to change the MediaPlayer rate when the media element has a
current media controller.
Test: media/media-controller-playbackrate.html
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::updatePlaybackRate):
LayoutTests:
* media/media-controller-playbackrate-expected.txt: Added.
* media/media-controller-playbackrate.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (123566 => 123567)
--- trunk/LayoutTests/ChangeLog 2012-07-25 02:13:53 UTC (rev 123566)
+++ trunk/LayoutTests/ChangeLog 2012-07-25 02:31:27 UTC (rev 123567)
@@ -1,3 +1,13 @@
+2012-07-24 Jer Noble <[email protected]>
+
+ setting playbackRate on a MediaController doesn't change the playbackRate for slaved media
+ https://bugs.webkit.org/show_bug.cgi?id=92035
+
+ Reviewed by Darin Adler.
+
+ * media/media-controller-playbackrate-expected.txt: Added.
+ * media/media-controller-playbackrate.html: Added.
+
2012-07-24 Alexis Menard <[email protected]>
[Qt] svg/as-border-image, svg/as-image, svg/as-object, svg/css rebaseline after new test fonts.
Added: trunk/LayoutTests/media/media-controller-playbackrate-expected.txt (0 => 123567)
--- trunk/LayoutTests/media/media-controller-playbackrate-expected.txt (rev 0)
+++ trunk/LayoutTests/media/media-controller-playbackrate-expected.txt 2012-07-25 02:31:27 UTC (rev 123567)
@@ -0,0 +1,6 @@
+EVENT(canplay)
+EVENT(play)
+EVENT(timeupdate)
+EXPECTED (video.currentTime != '0') OK
+END OF TEST
+
Added: trunk/LayoutTests/media/media-controller-playbackrate.html (0 => 123567)
--- trunk/LayoutTests/media/media-controller-playbackrate.html (rev 0)
+++ trunk/LayoutTests/media/media-controller-playbackrate.html 2012-07-25 02:31:27 UTC (rev 123567)
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <script src=""
+ <script src=""
+ <script>
+ var start = function() {
+ findMediaElement();
+ waitForEvent('canplay',canplay);
+ video.src = "" 'content/test');
+ };
+
+ var canplay = function() {
+ video.mediaGroup = "group";
+ video.playbackRate = 0;
+ video.defaultPlaybackRate = 0;
+ video.controller.playbackRate = 0;
+ video.controller.defaultPlaybackRate = 0;
+ waitForEvent('play', play);
+ video.play();
+ };
+
+ var play = function() {
+ video.controller.playbackRate = 2;
+ waitForEventOnce('timeupdate', timeupdate);
+ };
+
+ var timeupdate = function() {
+ testExpected('video.currentTime', 0, '!=');
+ endTest();
+ };
+ </script>
+ </head>
+ <body _onload_="start()">
+ <video controls></video>
+ </body>
+</html>
\ No newline at end of file
Modified: trunk/Source/WebCore/ChangeLog (123566 => 123567)
--- trunk/Source/WebCore/ChangeLog 2012-07-25 02:13:53 UTC (rev 123566)
+++ trunk/Source/WebCore/ChangeLog 2012-07-25 02:31:27 UTC (rev 123567)
@@ -1,3 +1,18 @@
+2012-07-24 Jer Noble <[email protected]>
+
+ setting playbackRate on a MediaController doesn't change the playbackRate for slaved media
+ https://bugs.webkit.org/show_bug.cgi?id=92035
+
+ Reviewed by Darin Adler.
+
+ Allow updatePlaybackRate() to change the MediaPlayer rate when the media element has a
+ current media controller.
+
+ Test: media/media-controller-playbackrate.html
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::updatePlaybackRate):
+
2012-07-24 Hayato Ito <[email protected]>
Rename FocusScope to FocusNavigationScope.
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (123566 => 123567)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2012-07-25 02:13:53 UTC (rev 123566)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2012-07-25 02:31:27 UTC (rev 123567)
@@ -2200,7 +2200,7 @@
void HTMLMediaElement::updatePlaybackRate()
{
float effectiveRate = m_mediaController ? m_mediaController->playbackRate() : m_playbackRate;
- if (m_player && potentiallyPlaying() && m_player->rate() != effectiveRate && !m_mediaController)
+ if (m_player && potentiallyPlaying() && m_player->rate() != effectiveRate)
m_player->setRate(effectiveRate);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
