Changeset 186814 in webkit

Timestamp:

Jul 14, 2015, 2:06:56 PM (10 years ago)

Author:

andersca@apple.com

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):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebProcess.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-14  Anders Carlsson  <andersca@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-14  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -1243 +1243 @@
 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);