Changeset 139618 in webkit


Ignore:
Timestamp:
Jan 14, 2013 9:28:55 AM (11 years ago)
Author:
tommyw@google.com
Message:

MediaStream API: Update MediaStreamTrack::readyState to match specification
​https://bugs.webkit.org/show_bug.cgi?id=106781

Reviewed by Adam Barth.

Source/WebCore:

MediaStreamTrack::readyState now returns a string like the rest of the RTC classes.

Existing tests expanded to cover patch.

  • Modules/mediastream/MediaStream.cpp:

(WebCore::processTrack):

  • Modules/mediastream/MediaStreamTrack.cpp:

(WebCore::MediaStreamTrack::readyState):
(WebCore::MediaStreamTrack::ended):
(WebCore):

  • Modules/mediastream/MediaStreamTrack.h:

(MediaStreamTrack):

  • Modules/mediastream/MediaStreamTrack.idl:

LayoutTests:

  • fast/mediastream/MediaStreamTrack-expected.txt:
  • fast/mediastream/MediaStreamTrack.html:
Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r139617 r139618  
     12013-01-14  Tommy Widenflycht  <tommyw@google.com>
     2
     3        MediaStream API: Update MediaStreamTrack::readyState to match specification
     4        https://bugs.webkit.org/show_bug.cgi?id=106781
     5
     6        Reviewed by Adam Barth.
     7
     8        * fast/mediastream/MediaStreamTrack-expected.txt:
     9        * fast/mediastream/MediaStreamTrack.html:
     10
    1112013-01-14  Andrey Lushnikov  <lushnikov@chromium.org>
    212

  • trunk/LayoutTests/fast/mediastream/MediaStreamTrack-expected.txt

    r123627 r139618  
    55
    66PASS getUserMedia succeeded.
     7PASS track.readyState is "live"
    78PASS Track onmute callback succeeded.
     9PASS track.readyState is "muted"
    810PASS Track onunmute callback succeeded.
     11PASS track.readyState is "live"
    912PASS Track onended callback succeeded.
     13PASS track.readyState is "ended"
    1014PASS successfullyParsed is true
    1115

  • trunk/LayoutTests/fast/mediastream/MediaStreamTrack.html

    r139611 r139618  
    3535    testPassed('Track onended callback succeeded.');
    3636
     37    shouldBeEqualToString('track.readyState', 'ended');
     38
    3739    finishJSTest();
    3840}
    … …  
    4143    testPassed('Track onunmute callback succeeded.');
    4244
     45    shouldBeEqualToString('track.readyState', 'live');
     46
    4347    stream.stop();
    4448}
    … …  
    4650function onTrackMute() {
    4751    testPassed('Track onmute callback succeeded.');
     52
     53    shouldBeEqualToString('track.readyState', 'muted');
    4854
    4955    track.enabled = true;
    … …  
    5561    stream = s;
    5662    track = stream.getVideoTracks()[0];
     63
     64    shouldBeEqualToString('track.readyState', 'live');
    5765
    5866    track.onunmute = onTrackUnmute;

  • trunk/Source/WebCore/ChangeLog

    r139616 r139618  
     12013-01-14  Tommy Widenflycht  <tommyw@google.com>
     2
     3        MediaStream API: Update MediaStreamTrack::readyState to match specification
     4        https://bugs.webkit.org/show_bug.cgi?id=106781
     5
     6        Reviewed by Adam Barth.
     7
     8        MediaStreamTrack::readyState now returns a string like the rest of the RTC classes.
     9
     10        Existing tests expanded to cover patch.
     11
     12        * Modules/mediastream/MediaStream.cpp:
     13        (WebCore::processTrack):
     14        * Modules/mediastream/MediaStreamTrack.cpp:
     15        (WebCore::MediaStreamTrack::readyState):
     16        (WebCore::MediaStreamTrack::ended):
     17        (WebCore):
     18        * Modules/mediastream/MediaStreamTrack.h:
     19        (MediaStreamTrack):
     20        * Modules/mediastream/MediaStreamTrack.idl:
     21
    1222013-01-14  Vsevolod Vlasov  <vsevik@chromium.org>
    223

  • trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp

    r139611 r139618  
    4949static void processTrack(MediaStreamTrack* track, MediaStreamSourceVector& sourceVector)
    5050{
    51     if (track->readyState() == MediaStreamTrack::ENDED)
     51    if (track->ended())
    5252        return;
    5353

  • trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp

    r139352 r139618  
    100100}
    101101
    102 MediaStreamTrack::ReadyState MediaStreamTrack::readyState() const
     102String MediaStreamTrack::readyState() const
    103103{
    104104    if (m_stopped)
    105         return ENDED;
     105        return ASCIILiteral("ended");
    106106
    107107    switch (m_component->source()->readyState()) {
    108108    case MediaStreamSource::ReadyStateLive:
    109         return LIVE;
     109        return ASCIILiteral("live");
    110110    case MediaStreamSource::ReadyStateMuted:
    111         return MUTED;
     111        return ASCIILiteral("muted");
    112112    case MediaStreamSource::ReadyStateEnded:
    113         return ENDED;
     113        return ASCIILiteral("ended");
    114114    }
    115115
    116116    ASSERT_NOT_REACHED();
    117     return ENDED;
     117    return String();
    118118}
     119
     120bool MediaStreamTrack::ended() const
     121{
     122    return m_stopped || (m_component->source()->readyState() == MediaStreamSource::ReadyStateEnded);
     123}
     124
    119125
    120126void MediaStreamTrack::sourceChangedState()

  • trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h

    r139352 r139618  
    4444class MediaStreamTrack : public RefCounted<MediaStreamTrack>, public ActiveDOMObject, public EventTarget, public MediaStreamSource::Observer {
    4545public:
    46     enum ReadyState {
    47         LIVE = 0,
    48         MUTED = 1,
    49         ENDED = 2
    50     };
    51 
    5246    static PassRefPtr<MediaStreamTrack> create(ScriptExecutionContext*, PassRefPtr<MediaStreamDescriptor>, MediaStreamComponent*);
    5347    virtual ~MediaStreamTrack();
    … …  
    6054    void setEnabled(bool);
    6155
    62     ReadyState readyState() const;
     56    String readyState() const;
    6357
    6458    DEFINE_ATTRIBUTE_EVENT_LISTENER(mute);
    … …  
    6862    MediaStreamDescriptor* streamDescriptor();
    6963    MediaStreamComponent* component();
     64    bool ended() const;
    7065
    7166    // EventTarget

  • trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl

    r139352 r139618  
    3333             attribute boolean enabled;
    3434
    35     const unsigned short LIVE = 0;
    36     const unsigned short MUTED = 1;
    37     const unsigned short ENDED = 2;
    38     readonly attribute unsigned short readyState;
     35    readonly attribute DOMString readyState;
    3936
    4037    attribute EventListener onmute;
Note: See TracChangeset for help on using the changeset viewer.