Title: [159258] branches/safari-537.73-branch/Source/WebKit2
- Revision
- 159258
- Author
- [email protected]
- Date
- 2013-11-13 16:07:20 -0800 (Wed, 13 Nov 2013)
Log Message
Merged r159248. <rdar://problem/15464319>
Modified Paths
Diff
Modified: branches/safari-537.73-branch/Source/WebKit2/ChangeLog (159257 => 159258)
--- branches/safari-537.73-branch/Source/WebKit2/ChangeLog 2013-11-13 23:57:46 UTC (rev 159257)
+++ branches/safari-537.73-branch/Source/WebKit2/ChangeLog 2013-11-14 00:07:20 UTC (rev 159258)
@@ -1,3 +1,20 @@
+2013-11-13 Lucas Forschler <[email protected]>
+
+ Merge r159248
+
+ 2013-11-13 Anders Carlsson <[email protected]>
+
+ Plug-in processes hang around for 10 sec after Safari quits
+ https://bugs.webkit.org/show_bug.cgi?id=124314
+ <rdar://problem/15460613>
+
+ Reviewed by Simon Fraser.
+
+ Call stopRunLoop instead of instead of RunLoop::stop().
+
+ * PluginProcess/PluginProcess.cpp:
+ (WebKit::PluginProcess::didClose):
+
2013-11-08 Matt Hanson <[email protected]>
Merge r158101.
Modified: branches/safari-537.73-branch/Source/WebKit2/PluginProcess/PluginProcess.cpp (159257 => 159258)
--- branches/safari-537.73-branch/Source/WebKit2/PluginProcess/PluginProcess.cpp 2013-11-13 23:57:46 UTC (rev 159257)
+++ branches/safari-537.73-branch/Source/WebKit2/PluginProcess/PluginProcess.cpp 2013-11-14 00:07:20 UTC (rev 159258)
@@ -148,7 +148,7 @@
{
// The UI process has crashed, just go ahead and quit.
// FIXME: If the plug-in is spinning in the main loop, we'll never get this message.
- RunLoop::current()->stop();
+ stopRunLoop();
}
void PluginProcess::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
