Title: [186931] branches/safari-601.1-branch/Source/WebKit2
- Revision
- 186931
- Author
- matthew_han...@apple.com
- Date
- 2015-07-16 22:32:31 -0700 (Thu, 16 Jul 2015)
Log Message
Merge r186814. rdar://problem/21605505
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (186930 => 186931)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-17 05:32:29 UTC (rev 186930)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-17 05:32:31 UTC (rev 186931)
@@ -1,5 +1,20 @@
2015-07-16 Matthew Hanson <matthew_han...@apple.com>
+ Merge r186814. rdar://problem/21605505
+
+ 2015-07-14 Anders Carlsson <ander...@apple.com>
+
+ 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-16 Matthew Hanson <matthew_han...@apple.com>
+
Merge r186812. rdar://problem/21818117
2015-07-14 Sam Weinig <s...@webkit.org>
Modified: branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebProcess.cpp (186930 => 186931)
--- branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2015-07-17 05:32:29 UTC (rev 186930)
+++ branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2015-07-17 05:32:31 UTC (rev 186931)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
