Title: [173772] branches/safari-600.1.4.11-branch/Source/WebKit2
- Revision
- 173772
- Author
- [email protected]
- Date
- 2014-09-19 14:25:10 -0700 (Fri, 19 Sep 2014)
Log Message
Merge r173722. <rdar://problem/18389146>
Modified Paths
Diff
Modified: branches/safari-600.1.4.11-branch/Source/WebKit2/ChangeLog (173771 => 173772)
--- branches/safari-600.1.4.11-branch/Source/WebKit2/ChangeLog 2014-09-19 20:53:15 UTC (rev 173771)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/ChangeLog 2014-09-19 21:25:10 UTC (rev 173772)
@@ -1,3 +1,23 @@
+2014-09-19 Dana Burkart <[email protected]>
+
+ Merge r173722.
+
+ 2014-09-18 Tim Horton <[email protected]>
+
+ Occasional unreproducible crashes in MessageReceiverMap::dispatchMessage
+ https://bugs.webkit.org/show_bug.cgi?id=136909
+ <rdar://problem/17758325>
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView dealloc]):
+ We're seeing some messages dispatched on the WebContext that end up
+ attempting to call dispatchMessage on a freed MessageReceiver.
+ The WKRemoteObjectRegistry message receiver is added to the WebContext
+ message receiver map, but never removed, despite the WebContext easily
+ outliving the WKWebView that owns the remote object registry.
+
2014-09-17 Babak Shafiei <[email protected]>
Merge r173702.
Modified: branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (173771 => 173772)
--- branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-09-19 20:53:15 UTC (rev 173771)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-09-19 21:25:10 UTC (rev 173772)
@@ -351,6 +351,9 @@
- (void)dealloc
{
+ if (_remoteObjectRegistry)
+ _page->process().context().removeMessageReceiver(Messages::RemoteObjectRegistry::messageReceiverName(), _page->pageID());
+
_page->close();
[_remoteObjectRegistry _invalidate];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
