Title: [192045] trunk/Source/WebKit2
Revision
192045
Author
timothy_hor...@apple.com
Date
2015-11-04 16:59:48 -0800 (Wed, 04 Nov 2015)

Log Message

REGRESSION (r191499): 100% repro crash under _prepareForMoveToWindow:
https://bugs.webkit.org/show_bug.cgi?id=150912
<rdar://problem/23402116>

Reviewed by Simon Fraser.

* UIProcess/API/mac/WKView.mm:
(-[WKView _prepareForMoveToWindow:withCompletionHandler:]):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (192044 => 192045)


--- trunk/Source/WebKit2/ChangeLog	2015-11-05 00:54:25 UTC (rev 192044)
+++ trunk/Source/WebKit2/ChangeLog	2015-11-05 00:59:48 UTC (rev 192045)
@@ -1,3 +1,14 @@
+2015-11-04  Tim Horton  <timothy_hor...@apple.com>
+
+        REGRESSION (r191499): 100% repro crash under _prepareForMoveToWindow:
+        https://bugs.webkit.org/show_bug.cgi?id=150912
+        <rdar://problem/23402116>
+
+        Reviewed by Simon Fraser.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView _prepareForMoveToWindow:withCompletionHandler:]):
+
 2015-11-04  Chris Dumez  <cdu...@apple.com>
 
         Regression(r192038): Crash in ~SandboxExtension()

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (192044 => 192045)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm	2015-11-05 00:54:25 UTC (rev 192044)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm	2015-11-05 00:59:48 UTC (rev 192045)
@@ -1139,7 +1139,11 @@
 
 - (void)_prepareForMoveToWindow:(NSWindow *)targetWindow withCompletionHandler:(void(^)(void))completionHandler
 {
-    _data->_impl->prepareForMoveToWindow(targetWindow, completionHandler);
+    auto copiedCompletionHandler = Block_copy(completionHandler);
+    _data->_impl->prepareForMoveToWindow(targetWindow, [copiedCompletionHandler] {
+        copiedCompletionHandler();
+        Block_release(copiedCompletionHandler);
+    });
 }
 
 - (BOOL)isDeferringViewInWindowChanges
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to