[webkit-changes] [254210] trunk/Source/WebKit

Wed, 08 Jan 2020 11:40:01 -0800

Title: [254210] trunk/Source/WebKit
Revision
254210
Author
[email protected]
Date
2020-01-08 11:38:50 -0800 (Wed, 08 Jan 2020)

Log Message

Move UIProcess DependencyProcessAssertion from WebContent to AuxiliaryProcess
https://bugs.webkit.org/show_bug.cgi?id=205836

Reviewed by Alex Christensen.

Move UIProcess DependencyProcessAssertion from WebContent to AuxiliaryProcess, so that other auxiliary
processes (Network Process, GPU Process) also benefit from it.

* Shared/AuxiliaryProcess.cpp:
(WebKit::AuxiliaryProcess::initializeConnection):
* Shared/AuxiliaryProcess.h:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeConnection):
* WebProcess/WebProcess.h:

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (254209 => 254210)


--- trunk/Source/WebKit/ChangeLog	2020-01-08 19:36:34 UTC (rev 254209)
+++ trunk/Source/WebKit/ChangeLog	2020-01-08 19:38:50 UTC (rev 254210)
@@ -1,3 +1,20 @@
+2020-01-08  Chris Dumez  <[email protected]>
+
+        Move UIProcess DependencyProcessAssertion from WebContent to AuxiliaryProcess
+        https://bugs.webkit.org/show_bug.cgi?id=205836
+
+        Reviewed by Alex Christensen.
+
+        Move UIProcess DependencyProcessAssertion from WebContent to AuxiliaryProcess, so that other auxiliary
+        processes (Network Process, GPU Process) also benefit from it.
+
+        * Shared/AuxiliaryProcess.cpp:
+        (WebKit::AuxiliaryProcess::initializeConnection):
+        * Shared/AuxiliaryProcess.h:
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initializeConnection):
+        * WebProcess/WebProcess.h:
+
 2020-01-08  Brent Fulgham  <[email protected]>
 
         Network process sandboxes should not include 'common.sb' or 'system.sb'

Modified: trunk/Source/WebKit/Shared/AuxiliaryProcess.cpp (254209 => 254210)


--- trunk/Source/WebKit/Shared/AuxiliaryProcess.cpp	2020-01-08 19:36:34 UTC (rev 254209)
+++ trunk/Source/WebKit/Shared/AuxiliaryProcess.cpp	2020-01-08 19:38:50 UTC (rev 254210)
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "AuxiliaryProcess.h"
 
+#include "DependencyProcessAssertion.h"
 #include "Logging.h"
 #include "SandboxInitializationParameters.h"
 #include <pal/SessionID.h>
@@ -101,8 +102,12 @@
 {
 }
 
-void AuxiliaryProcess::initializeConnection(IPC::Connection*)
+void AuxiliaryProcess::initializeConnection(IPC::Connection* connection)
 {
+#if PLATFORM(IOS_FAMILY)
+    ASSERT(!m_uiProcessDependencyProcessAssertion);
+    m_uiProcessDependencyProcessAssertion = makeUnique<DependencyProcessAssertion>(connection->remoteProcessID(), "Child process dependency on UIProcess"_s);
+#endif
 }
 
 void AuxiliaryProcess::addMessageReceiver(IPC::StringReference messageReceiverName, IPC::MessageReceiver& messageReceiver)

Modified: trunk/Source/WebKit/Shared/AuxiliaryProcess.h (254209 => 254210)


--- trunk/Source/WebKit/Shared/AuxiliaryProcess.h	2020-01-08 19:36:34 UTC (rev 254209)
+++ trunk/Source/WebKit/Shared/AuxiliaryProcess.h	2020-01-08 19:38:50 UTC (rev 254210)
@@ -37,6 +37,7 @@
 
 namespace WebKit {
 
+class DependencyProcessAssertion;
 class SandboxInitializationParameters;
 struct AuxiliaryProcessInitializationParameters;
 
@@ -163,6 +164,9 @@
 
     UserActivity m_processSuppressionDisabled;
 
+#if PLATFORM(IOS)
+    std::unique_ptr<DependencyProcessAssertion> m_uiProcessDependencyProcessAssertion;
+#endif
 #if PLATFORM(COCOA)
     OSObjectPtr<xpc_object_t> m_priorityBoostMessage;
 #endif

Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (254209 => 254210)


--- trunk/Source/WebKit/WebProcess/WebProcess.cpp	2020-01-08 19:36:34 UTC (rev 254209)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp	2020-01-08 19:38:50 UTC (rev 254210)
@@ -31,7 +31,6 @@
 #include "APIPageHandle.h"
 #include "AuthenticationManager.h"
 #include "AuxiliaryProcessMessages.h"
-#include "DependencyProcessAssertion.h"
 #include "DrawingArea.h"
 #include "EventDispatcher.h"
 #include "InjectedBundle.h"
@@ -275,9 +274,6 @@
     m_eventDispatcher->initializeConnection(connection);
 #if PLATFORM(IOS_FAMILY)
     m_viewUpdateDispatcher->initializeConnection(connection);
-
-    ASSERT(!m_uiProcessDependencyProcessAssertion);
-    m_uiProcessDependencyProcessAssertion = makeUnique<DependencyProcessAssertion>(connection->remoteProcessID(), "WebContent process dependency on UIProcess"_s);
 #endif // PLATFORM(IOS_FAMILY)
 
     m_webInspectorInterruptDispatcher->initializeConnection(connection);

Modified: trunk/Source/WebKit/WebProcess/WebProcess.h (254209 => 254210)


--- trunk/Source/WebKit/WebProcess/WebProcess.h	2020-01-08 19:36:34 UTC (rev 254209)
+++ trunk/Source/WebKit/WebProcess/WebProcess.h	2020-01-08 19:38:50 UTC (rev 254210)
@@ -100,7 +100,6 @@
 
 namespace WebKit {
 
-class DependencyProcessAssertion;
 class EventDispatcher;
 class GamepadData;
 class GPUProcessConnection;
@@ -552,7 +551,6 @@
 
 #if PLATFORM(IOS_FAMILY)
     WebSQLiteDatabaseTracker m_webSQLiteDatabaseTracker;
-    std::unique_ptr<DependencyProcessAssertion> m_uiProcessDependencyProcessAssertion;
 #endif
 
     enum PageMarkingLayersAsVolatileCounterType { };

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to