Attachment 357715 Details for Bug 192873 – Patch

[patch] Patch

bug-192873-20181219134530.patch (text/plain), 4.12 KB, created by Chris Dumez on 2018-12-19 13:45:30 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2018-12-19 13:45:30 PST

Size: 4.12 KB

patch

obsolete

>Subversion Revision: 239387
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index e116f47f9961f4aa606d5910ca34e40df60df6be..01b3412f8429269a1f327a98d5861ff75ebd5beb 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-12-19  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 NOBODY (OOPS!).
>+
>+        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  Megan Gardner  <megan_gardner@apple.com>
> 
>         Allow clients to set the navigator platform
>diff --git a/Source/WebKit/UIProcess/SuspendedPageProxy.cpp b/Source/WebKit/UIProcess/SuspendedPageProxy.cpp
>index 61a0af9ac4c4cd07949b9ca9b0d8af6b20cc2c8a..f198a81533f76b2e8e2bf71d4a3b9d2740c95078 100644
>--- a/Source/WebKit/UIProcess/SuspendedPageProxy.cpp
>+++ b/Source/WebKit/UIProcess/SuspendedPageProxy.cpp
>@@ -138,12 +138,14 @@ void SuspendedPageProxy::unsuspend()
>     m_process->send(Messages::WebPage::SetIsSuspended(false), m_page.pageID());
> }
> 
>-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;
>@@ -153,26 +155,17 @@ void SuspendedPageProxy::didSuspend()
>         m_readyToUnsuspendHandler(this);
> }
> 
>-void SuspendedPageProxy::didFailToSuspend()
>-{
>-    ASSERT(m_suspensionState == SuspensionState::Suspending);
>-    m_suspensionState = SuspensionState::FailedToSuspend;
>-
>-    if (m_readyToUnsuspendHandler)
>-        m_readyToUnsuspendHandler(this);
>-}
>-
> void SuspendedPageProxy::didReceiveMessage(IPC::Connection&, IPC::Decoder& decoder)
> {
>     ASSERT(decoder.messageReceiverName() == Messages::WebPageProxy::messageReceiverName());
> 
>     if (decoder.messageName() == Messages::WebPageProxy::DidSuspendAfterProcessSwap::name()) {
>-        didSuspend();
>+        didProcessRequestToSuspend(SuspensionState::Suspended);
>         return;
>     }
> 
>     if (decoder.messageName() == Messages::WebPageProxy::DidFailToSuspendAfterProcessSwap::name()) {
>-        didFailToSuspend();
>+        didProcessRequestToSuspend(SuspensionState::FailedToSuspend);
>         return;
>     }
> 
>diff --git a/Source/WebKit/UIProcess/SuspendedPageProxy.h b/Source/WebKit/UIProcess/SuspendedPageProxy.h
>index 1b56d06af6681da2b636b994f875bd19e24b05b9..2b3a85b10c4cdb05355be7852a00862429a93679 100644
>--- a/Source/WebKit/UIProcess/SuspendedPageProxy.h
>+++ b/Source/WebKit/UIProcess/SuspendedPageProxy.h
>@@ -57,8 +57,8 @@ public:
> #endif
> 
> private:
>-    void didSuspend();
>-    void didFailToSuspend();
>+    enum class SuspensionState : uint8_t { Suspending, FailedToSuspend, Suspended, Resumed };
>+    void didProcessRequestToSuspend(SuspensionState);
> 
>     // IPC::MessageReceiver
>     void didReceiveMessage(IPC::Connection&, IPC::Decoder&) final;
>@@ -69,7 +69,6 @@ private:
>     uint64_t m_mainFrameID;
>     String m_registrableDomain;
> 
>-    enum class SuspensionState : uint8_t { Suspending, FailedToSuspend, Suspended, Resumed };
>     SuspensionState m_suspensionState { SuspensionState::Suspending };
>     CompletionHandler<void(SuspendedPageProxy*)> m_readyToUnsuspendHandler;
> #if PLATFORM(IOS_FAMILY)

Actions: View | Formatted Diff | Diff

Attachments on bug 192873: 357711 | 357714 | 357715