Changeset 242230 in webkit

Timestamp:

Feb 28, 2019, 2:45:06 PM (7 years ago)

Author:

sihui_liu@apple.com

Message:

Revert r232263: it caused processes to crash because process was suspended with locked file
​https://bugs.webkit.org/show_bug.cgi?id=195122
<rdar://problem/48444599>

Reviewed by Geoffrey Garen.

• NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::NetworkProcess):

• NetworkProcess/NetworkProcess.h:
• Shared/WebSQLiteDatabaseTracker.cpp:

(WebKit::WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker):
(WebKit::WebSQLiteDatabaseTracker::hysteresisUpdated):

• Shared/WebSQLiteDatabaseTracker.h:
• WebProcess/WebProcess.cpp:

(WebKit::m_webSQLiteDatabaseTracker):
(WebKit::m_nonVisibleProcessCleanupTimer): Deleted.

• WebProcess/WebProcess.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcess.cpp (modified) (1 diff)
• NetworkProcess/NetworkProcess.h (modified) (2 diffs)
• Shared/WebSQLiteDatabaseTracker.cpp (modified) (2 diffs)
• Shared/WebSQLiteDatabaseTracker.h (modified) (2 diffs)
• WebProcess/WebProcess.cpp (modified) (1 diff)
• WebProcess/WebProcess.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-02-28  Sihui Liu  <sihui_liu@apple.com>
+
+        Revert r232263: it caused processes to crash because process was suspended with locked file
+        https://bugs.webkit.org/show_bug.cgi?id=195122
+        <rdar://problem/48444599>
+
+        Reviewed by Geoffrey Garen.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::NetworkProcess):
+        * NetworkProcess/NetworkProcess.h:
+        * Shared/WebSQLiteDatabaseTracker.cpp:
+        (WebKit::WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker):
+        (WebKit::WebSQLiteDatabaseTracker::hysteresisUpdated):
+        * Shared/WebSQLiteDatabaseTracker.h:
+        * WebProcess/WebProcess.cpp:
+        (WebKit::m_webSQLiteDatabaseTracker):
+        (WebKit::m_nonVisibleProcessCleanupTimer): Deleted.
+        * WebProcess/WebProcess.h:
+
 2019-02-28  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

@@ -129 +129 @@
     , m_networkContentRuleListManager(*this)
 #endif
+#if PLATFORM(IOS_FAMILY)
+    , m_webSQLiteDatabaseTracker(*this)
+#endif
 {
     NetworkProcessPlatformStrategies::initialize();

trunk/Source/WebKit/NetworkProcess/NetworkProcess.h

@@ -49 +49 @@
 #include <wtf/RetainPtr.h>
 #include <wtf/WeakPtr.h>
+
+#if PLATFORM(IOS_FAMILY)
+#include "WebSQLiteDatabaseTracker.h"
+#endif
 
 #if PLATFORM(COCOA)
@@ -490 +494 @@
 #endif
 
+#if PLATFORM(IOS_FAMILY)
+    WebSQLiteDatabaseTracker m_webSQLiteDatabaseTracker;
+#endif
+
     Ref<WorkQueue> m_storageTaskQueue { WorkQueue::create("com.apple.WebKit.StorageTask") };
 

trunk/Source/WebKit/Shared/WebSQLiteDatabaseTracker.cpp

@@ -37 +37 @@
 using namespace WebCore;
 
+WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker(WebProcess& process)
+    : m_process(process)
+    , m_processType(AuxiliaryProcess::ProcessType::WebContent)
+    , m_hysteresis([this](PAL::HysteresisState state) { hysteresisUpdated(state); })
+{
+    SQLiteDatabaseTracker::setClient(this);
+}
+
 WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker(NetworkProcess& process)
     : m_process(process)
+    , m_processType(AuxiliaryProcess::ProcessType::Network)
     , m_hysteresis([this](PAL::HysteresisState state) { hysteresisUpdated(state); })
 {
@@ -60 +69 @@
 void WebSQLiteDatabaseTracker::hysteresisUpdated(PAL::HysteresisState state)
 {
-    m_process.parentProcessConnection()->send(Messages::NetworkProcessProxy::SetIsHoldingLockedFiles(state == PAL::HysteresisState::Started), 0);
+    switch (m_processType) {
+    case AuxiliaryProcess::ProcessType::WebContent:
+        m_process.parentProcessConnection()->send(Messages::WebProcessProxy::SetIsHoldingLockedFiles(state == PAL::HysteresisState::Started), 0);
+        break;
+    case AuxiliaryProcess::ProcessType::Network:
+        m_process.parentProcessConnection()->send(Messages::NetworkProcessProxy::SetIsHoldingLockedFiles(state == PAL::HysteresisState::Started), 0);
+        break;
+    default:
+        ASSERT_NOT_REACHED();
+    }
 }
 

trunk/Source/WebKit/Shared/WebSQLiteDatabaseTracker.h

@@ -33 +33 @@
 
 class NetworkProcess;
+class WebProcess;
 
 class WebSQLiteDatabaseTracker : public WebCore::SQLiteDatabaseTrackerClient {
     WTF_MAKE_NONCOPYABLE(WebSQLiteDatabaseTracker)
 public:
+    explicit WebSQLiteDatabaseTracker(WebProcess&);
     explicit WebSQLiteDatabaseTracker(NetworkProcess&);
 
@@ -46 +48 @@
     void hysteresisUpdated(PAL::HysteresisState);
 
-    NetworkProcess& m_process;
+    AuxiliaryProcess& m_process;
+    AuxiliaryProcess::ProcessType m_processType;
     PAL::HysteresisActivity m_hysteresis;
 };

trunk/Source/WebKit/WebProcess/WebProcess.cpp

@@ -183 +183 @@
 #endif
     , m_nonVisibleProcessCleanupTimer(*this, &WebProcess::nonVisibleProcessCleanupTimerFired)
+#if PLATFORM(IOS_FAMILY)
+    , m_webSQLiteDatabaseTracker(*this)
+#endif
 {
     // Initialize our platform strategies.

trunk/Source/WebKit/WebProcess/WebProcess.h

@@ -56 +56 @@
 #endif
 
+#if PLATFORM(IOS_FAMILY)
+#include "WebSQLiteDatabaseTracker.h"
+#endif
+
 namespace API {
 class Object;
@@ -472 +476 @@
     RefPtr<WebCore::ApplicationCacheStorage> m_applicationCacheStorage;
 
+#if PLATFORM(IOS_FAMILY)
+    WebSQLiteDatabaseTracker m_webSQLiteDatabaseTracker;
+#endif
+
     enum PageMarkingLayersAsVolatileCounterType { };
     using PageMarkingLayersAsVolatileCounter = RefCounter<PageMarkingLayersAsVolatileCounterType>;