Changeset 139696 in webkit


Ignore:
Timestamp:
Jan 14, 2013 5:36:32 PM (11 years ago)
Author:
leviw@chromium.org
Message:

Source/WebCore: Rolling out r139618. Appears to be causing sporadic crashes on Debug bots.

  • Modules/mediastream/MediaStream.cpp:

(WebCore::processTrack):

  • Modules/mediastream/MediaStreamTrack.cpp:

(WebCore::MediaStreamTrack::readyState):

  • Modules/mediastream/MediaStreamTrack.h:
  • Modules/mediastream/MediaStreamTrack.idl:

LayoutTests: Speculatively rolling out r139618. Appears to be causing sporadic crashes on Debug bots.

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

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r139692 r139696  
     12013-01-14  Levi Weintraub  <leviw@chromium.org>
     2
     3        Speculatively rolling out r139618. Appears to be causing sporadic crashes on Debug bots.
     4
     5        * fast/mediastream/MediaStreamTrack-expected.txt:
     6        * fast/mediastream/MediaStreamTrack.html:
     7
    182013-01-14  Dima Gorbik  <dgorbik@apple.com>
    29

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

    r139618 r139696  
    55
    66PASS getUserMedia succeeded.
    7 PASS track.readyState is "live"
    87PASS Track onmute callback succeeded.
    9 PASS track.readyState is "muted"
    108PASS Track onunmute callback succeeded.
    11 PASS track.readyState is "live"
    129PASS Track onended callback succeeded.
    13 PASS track.readyState is "ended"
    1410PASS successfullyParsed is true
    1511

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

    r139618 r139696  
    3535    testPassed('Track onended callback succeeded.');
    3636
    37     shouldBeEqualToString('track.readyState', 'ended');
    38 
    3937    finishJSTest();
    4038}
    … …  
    4341    testPassed('Track onunmute callback succeeded.');
    4442
    45     shouldBeEqualToString('track.readyState', 'live');
    46 
    4743    stream.stop();
    4844}
    … …  
    5046function onTrackMute() {
    5147    testPassed('Track onmute callback succeeded.');
    52 
    53     shouldBeEqualToString('track.readyState', 'muted');
    5448
    5549    track.enabled = true;
    … …  
    6155    stream = s;
    6256    track = stream.getVideoTracks()[0];
    63 
    64     shouldBeEqualToString('track.readyState', 'live');
    6557
    6658    track.onunmute = onTrackUnmute;

  • trunk/Source/WebCore/ChangeLog

    r139695 r139696  
     12013-01-14  Levi Weintraub  <leviw@chromium.org>
     2
     3        Rolling out r139618. Appears to be causing sporadic crashes on Debug bots.
     4
     5        * Modules/mediastream/MediaStream.cpp:
     6        (WebCore::processTrack):
     7        * Modules/mediastream/MediaStreamTrack.cpp:
     8        (WebCore::MediaStreamTrack::readyState):
     9        * Modules/mediastream/MediaStreamTrack.h:
     10        * Modules/mediastream/MediaStreamTrack.idl:
     11
    1122013-01-14  Levi Weintraub  <leviw@chromium.org>
    213

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

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

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

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

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

    r139618 r139696  
    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
    4652    static PassRefPtr<MediaStreamTrack> create(ScriptExecutionContext*, PassRefPtr<MediaStreamDescriptor>, MediaStreamComponent*);
    4753    virtual ~MediaStreamTrack();
    … …  
    5460    void setEnabled(bool);
    5561
    56     String readyState() const;
     62    ReadyState readyState() const;
    5763
    5864    DEFINE_ATTRIBUTE_EVENT_LISTENER(mute);
    … …  
    6268    MediaStreamDescriptor* streamDescriptor();
    6369    MediaStreamComponent* component();
    64     bool ended() const;
    6570
    6671    // EventTarget

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

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