Title: [169718] trunk/Source/WebCore
- Revision
- 169718
- Author
- jer.no...@apple.com
- Date
- 2014-06-09 14:32:12 -0700 (Mon, 09 Jun 2014)
Log Message
[Mac][MSE] Exception thrown from ~MediaPlayerPrivateMediaSourceAVFObjC().
https://bugs.webkit.org/show_bug.cgi?id=133656
Reviewed by Eric Carlson.
AVSampleBufferRenderSynchronizer can't handle being passed a NULL observer, so only attempt
to remove the time jumped or duration observer if one was actually created.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::~MediaPlayerPrivateMediaSourceAVFObjC):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (169717 => 169718)
--- trunk/Source/WebCore/ChangeLog 2014-06-09 21:23:28 UTC (rev 169717)
+++ trunk/Source/WebCore/ChangeLog 2014-06-09 21:32:12 UTC (rev 169718)
@@ -1,3 +1,16 @@
+2014-06-09 Jer Noble <jer.no...@apple.com>
+
+ [Mac][MSE] Exception thrown from ~MediaPlayerPrivateMediaSourceAVFObjC().
+ https://bugs.webkit.org/show_bug.cgi?id=133656
+
+ Reviewed by Eric Carlson.
+
+ AVSampleBufferRenderSynchronizer can't handle being passed a NULL observer, so only attempt
+ to remove the time jumped or duration observer if one was actually created.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::~MediaPlayerPrivateMediaSourceAVFObjC):
+
2014-06-09 Zalan Bujtas <za...@apple.com>
Subpixel rendering: Pixelsnapping empty rounded rect results in NaN radii width/height.
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (169717 => 169718)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2014-06-09 21:23:28 UTC (rev 169717)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2014-06-09 21:32:12 UTC (rev 169718)
@@ -165,8 +165,10 @@
CMNotificationCenterRef nc = CMNotificationCenterGetDefaultLocalCenter();
CMNotificationCenterRemoveListener(nc, this, CMTimebaseEffectiveRateChangedCallback, kCMTimebaseNotification_EffectiveRateChanged, timebase);
- [m_synchronizer removeTimeObserver:m_timeJumpedObserver.get()];
- [m_synchronizer removeTimeObserver:m_durationObserver.get()];
+ if (m_timeJumpedObserver)
+ [m_synchronizer removeTimeObserver:m_timeJumpedObserver.get()];
+ if (m_durationObserver)
+ [m_synchronizer removeTimeObserver:m_durationObserver.get()];
}
#pragma mark -
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
