Changeset 108383 in webkit


Ignore:
Timestamp:
Feb 21, 2012 12:10:51 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Fix bug from r107672.
https://bugs.webkit.org/show_bug.cgi?id=78773

Before set MediaStreamTrack disable/enable operation,
checking the status of MediaStream that contains this MediaStreamTrack.
if MediaStream is finished, then skipping operation of
didSetMediaStreamTrackEnabled().

Patch by Lin Wei <wei.a.lin@intel.com> on 2012-02-21
Reviewed by Adam Barth.

  • mediastream/MediaStreamTrack.cpp:

(WebCore::MediaStreamTrack::setEnabled):

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r108382 r108383  
     12012-02-21  Lin Wei  <wei.a.lin@intel.com>
     2
     3        Fix bug from r107672.
     4        https://bugs.webkit.org/show_bug.cgi?id=78773
     5
     6        Before set MediaStreamTrack disable/enable operation,
     7        checking the status of MediaStream that contains this MediaStreamTrack.
     8        if MediaStream is finished, then skipping operation of
     9        didSetMediaStreamTrackEnabled().
     10
     11        Reviewed by Adam Barth.
     12        * mediastream/MediaStreamTrack.cpp:
     13        (WebCore::MediaStreamTrack::setEnabled):
     14
    1152012-02-21  Julien Chaffraix  <jchaffraix@webkit.org>
    216
  • trunk/Source/WebCore/mediastream/MediaStreamTrack.cpp

    r105774 r108383  
    8282    m_component->setEnabled(enabled);
    8383
     84    if (m_streamDescriptor->ended())
     85        return;   
     86
    8487    MediaStreamCenter::instance().didSetMediaStreamTrackEnabled(m_streamDescriptor.get(), m_component.get());
    8588}
Note: See TracChangeset for help on using the changeset viewer.