Title: [240413] branches/safari-607-branch/Source/WebCore
- Revision
- 240413
- Author
- [email protected]
- Date
- 2019-01-23 22:41:57 -0800 (Wed, 23 Jan 2019)
Log Message
Cherry-pick r239946. rdar://problem/47295375
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):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239946 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-607-branch/Source/WebCore/ChangeLog (240412 => 240413)
--- branches/safari-607-branch/Source/WebCore/ChangeLog 2019-01-24 06:41:54 UTC (rev 240412)
+++ branches/safari-607-branch/Source/WebCore/ChangeLog 2019-01-24 06:41:57 UTC (rev 240413)
@@ -1,5 +1,35 @@
2019-01-23 Alan Coon <[email protected]>
+ Cherry-pick r239946. rdar://problem/47295375
+
+ 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):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239946 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 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-23 Alan Coon <[email protected]>
+
Cherry-pick r239927. rdar://problem/47295363
DOMCacheStorage: use-after-move in doSequentialMatch()
Modified: branches/safari-607-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h (240412 => 240413)
--- branches/safari-607-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h 2019-01-24 06:41:54 UTC (rev 240412)
+++ branches/safari-607-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h 2019-01-24 06:41:57 UTC (rev 240413)
@@ -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: branches/safari-607-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (240412 => 240413)
--- branches/safari-607-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2019-01-24 06:41:54 UTC (rev 240412)
+++ branches/safari-607-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2019-01-24 06:41:57 UTC (rev 240413)
@@ -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
