Title: [239946] trunk/Source/WebCore
- Revision
- 239946
- Author
- [email protected]
- Date
- 2019-01-14 14:10:18 -0800 (Mon, 14 Jan 2019)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=193403
<rdar://problem/46750743>
Continue fix in r239711 by using WeakPtr in SourceBufferPrivateAVFObjC.
Reviewed by Eric Carlson.
* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h:
* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
(WebCore::SourceBufferPrivateAVFObjC::setCDMSession):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (239945 => 239946)
--- trunk/Source/WebCore/ChangeLog 2019-01-14 22:02:18 UTC (rev 239945)
+++ trunk/Source/WebCore/ChangeLog 2019-01-14 22:10:18 UTC (rev 239946)
@@ -1,3 +1,16 @@
+2019-01-14 Jer Noble <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=193403
+ <rdar://problem/46750743>
+
+ Continue fix in r239711 by using WeakPtr in SourceBufferPrivateAVFObjC.
+
+ Reviewed by Eric Carlson.
+
+ * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h:
+ * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+ (WebCore::SourceBufferPrivateAVFObjC::setCDMSession):
+
2019-01-14 Justin Fan <[email protected]>
[WebGPU] Map WebGPUBindGroupLayoutBindings from the BindGroupLayoutDescriptor for error checking and later referencing
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h (239945 => 239946)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h 2019-01-14 22:02:18 UTC (rev 239945)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h 2019-01-14 22:10:18 UTC (rev 239946)
@@ -180,7 +180,7 @@
MediaSourcePrivateAVFObjC* m_mediaSource;
SourceBufferPrivateClient* m_client { nullptr };
#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
- CDMSessionMediaSourceAVFObjC* m_session { nullptr };
+ WeakPtr<CDMSessionMediaSourceAVFObjC> m_session { nullptr };
#endif
#if ENABLE(ENCRYPTED_MEDIA) && HAVE(AVCONTENTKEYSESSION)
RefPtr<CDMInstanceFairPlayStreamingAVFObjC> m_cdmInstance;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (239945 => 239946)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2019-01-14 22:02:18 UTC (rev 239945)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2019-01-14 22:10:18 UTC (rev 239946)
@@ -908,7 +908,7 @@
if (m_session)
m_session->removeSourceBuffer(this);
- m_session = session;
+ m_session = makeWeakPtr(session);
if (m_session) {
m_session->addSourceBuffer(this);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
