Title: [255178] trunk/Source/WebKit
- Revision
- 255178
- Author
- [email protected]
- Date
- 2020-01-27 14:51:33 -0800 (Mon, 27 Jan 2020)
Log Message
Unreviewed, revert r254210 as it seems to be causing process assertion leaks.
https://bugs.webkit.org/show_bug.cgi?id=205836
* 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 (255177 => 255178)
--- trunk/Source/WebKit/ChangeLog 2020-01-27 22:29:24 UTC (rev 255177)
+++ trunk/Source/WebKit/ChangeLog 2020-01-27 22:51:33 UTC (rev 255178)
@@ -1,3 +1,15 @@
+2020-01-27 Chris Dumez <[email protected]>
+
+ Unreviewed, revert r254210 as it seems to be causing process assertion leaks.
+ https://bugs.webkit.org/show_bug.cgi?id=205836
+
+ * Shared/AuxiliaryProcess.cpp:
+ (WebKit::AuxiliaryProcess::initializeConnection):
+ * Shared/AuxiliaryProcess.h:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeConnection):
+ * WebProcess/WebProcess.h:
+
2020-01-27 Brent Fulgham <[email protected]>
Remove last bits of location services rules
Modified: trunk/Source/WebKit/Shared/AuxiliaryProcess.cpp (255177 => 255178)
--- trunk/Source/WebKit/Shared/AuxiliaryProcess.cpp 2020-01-27 22:29:24 UTC (rev 255177)
+++ trunk/Source/WebKit/Shared/AuxiliaryProcess.cpp 2020-01-27 22:51:33 UTC (rev 255178)
@@ -27,7 +27,6 @@
#include "AuxiliaryProcess.h"
#include "ContentWorldShared.h"
-#include "DependencyProcessAssertion.h"
#include "Logging.h"
#include "SandboxInitializationParameters.h"
#include <pal/SessionID.h>
@@ -104,12 +103,8 @@
{
}
-void AuxiliaryProcess::initializeConnection(IPC::Connection* connection)
+void AuxiliaryProcess::initializeConnection(IPC::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 (255177 => 255178)
--- trunk/Source/WebKit/Shared/AuxiliaryProcess.h 2020-01-27 22:29:24 UTC (rev 255177)
+++ trunk/Source/WebKit/Shared/AuxiliaryProcess.h 2020-01-27 22:51:33 UTC (rev 255178)
@@ -37,7 +37,6 @@
namespace WebKit {
-class DependencyProcessAssertion;
class SandboxInitializationParameters;
struct AuxiliaryProcessInitializationParameters;
@@ -164,9 +163,6 @@
UserActivity m_processSuppressionDisabled;
-#if PLATFORM(IOS_FAMILY)
- std::unique_ptr<DependencyProcessAssertion> m_uiProcessDependencyProcessAssertion;
-#endif
#if PLATFORM(COCOA)
OSObjectPtr<xpc_object_t> m_priorityBoostMessage;
#endif
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (255177 => 255178)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2020-01-27 22:29:24 UTC (rev 255177)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2020-01-27 22:51:33 UTC (rev 255178)
@@ -31,6 +31,7 @@
#include "APIPageHandle.h"
#include "AuthenticationManager.h"
#include "AuxiliaryProcessMessages.h"
+#include "DependencyProcessAssertion.h"
#include "DrawingArea.h"
#include "EventDispatcher.h"
#include "InjectedBundle.h"
@@ -274,6 +275,9 @@
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 (255177 => 255178)
--- trunk/Source/WebKit/WebProcess/WebProcess.h 2020-01-27 22:29:24 UTC (rev 255177)
+++ trunk/Source/WebKit/WebProcess/WebProcess.h 2020-01-27 22:51:33 UTC (rev 255178)
@@ -101,6 +101,7 @@
namespace WebKit {
+class DependencyProcessAssertion;
class EventDispatcher;
class GamepadData;
class GPUProcessConnection;
@@ -567,6 +568,7 @@
#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
