Title: [211974] trunk/Source/WebCore
- Revision
- 211974
- Author
- [email protected]
- Date
- 2017-02-09 12:10:26 -0800 (Thu, 09 Feb 2017)
Log Message
[MediaStream Mac] Handle NULL m_sampleBufferDisplayLayer
https://bugs.webkit.org/show_bug.cgi?id=168060
Reviewed by Jer Noble.
No new tests, this avoids an occasional crash on the bots.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::layerStatusDidChange): Don't assume
m_sampleBufferDisplayLayer is valid.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (211973 => 211974)
--- trunk/Source/WebCore/ChangeLog 2017-02-09 19:29:05 UTC (rev 211973)
+++ trunk/Source/WebCore/ChangeLog 2017-02-09 20:10:26 UTC (rev 211974)
@@ -1,3 +1,16 @@
+2017-02-09 Eric Carlson <[email protected]>
+
+ [MediaStream Mac] Handle NULL m_sampleBufferDisplayLayer
+ https://bugs.webkit.org/show_bug.cgi?id=168060
+
+ Reviewed by Jer Noble.
+
+ No new tests, this avoids an occasional crash on the bots.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::layerStatusDidChange): Don't assume
+ m_sampleBufferDisplayLayer is valid.
+
2017-02-09 Chris Dumez <[email protected]>
Object.getPrototypeOf(NodeFilter) should be Function.prototype, not Object.prototype
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (211973 => 211974)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2017-02-09 19:29:05 UTC (rev 211973)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2017-02-09 20:10:26 UTC (rev 211974)
@@ -341,7 +341,7 @@
if (status.integerValue != AVQueuedSampleBufferRenderingStatusRendering)
return;
- if (layer != m_sampleBufferDisplayLayer || !m_activeVideoTrack)
+ if (!m_sampleBufferDisplayLayer || !m_activeVideoTrack || layer != m_sampleBufferDisplayLayer)
return;
auto track = m_videoTrackMap.get(m_activeVideoTrack->id());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
