Changeset 190114 in webkit


Ignore:
Timestamp:
Sep 22, 2015 6:59:38 AM (9 years ago)
Author:
commit-queue@webkit.org
Message:

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 <​sangdeug.kim@samsung.com> 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 <​sangdeug.kim@samsung.com> on 2015-09-22
Reviewed by Eric Carlson.

  • media/media-controller-time-clamp-expected.txt:
  • media/media-controller-time-clamp.html:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r190110 r190114  
     12015-09-22  sangdeug.kim  <sangdeug.kim@samsung.com>
     2
     3        Add test for checking currentTime of mediacontroller when playback is completed.
     4        https://bugs.webkit.org/show_bug.cgi?id=149154
     5
     6        Reviewed by Eric Carlson.
     7
     8        * media/media-controller-time-clamp-expected.txt:
     9        * media/media-controller-time-clamp.html:
     10
    1112015-09-22  Saam barati  <sbarati@apple.com>
    212

  • trunk/LayoutTests/media/media-controller-time-clamp-expected.txt

    r158743 r190114  
    66RUN(controller.play())
    77EVENT(ended)
     8EXPECTED (controller.currentTime > '0') OK
    89EXPECTED (controller.currentTime <= controller.duration == 'true') OK
    910END OF TEST

  • trunk/LayoutTests/media/media-controller-time-clamp.html

    r119739 r190114  
    2929        function ended() {
    3030            consoleWrite("EVENT(ended)");
     31            testExpected("controller.currentTime", 0, ">");
    3132            testExpected("controller.currentTime <= controller.duration", true);
    3233            endTest();

  • trunk/Source/WebCore/ChangeLog

    r190113 r190114  
     12015-09-22  sangdeug.kim  <sangdeug.kim@samsung.com>
     2
     3        CurrentTime on mediaController is set as 0 when playback is completed.
     4        https://bugs.webkit.org/show_bug.cgi?id=149154
     5
     6        Reviewed by Eric Carlson.
     7
     8        Test : media/media-controller-time-clamp.html
     9
     10        * html/MediaController.cpp:
     11        (MediaController::setCurrentTime):
     12        (MediaController::updatePlaybackState):
     13        * html/MediaController.h:
     14
    1152015-09-22  Commit Queue  <commit-queue@webkit.org>
    216

  • trunk/Source/WebCore/html/MediaController.cpp

    r187706 r190114  
    175175
    176176    scheduleTimeupdateEvent();
     177    m_resetCurrentTimeInNextPlay = false;
    177178}
    178179
    … …  
    446447    case ENDED:
    447448        eventName = eventNames().endedEvent;
     449        m_resetCurrentTimeInNextPlay = true;
    448450        m_clock->stop();
    449         m_clock->setCurrentTime(0);
    450451        m_timeupdateTimer.stop();
    451452        break;
    452453    case PLAYING:
     454        if (m_resetCurrentTimeInNextPlay) {
     455            m_resetCurrentTimeInNextPlay = false;
     456            m_clock->setCurrentTime(0);
     457        }
    453458        eventName = eventNames().playingEvent;
    454459        m_clock->start();

  • trunk/Source/WebCore/html/MediaController.h

    r187706 r190114  
    155155    Timer m_timeupdateTimer;
    156156    double m_previousTimeupdateTime;
     157    bool m_resetCurrentTimeInNextPlay { false };
    157158};
    158159
Note: See TracChangeset for help on using the changeset viewer.