Changeset 239437 in webkit

Timestamp:

Dec 20, 2018 1:12:27 AM (5 years ago)

Author:

Chris Dumez

Message:

[PSON] SuspendedPageProxy fails to release its process assertion if the WebPage fails to enter PageCache
​https://bugs.webkit.org/show_bug.cgi?id=192873

Reviewed by Antti Koivisto.

SuspendedPageProxy fails to release its process assertion if the WebPage fails to enter PageCache, preventing
the process from suspending on iOS.

• UIProcess/SuspendedPageProxy.cpp:

(WebKit::SuspendedPageProxy::didProcessRequestToSuspend):
(WebKit::SuspendedPageProxy::didReceiveMessage):
(WebKit::SuspendedPageProxy::didSuspend): Deleted.
(WebKit::SuspendedPageProxy::didFailToSuspend): Deleted.

• UIProcess/SuspendedPageProxy.h:

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-12-20  Chris Dumez  <cdumez@apple.com>
+
+        [PSON] SuspendedPageProxy fails to release its process assertion if the WebPage fails to enter PageCache
+        https://bugs.webkit.org/show_bug.cgi?id=192873
+
+        Reviewed by Antti Koivisto.
+
+        SuspendedPageProxy fails to release its process assertion if the WebPage fails to enter PageCache, preventing
+        the process from suspending on iOS.
+
+        * UIProcess/SuspendedPageProxy.cpp:
+        (WebKit::SuspendedPageProxy::didProcessRequestToSuspend):
+        (WebKit::SuspendedPageProxy::didReceiveMessage):
+        (WebKit::SuspendedPageProxy::didSuspend): Deleted.
+        (WebKit::SuspendedPageProxy::didFailToSuspend): Deleted.
+        * UIProcess/SuspendedPageProxy.h:
+
 2018-12-19  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/SuspendedPageProxy.cpp

@@ -139 +139 @@
 }
 
-void SuspendedPageProxy::didSuspend()
+void SuspendedPageProxy::didProcessRequestToSuspend(SuspensionState newSuspensionState)
 {
     LOG(ProcessSwapping, "SuspendedPageProxy %s from process %i finished transition to suspended", loggingString(), m_process->processIdentifier());
 
     ASSERT(m_suspensionState == SuspensionState::Suspending);
-    m_suspensionState = SuspensionState::Suspended;
+    ASSERT(newSuspensionState == SuspensionState::Suspended || newSuspensionState == SuspensionState::FailedToSuspend);
+
+    m_suspensionState = newSuspensionState;
 
 #if PLATFORM(IOS_FAMILY)
     m_suspensionToken = nullptr;
 #endif
-
-    if (m_readyToUnsuspendHandler)
-        m_readyToUnsuspendHandler(this);
-}
-
-void SuspendedPageProxy::didFailToSuspend()
-{
-    ASSERT(m_suspensionState == SuspensionState::Suspending);
-    m_suspensionState = SuspensionState::FailedToSuspend;
 
     if (m_readyToUnsuspendHandler)
@@ -168 +161 @@
 
     if (decoder.messageName() == Messages::WebPageProxy::DidSuspendAfterProcessSwap::name()) {
-        didSuspend();
+        didProcessRequestToSuspend(SuspensionState::Suspended);
         return;
     }
 
     if (decoder.messageName() == Messages::WebPageProxy::DidFailToSuspendAfterProcessSwap::name()) {
-        didFailToSuspend();
+        didProcessRequestToSuspend(SuspensionState::FailedToSuspend);
         return;
     }

trunk/Source/WebKit/UIProcess/SuspendedPageProxy.h

@@ -58 +58 @@
 
 private:
-    void didSuspend();
-    void didFailToSuspend();
+    enum class SuspensionState : uint8_t { Suspending, FailedToSuspend, Suspended, Resumed };
+    void didProcessRequestToSuspend(SuspensionState);
 
     // IPC::MessageReceiver
@@ -70 +70 @@
     String m_registrableDomain;
 
-    enum class SuspensionState : uint8_t { Suspending, FailedToSuspend, Suspended, Resumed };
     SuspensionState m_suspensionState { SuspensionState::Suspending };
     CompletionHandler<void(SuspendedPageProxy*)> m_readyToUnsuspendHandler;