Title: [143540] trunk/Source/WebCore
- Revision
- 143540
- Author
- jer.no...@apple.com
- Date
- 2013-02-20 17:09:37 -0800 (Wed, 20 Feb 2013)
Log Message
Crash in com.apple.WebKit2.WebProcessService at com.apple.avfoundation: __73-[AVAssetResourceLoader _attemptDelegateHandlingOfRequestWithDictionary:]_block_invoke + 51
https://bugs.webkit.org/show_bug.cgi?id=110385
Reviewed by Eric Carlson.
Ensure AVFoundation does not attempt to message a dead object by explicitly disassociating
the AVAssetResourceLoaderDelegate on MediaPlayerPrivateAVFoundationObjC destruction.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::~MediaPlayerPrivateAVFoundationObjC):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (143539 => 143540)
--- trunk/Source/WebCore/ChangeLog 2013-02-21 01:07:56 UTC (rev 143539)
+++ trunk/Source/WebCore/ChangeLog 2013-02-21 01:09:37 UTC (rev 143540)
@@ -1,3 +1,16 @@
+2013-02-20 Jer Noble <jer.no...@apple.com>
+
+ Crash in com.apple.WebKit2.WebProcessService at com.apple.avfoundation: __73-[AVAssetResourceLoader _attemptDelegateHandlingOfRequestWithDictionary:]_block_invoke + 51
+ https://bugs.webkit.org/show_bug.cgi?id=110385
+
+ Reviewed by Eric Carlson.
+
+ Ensure AVFoundation does not attempt to message a dead object by explicitly disassociating
+ the AVAssetResourceLoaderDelegate on MediaPlayerPrivateAVFoundationObjC destruction.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::~MediaPlayerPrivateAVFoundationObjC):
+
2013-02-20 Ojan Vafai <o...@chromium.org>
Positioned, replaced elements with intrinsic width keywords compute the wrong width
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (143539 => 143540)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2013-02-21 01:07:56 UTC (rev 143539)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2013-02-21 01:09:37 UTC (rev 143540)
@@ -233,6 +233,9 @@
#if ENABLE(ENCRYPTED_MEDIA_V2)
playerToPrivateMap().remove(player());
#endif
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+ [[m_avAsset.get() resourceLoader] setDelegate:nil queue:0];
+#endif
cancelLoad();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
