Title: [190936] releases/WebKitGTK/webkit-2.10
- Revision
- 190936
- Author
- [email protected]
- Date
- 2015-10-13 02:18:24 -0700 (Tue, 13 Oct 2015)
Log Message
Merge r190114 - Source/WebCore:
CurrentTime on mediaController is set as 0 when playback is completed.
https://bugs.webkit.org/show_bug.cgi?id=149154
Patch by sangdeug.kim <[email protected]> on 2015-09-22
Reviewed by Eric Carlson.
Test : media/media-controller-time-clamp.html
* html/MediaController.cpp:
(MediaController::setCurrentTime):
(MediaController::updatePlaybackState):
* html/MediaController.h:
LayoutTests:
Add test for checking currentTime of mediacontroller when playback is completed.
https://bugs.webkit.org/show_bug.cgi?id=149154
Patch by sangdeug.kim <[email protected]> on 2015-09-22
Reviewed by Eric Carlson.
* media/media-controller-time-clamp-expected.txt:
* media/media-controller-time-clamp.html:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (190935 => 190936)
--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-10-13 09:14:30 UTC (rev 190935)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-10-13 09:18:24 UTC (rev 190936)
@@ -1,3 +1,13 @@
+2015-09-22 sangdeug.kim <[email protected]>
+
+ Add test for checking currentTime of mediacontroller when playback is completed.
+ https://bugs.webkit.org/show_bug.cgi?id=149154
+
+ Reviewed by Eric Carlson.
+
+ * media/media-controller-time-clamp-expected.txt:
+ * media/media-controller-time-clamp.html:
+
2015-09-21 ChangSeok Oh <[email protected]>
[GTK] media controls does not show up when playing video finishes.
Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/media/media-controller-time-clamp-expected.txt (190935 => 190936)
--- releases/WebKitGTK/webkit-2.10/LayoutTests/media/media-controller-time-clamp-expected.txt 2015-10-13 09:14:30 UTC (rev 190935)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/media/media-controller-time-clamp-expected.txt 2015-10-13 09:18:24 UTC (rev 190936)
@@ -5,6 +5,7 @@
RUN(video.play())
RUN(controller.play())
EVENT(ended)
+EXPECTED (controller.currentTime > '0') OK
EXPECTED (controller.currentTime <= controller.duration == 'true') OK
END OF TEST
Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/media/media-controller-time-clamp.html (190935 => 190936)
--- releases/WebKitGTK/webkit-2.10/LayoutTests/media/media-controller-time-clamp.html 2015-10-13 09:14:30 UTC (rev 190935)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/media/media-controller-time-clamp.html 2015-10-13 09:18:24 UTC (rev 190936)
@@ -28,6 +28,7 @@
function ended() {
consoleWrite("EVENT(ended)");
+ testExpected("controller.currentTime", 0, ">");
testExpected("controller.currentTime <= controller.duration", true);
endTest();
}
@@ -36,4 +37,4 @@
<body _onload_="start()">
<video id="video" mediaGroup="group" controls></video>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (190935 => 190936)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-13 09:14:30 UTC (rev 190935)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-13 09:18:24 UTC (rev 190936)
@@ -1,3 +1,17 @@
+2015-09-22 sangdeug.kim <[email protected]>
+
+ CurrentTime on mediaController is set as 0 when playback is completed.
+ https://bugs.webkit.org/show_bug.cgi?id=149154
+
+ Reviewed by Eric Carlson.
+
+ Test : media/media-controller-time-clamp.html
+
+ * html/MediaController.cpp:
+ (MediaController::setCurrentTime):
+ (MediaController::updatePlaybackState):
+ * html/MediaController.h:
+
2015-09-21 Tim Horton <[email protected]>
svg/custom/hidpi-masking-clipping.svg fails with accelerated drawing on
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/html/MediaController.cpp (190935 => 190936)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/html/MediaController.cpp 2015-10-13 09:14:30 UTC (rev 190935)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/html/MediaController.cpp 2015-10-13 09:18:24 UTC (rev 190936)
@@ -174,6 +174,7 @@
m_mediaElements[index]->seek(MediaTime::createWithDouble(time));
scheduleTimeupdateEvent();
+ m_resetCurrentTimeInNextPlay = false;
}
void MediaController::unpause()
@@ -445,11 +446,15 @@
break;
case ENDED:
eventName = eventNames().endedEvent;
+ m_resetCurrentTimeInNextPlay = true;
m_clock->stop();
- m_clock->setCurrentTime(0);
m_timeupdateTimer.stop();
break;
case PLAYING:
+ if (m_resetCurrentTimeInNextPlay) {
+ m_resetCurrentTimeInNextPlay = false;
+ m_clock->setCurrentTime(0);
+ }
eventName = eventNames().playingEvent;
m_clock->start();
startTimeupdateTimer();
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/html/MediaController.h (190935 => 190936)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/html/MediaController.h 2015-10-13 09:14:30 UTC (rev 190935)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/html/MediaController.h 2015-10-13 09:18:24 UTC (rev 190936)
@@ -154,6 +154,7 @@
ScriptExecutionContext& m_scriptExecutionContext;
Timer m_timeupdateTimer;
double m_previousTimeupdateTime;
+ bool m_resetCurrentTimeInNextPlay { false };
};
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
