Changeset 139598 in webkit


Ignore:
Timestamp:
Jan 14, 2013 2:15:25 AM (11 years ago)
Author:
tommyw@google.com
Message:

MediaStream API: Change MediaStream::readyState to an boolean attribute called ended.
​https://bugs.webkit.org/show_bug.cgi?id=106568

Reviewed by Adam Barth.

Source/WebCore:

See specification: ​http://dev.w3.org/2011/webrtc/editor/getusermedia.html

Existings tests updated to cover patch.

  • Modules/mediastream/LocalMediaStream.cpp:

(WebCore::LocalMediaStream::stop):

  • Modules/mediastream/MediaStream.cpp:

(WebCore::MediaStream::ended):
(WebCore::MediaStream::streamEnded):

  • Modules/mediastream/MediaStream.h:

(MediaStream):
(WebCore::MediaStream::isLocal):

  • Modules/mediastream/MediaStream.idl:
  • Modules/mediastream/MediaStreamTrackList.cpp:

(WebCore::MediaStreamTrackList::add):
(WebCore::MediaStreamTrackList::remove):

LayoutTests:

  • fast/mediastream/LocalMediaStream-onended-expected.txt:
  • fast/mediastream/LocalMediaStream-onended.html:
Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r139596 r139598  
     12013-01-14  Tommy Widenflycht  <tommyw@google.com>
     2
     3        MediaStream API: Change MediaStream::readyState to an boolean attribute called ended.
     4        https://bugs.webkit.org/show_bug.cgi?id=106568
     5
     6        Reviewed by Adam Barth.
     7
     8        * fast/mediastream/LocalMediaStream-onended-expected.txt:
     9        * fast/mediastream/LocalMediaStream-onended.html:
     10
    1112013-01-14  Andrei Bucur  <abucur@adobe.com>
    212

  • trunk/LayoutTests/fast/mediastream/LocalMediaStream-onended-expected.txt

    r117102 r139598  
    44
    55
     6PASS stream.ended is false
    67PASS streamEnded was called.
     8PASS stream.ended is true
    79PASS successfullyParsed is true
    810

  • trunk/LayoutTests/fast/mediastream/LocalMediaStream-onended.html

    r117102 r139598  
    2525}
    2626
     27var stream;
     28
    2729function streamEnded() {
    2830    testPassed('streamEnded was called.');
     31    shouldBeTrue('stream.ended');
    2932    finishJSTest();
    3033}
    … …  
    3235function gotStream(s) {
    3336    stream = s;
     37    shouldBeFalse('stream.ended');
    3438    try {
    3539        stream.onended = streamEnded;

  • trunk/Source/WebCore/ChangeLog

    r139597 r139598  
     12013-01-14  Tommy Widenflycht  <tommyw@google.com>
     2
     3        MediaStream API: Change MediaStream::readyState to an boolean attribute called ended.
     4        https://bugs.webkit.org/show_bug.cgi?id=106568
     5
     6        Reviewed by Adam Barth.
     7
     8        See specification: http://dev.w3.org/2011/webrtc/editor/getusermedia.html
     9
     10        Existings tests updated to cover patch.
     11
     12        * Modules/mediastream/LocalMediaStream.cpp:
     13        (WebCore::LocalMediaStream::stop):
     14        * Modules/mediastream/MediaStream.cpp:
     15        (WebCore::MediaStream::ended):
     16        (WebCore::MediaStream::streamEnded):
     17        * Modules/mediastream/MediaStream.h:
     18        (MediaStream):
     19        (WebCore::MediaStream::isLocal):
     20        * Modules/mediastream/MediaStream.idl:
     21        * Modules/mediastream/MediaStreamTrackList.cpp:
     22        (WebCore::MediaStreamTrackList::add):
     23        (WebCore::MediaStreamTrackList::remove):
     24
    1252013-01-14  Alexander Pavlov  <apavlov@chromium.org>
    226

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

    r116317 r139598  
    5151void LocalMediaStream::stop()
    5252{
    53     if (readyState() == ENDED)
     53    if (ended())
    5454        return;
    5555

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

    r138354 r139598  
    132132}
    133133
    134 MediaStream::ReadyState MediaStream::readyState() const
    135 {
    136     return m_descriptor->ended() ? ENDED : LIVE;
     134bool MediaStream::ended() const
     135{
     136    return m_descriptor->ended();
    137137}
    138138
    139139void MediaStream::streamEnded()
    140140{
    141     if (readyState() == ENDED)
     141    if (ended())
    142142        return;
    143143

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

    r139352 r139598  
    4040class MediaStream : public RefCounted<MediaStream>, public MediaStreamDescriptorClient, public EventTarget, public ContextDestructionObserver {
    4141public:
    42     enum ReadyState {
    43         LIVE = 1,
    44         ENDED = 2
    45     };
    46 
    4742    static PassRefPtr<MediaStream> create(ScriptExecutionContext*);
    4843    static PassRefPtr<MediaStream> create(ScriptExecutionContext*, PassRefPtr<MediaStream>);
    … …  
    5045    static PassRefPtr<MediaStream> create(ScriptExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
    5146    virtual ~MediaStream();
    52 
    53     DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);
    54 
    55     ReadyState readyState() const;
    5647
    5748    // DEPRECATED
    … …  
    6354    MediaStreamTrackList* videoTracks() { return m_videoTracks.get(); }
    6455
    65     virtual bool isLocal() const { return false; }
     56    bool ended() const;
     57
     58    DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);
    6659
    6760    // MediaStreamDescriptorClient
    6861    virtual void streamEnded() OVERRIDE;
     62
     63    virtual bool isLocal() const { return false; }
    6964
    7065    MediaStreamDescriptor* descriptor() const { return m_descriptor.get(); }

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

    r139352 r139598  
    4040    readonly attribute MediaStreamTrackList videoTracks;
    4141
    42     const unsigned short LIVE = 1;
    43     const unsigned short ENDED = 2;
    44     readonly attribute unsigned short readyState;
    45              attribute EventListener onended;
     42    readonly attribute boolean ended;
     43
     44    attribute EventListener onended;
    4645
    4746    // EventTarget interface

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

    r134440 r139598  
    7474void MediaStreamTrackList::add(PassRefPtr<MediaStreamTrack> prpTrack, ExceptionCode& ec)
    7575{
    76     if (!m_owner || m_owner->readyState() == MediaStream::ENDED) {
     76    if (!m_owner || m_owner->ended()) {
    7777        ec = INVALID_STATE_ERR;
    7878        return;
    … …  
    9999void MediaStreamTrackList::remove(PassRefPtr<MediaStreamTrack> prpTrack, ExceptionCode& ec)
    100100{
    101     if (!m_owner || m_owner->readyState() == MediaStream::ENDED) {
     101    if (!m_owner || m_owner->ended()) {
    102102        ec = INVALID_STATE_ERR;
    103103        return;
    … …  
    125125void MediaStreamTrackList::remove(MediaStreamComponent* component)
    126126{
    127     if (!m_owner || m_owner->readyState() == MediaStream::ENDED)
     127    if (!m_owner || m_owner->ended())
    128128        return;
    129129
Note: See TracChangeset for help on using the changeset viewer.