Attachment 369875 Details for Bug 197888 – Patch

[patch] Patch

bug-197888-20190514113543.patch (text/plain), 2.70 KB, created by Chris Dumez on 2019-05-14 11:35:44 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2019-05-14 11:35:44 PDT

Size: 2.70 KB

patch

obsolete

>Subversion Revision: 245289
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 65924d05d736dcc8fa3137968ec0f9c2643e02f9..c50ade3174a465a2188cfbcd1537802ddbb64bb1 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-05-14  Chris Dumez  <cdumez@apple.com>
>+
>+        The network process tries to take a process assertion when NetworkProcess::processWillSuspendImminently() is called
>+        https://bugs.webkit.org/show_bug.cgi?id=197888
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        When actualPrepareToSuspend() in the Network process is called set the 'IsSuspended' flag on the SQLite database tracker and unset
>+        the flag when the process resume. This is consistent with what we already do in the WebProcess and makes sure that
>+        the network process does not try and take on a new assertion due to locked files when getting notified it is about to get
>+        suspended.
>+
>+        * NetworkProcess/NetworkProcess.cpp:
>+        (WebKit::NetworkProcess::actualPrepareToSuspend):
>+        (WebKit::NetworkProcess::processWillSuspendImminently):
>+        (WebKit::NetworkProcess::resume):
>+
> 2019-05-14  Daniel Bates  <dabates@apple.com>
> 
>         [iOS] Cannot scroll to beginning of document after scrolling to end of document and vice versa via key commands
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>index c459e63ed5751039330cc9eeafc49c8de3445bae..9c6484449c6ba27503c8bc05c70709b3e43f8943 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>@@ -1922,6 +1922,10 @@ private:
> 
> void NetworkProcess::actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend shouldAcknowledgeWhenReadyToSuspend)
> {
>+#if PLATFORM(IOS_FAMILY)
>+    m_webSQLiteDatabaseTracker.setIsSuspended(true);
>+#endif
>+
>     lowMemoryHandler(Critical::Yes);
> 
>     RefPtr<TaskCounter> delayedTaskCounter;
>@@ -1947,6 +1951,7 @@ void NetworkProcess::actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend
> 
> void NetworkProcess::processWillSuspendImminently(CompletionHandler<void(bool)>&& completionHandler)
> {
>+    RELEASE_LOG(ProcessSuspension, "%p - NetworkProcess::processWillSuspendImminently()", this);
> #if PLATFORM(IOS_FAMILY) && ENABLE(INDEXED_DATABASE)
>     for (auto& server : m_idbServers.values())
>         server->tryStop(IDBServer::ShouldForceStop::Yes);
>@@ -1994,6 +1999,10 @@ void NetworkProcess::processDidResume()
> 
> void NetworkProcess::resume()
> {
>+#if PLATFORM(IOS_FAMILY)
>+    m_webSQLiteDatabaseTracker.setIsSuspended(false);
>+#endif
>+
>     platformProcessDidResume();
>     for (auto& connection : m_webProcessConnections)
>         connection->endSuspension();

Actions: View | Formatted Diff | Diff

Attachments on bug 197888: 369875