Title: [118431] branches/safari-536-branch
- Revision
- 118431
- Author
- [email protected]
- Date
- 2012-05-24 15:25:19 -0700 (Thu, 24 May 2012)
Log Message
Merged r118204 -> <rdar://problem/11510388>
Modified Paths
Added Paths
Diff
Modified: branches/safari-536-branch/LayoutTests/ChangeLog (118430 => 118431)
--- branches/safari-536-branch/LayoutTests/ChangeLog 2012-05-24 22:22:44 UTC (rev 118430)
+++ branches/safari-536-branch/LayoutTests/ChangeLog 2012-05-24 22:25:19 UTC (rev 118431)
@@ -1,5 +1,19 @@
2012-05-24 Lucas Forschler <[email protected]>
+ Merge 118204
+
+ 2012-05-22 Jer Noble <[email protected]>
+
+ PlatformClockCM has uninitialized m_rate member.
+ https://bugs.webkit.org/show_bug.cgi?id=87217
+
+ Reviewed by Eric Carlson.
+
+ * media/media-controller-time-expected.txt: Added.
+ * media/media-controller-time.html: Added.
+
+2012-05-24 Lucas Forschler <[email protected]>
+
Merge 117869
2012-05-21 Anders Carlsson <[email protected]>
Copied: branches/safari-536-branch/LayoutTests/media/media-controller-time-expected.txt (from rev 118204, trunk/LayoutTests/media/media-controller-time-expected.txt) (0 => 118431)
--- branches/safari-536-branch/LayoutTests/media/media-controller-time-expected.txt (rev 0)
+++ branches/safari-536-branch/LayoutTests/media/media-controller-time-expected.txt 2012-05-24 22:25:19 UTC (rev 118431)
@@ -0,0 +1,8 @@
+RUN(controller = video.controller)
+EVENT(canplaythrough)
+RUN(video.play())
+RUN(controller.play())
+EVENT(playing)
+EXPECTED (controller.currentTime > '0') OK
+END OF TEST
+
Copied: branches/safari-536-branch/LayoutTests/media/media-controller-time.html (from rev 118204, trunk/LayoutTests/media/media-controller-time.html) (0 => 118431)
--- branches/safari-536-branch/LayoutTests/media/media-controller-time.html (rev 0)
+++ branches/safari-536-branch/LayoutTests/media/media-controller-time.html 2012-05-24 22:25:19 UTC (rev 118431)
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <script src=""
+ <script src=""
+
+ <script>
+ var controller;
+ var video;
+
+ function start() {
+ video = document.getElementById('video');
+ run('controller = video.controller');
+ controller.addEventListener('canplaythrough', canplaythrough, true);
+ var src = "" 'content/test');
+ video.src = ""
+ }
+
+ function canplaythrough() {
+ consoleWrite("EVENT(canplaythrough)");
+ controller.removeEventListener('canplaythrough', canplaythrough, true);
+ run('video.play()');
+ controller.addEventListener('playing', playing, true);
+ run('controller.play()');
+ }
+
+ function playing() {
+ consoleWrite("EVENT(playing)");
+ controller.removeEventListener('playing', playing, true);
+ setTimeout(function () {
+ testExpected("controller.currentTime", 0, ">");
+ endTest();
+ }, 100);
+ }
+ </script>
+ </head>
+ <body _onload_="start()">
+ <video id="video" mediaGroup="group" controls></video>
+ </body>
+</html>
\ No newline at end of file
Modified: branches/safari-536-branch/Source/WebCore/ChangeLog (118430 => 118431)
--- branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-24 22:22:44 UTC (rev 118430)
+++ branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-24 22:25:19 UTC (rev 118431)
@@ -1,5 +1,24 @@
2012-05-24 Lucas Forschler <[email protected]>
+ Merge 118204
+
+ 2012-05-22 Jer Noble <[email protected]>
+
+ PlatformClockCM has uninitialized m_rate member.
+ https://bugs.webkit.org/show_bug.cgi?id=87217
+
+ Reviewed by Eric Carlson.
+
+ Test: media/media-controller-time.html
+
+ Initialize the m_rate member to a default of 1 (second-per-second), matching the implementation
+ of ClockGeneric.
+
+ * platform/mac/PlatformClockCM.mm:
+ (PlatformClockCM::PlatformClockCM):
+
+2012-05-24 Lucas Forschler <[email protected]>
+
Merge 118086
2012-05-22 Tim Horton <[email protected]>
Modified: branches/safari-536-branch/Source/WebCore/platform/mac/PlatformClockCM.mm (118430 => 118431)
--- branches/safari-536-branch/Source/WebCore/platform/mac/PlatformClockCM.mm 2012-05-24 22:22:44 UTC (rev 118430)
+++ branches/safari-536-branch/Source/WebCore/platform/mac/PlatformClockCM.mm 2012-05-24 22:25:19 UTC (rev 118431)
@@ -50,6 +50,7 @@
PlatformClockCM::PlatformClockCM()
: m_timebase(0)
+ , m_rate(1)
, m_running(false)
{
CMClockRef rawClockPtr = 0;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
