Changeset 252466 in webkit

Timestamp:

Nov 14, 2019 2:18:15 PM (4 years ago)

Author:

Chris Dumez

Message:

[iOS] Crash under WebProcess::processTaskStateDidChange(WebKit::ProcessTaskStateObserver::TaskState)
​https://bugs.webkit.org/show_bug.cgi?id=204177

Reviewed by Jer Noble.

Delay creating the ProcessTaskStateObserver until the WebProcess's connection to its parent had been
initialized. This is necessary because ProcessTaskStateObserver may call WebProcess::processTaskStateDidChange()
on a background thread, which will deference the IPC connection.

• WebProcess/WebProcess.cpp:

(WebKit::m_webSQLiteDatabaseTracker):
(WebKit::WebProcess::~WebProcess):
(WebKit::WebProcess::initializeConnection):
(WebKit::m_taskStateObserver): Deleted.

• WebProcess/WebProcess.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebProcess.cpp (modified) (3 diffs)
• WebProcess/WebProcess.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-11-14  Chris Dumez  <cdumez@apple.com>
+
+        [iOS] Crash under WebProcess::processTaskStateDidChange(WebKit::ProcessTaskStateObserver::TaskState)
+        https://bugs.webkit.org/show_bug.cgi?id=204177
+
+        Reviewed by Jer Noble.
+
+        Delay creating the ProcessTaskStateObserver until the WebProcess's connection to its parent had been
+        initialized. This is necessary because ProcessTaskStateObserver may call WebProcess::processTaskStateDidChange()
+        on a background thread, which will deference the IPC connection.
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::m_webSQLiteDatabaseTracker):
+        (WebKit::WebProcess::~WebProcess):
+        (WebKit::WebProcess::initializeConnection):
+        (WebKit::m_taskStateObserver): Deleted.
+        * WebProcess/WebProcess.h:
+
 2019-11-14  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit/WebProcess/WebProcess.cpp

@@ -195 +195 @@
 #if PLATFORM(IOS_FAMILY)
     , m_webSQLiteDatabaseTracker([this](bool isHoldingLockedFiles) { parentProcessConnection()->send(Messages::WebProcessProxy::SetIsHoldingLockedFiles(isHoldingLockedFiles), 0); })
-    , m_taskStateObserver(ProcessTaskStateObserver::create(*this))
 #endif
 {
@@ -223 +222 @@
 WebProcess::~WebProcess()
 {
-#if PLATFORM(IOS_FAMILY)
-    m_taskStateObserver->invalidate();
-#endif
+    ASSERT_NOT_REACHED();
 }
 
@@ -268 +265 @@
 
     m_webConnection = WebConnectionToUIProcess::create(this);
+
+#if PLATFORM(IOS_FAMILY)
+    // Make sure we have an IPC::Connection before creating the ProcessTaskStateObserver since it may call
+    // WebProcess::processTaskStateDidChange() on a background thread and deference the IPC connection.
+    m_taskStateObserver = ProcessTaskStateObserver::create(*this);
+#endif
 }
 

trunk/Source/WebKit/WebProcess/WebProcess.h

@@ -543 +543 @@
 #if PLATFORM(IOS_FAMILY)
     WebSQLiteDatabaseTracker m_webSQLiteDatabaseTracker;
-    Ref<ProcessTaskStateObserver> m_taskStateObserver;
+    RefPtr<ProcessTaskStateObserver> m_taskStateObserver;
     Lock m_processWasResumedUIAssertionLock;
     RetainPtr<BKSProcessAssertion> m_processWasResumedUIAssertion;