Title: [108383] trunk/Source/WebCore
- Revision
- 108383
- Author
- [email protected]
- Date
- 2012-02-21 12:10:51 -0800 (Tue, 21 Feb 2012)
Log 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 <[email protected]> on 2012-02-21
Reviewed by Adam Barth.
* mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::setEnabled):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (108382 => 108383)
--- trunk/Source/WebCore/ChangeLog 2012-02-21 19:59:42 UTC (rev 108382)
+++ trunk/Source/WebCore/ChangeLog 2012-02-21 20:10:51 UTC (rev 108383)
@@ -1,3 +1,17 @@
+2012-02-21 Lin Wei <[email protected]>
+
+ 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().
+
+ Reviewed by Adam Barth.
+ * mediastream/MediaStreamTrack.cpp:
+ (WebCore::MediaStreamTrack::setEnabled):
+
2012-02-21 Julien Chaffraix <[email protected]>
Move RenderLayer::scrolledContentOffset calls to a common function
Modified: trunk/Source/WebCore/mediastream/MediaStreamTrack.cpp (108382 => 108383)
--- trunk/Source/WebCore/mediastream/MediaStreamTrack.cpp 2012-02-21 19:59:42 UTC (rev 108382)
+++ trunk/Source/WebCore/mediastream/MediaStreamTrack.cpp 2012-02-21 20:10:51 UTC (rev 108383)
@@ -81,6 +81,9 @@
m_component->setEnabled(enabled);
+ if (m_streamDescriptor->ended())
+ return;
+
MediaStreamCenter::instance().didSetMediaStreamTrackEnabled(m_streamDescriptor.get(), m_component.get());
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
