Changeset 248333 in webkit

Timestamp:

Aug 6, 2019, 5:33:34 PM (7 years ago)

Author:

Chris Dumez

Message:

Add release assertions to help catch a bug in our WebProcessCache implementation
​https://bugs.webkit.org/show_bug.cgi?id=200483

Reviewed by Geoffrey Garen.

Add release assertions to help catch a bug in our WebProcessCache implementation. We
have evidence (rdar://problem/53962494) that we have processes with a page which
starts a provisional load while the process is in the WebProcessCache. This should
not be possible.

• UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::setIsInProcessCache):
(WebKit::WebProcessProxy::addExistingWebPage):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebProcessProxy.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-06  Chris Dumez  <cdumez@apple.com>
+
+        Add release assertions to help catch a bug in our WebProcessCache implementation
+        https://bugs.webkit.org/show_bug.cgi?id=200483
+
+        Reviewed by Geoffrey Garen.
+
+        Add release assertions to help catch a bug in our WebProcessCache implementation. We
+        have evidence (rdar://problem/53962494) that we have processes with a page which
+        starts a provisional load while the process is in the WebProcessCache. This should
+        not be possible.
+
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::setIsInProcessCache):
+        (WebKit::WebProcessProxy::addExistingWebPage):
+
 2019-08-06  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp

@@ -202 +202 @@
 void WebProcessProxy::setIsInProcessCache(bool value)
 {
+    if (value) {
+        RELEASE_ASSERT(m_pageMap.isEmpty());
+        RELEASE_ASSERT(!m_suspendedPageCount);
+        RELEASE_ASSERT(m_provisionalPages.isEmpty());
+    }
+
     ASSERT(m_isInProcessCache != value);
     m_isInProcessCache = value;
@@ -396 +402 @@
     ASSERT(!m_pageMap.contains(webPage.pageID()));
     ASSERT(!globalPageMap().contains(webPage.pageID()));
-    ASSERT(!m_isInProcessCache);
+    RELEASE_ASSERT(!m_isInProcessCache);
     ASSERT(!m_websiteDataStore || m_websiteDataStore == &webPage.websiteDataStore());