Title: [186814] trunk/Source/WebKit2
- Revision
- 186814
- Author
- [email protected]
- Date
- 2015-07-14 14:06:56 -0700 (Tue, 14 Jul 2015)
Log Message
Release assert under StyleResolver::loadPendingImages() caused by MemoryPressureHandler
https://bugs.webkit.org/show_bug.cgi?id=146940
rdar://problem/21605505
Reviewed by Sam Weinig.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::processWillSuspendImminently):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (186813 => 186814)
--- trunk/Source/WebKit2/ChangeLog 2015-07-14 21:05:06 UTC (rev 186813)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-14 21:06:56 UTC (rev 186814)
@@ -1,3 +1,14 @@
+2015-07-14 Anders Carlsson <[email protected]>
+
+ Release assert under StyleResolver::loadPendingImages() caused by MemoryPressureHandler
+ https://bugs.webkit.org/show_bug.cgi?id=146940
+ rdar://problem/21605505
+
+ Reviewed by Sam Weinig.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::processWillSuspendImminently):
+
2015-07-14 Sam Weinig <[email protected]>
WebKit needs to serialize numeric values in NSError userInfo
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (186813 => 186814)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-07-14 21:05:06 UTC (rev 186813)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-07-14 21:06:56 UTC (rev 186814)
@@ -1242,6 +1242,14 @@
void WebProcess::processWillSuspendImminently(bool& handled)
{
+ if (parentProcessConnection()->inSendSync()) {
+ // Avoid reentrency bugs such as rdar://problem/21605505 by just bailing
+ // if we get an incoming ProcessWillSuspendImminently message when waiting for a
+ // reply to a sync message.
+ // FIXME: ProcessWillSuspendImminently should not be a sync message.
+ return;
+ }
+
supplement<WebDatabaseManager>()->closeAllDatabases();
actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend::No);
handled = true;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
