Diff
Modified: releases/WebKitGTK/webkit-2.36/Source/WebKit/ChangeLog (291477 => 291478)
--- releases/WebKitGTK/webkit-2.36/Source/WebKit/ChangeLog 2022-03-18 12:18:00 UTC (rev 291477)
+++ releases/WebKitGTK/webkit-2.36/Source/WebKit/ChangeLog 2022-03-18 12:59:24 UTC (rev 291478)
@@ -1,3 +1,28 @@
+2022-03-18 Carlos Garcia Campos <[email protected]>
+
+ Remove AuxiliaryProcess termination timeout
+ https://bugs.webkit.org/show_bug.cgi?id=238012
+
+ Reviewed by Chris Dumez.
+
+ It was only used by the plugin process, now it's always set to 0 for all processes, so it's useless.
+
+ * Shared/AuxiliaryProcess.cpp:
+ (WebKit::AuxiliaryProcess::AuxiliaryProcess):
+ (WebKit::AuxiliaryProcess::disableTermination):
+ (WebKit::AuxiliaryProcess::enableTermination):
+ (WebKit::AuxiliaryProcess::terminationTimerFired): Deleted.
+ * Shared/AuxiliaryProcess.h:
+ (WebKit::AuxiliaryProcess::setTerminationTimeout): Deleted.
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::encode const):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::initializeNewWebProcess):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess):
+
2022-03-16 Pablo Saavedra <[email protected]>
[GTK][WPE] Crash during the WebPage::close() related to GL resources destruction
Modified: releases/WebKitGTK/webkit-2.36/Source/WebKit/Shared/AuxiliaryProcess.cpp (291477 => 291478)
--- releases/WebKitGTK/webkit-2.36/Source/WebKit/Shared/AuxiliaryProcess.cpp 2022-03-18 12:18:00 UTC (rev 291477)
+++ releases/WebKitGTK/webkit-2.36/Source/WebKit/Shared/AuxiliaryProcess.cpp 2022-03-18 12:59:24 UTC (rev 291478)
@@ -49,7 +49,6 @@
AuxiliaryProcess::AuxiliaryProcess()
: m_terminationCounter(0)
- , m_terminationTimer(RunLoop::main(), this, &AuxiliaryProcess::terminationTimerFired)
, m_processSuppressionDisabled("Process Suppression Disabled by UIProcess")
{
}
@@ -155,7 +154,6 @@
void AuxiliaryProcess::disableTermination()
{
m_terminationCounter++;
- m_terminationTimer.stop();
}
void AuxiliaryProcess::enableTermination()
@@ -166,12 +164,8 @@
if (m_terminationCounter)
return;
- if (!m_terminationTimeout) {
- terminationTimerFired();
- return;
- }
-
- m_terminationTimer.startOneShot(m_terminationTimeout);
+ if (shouldTerminate())
+ terminate();
}
void AuxiliaryProcess::mainThreadPing(CompletionHandler<void()>&& completionHandler)
@@ -189,14 +183,6 @@
return 0;
}
-void AuxiliaryProcess::terminationTimerFired()
-{
- if (!shouldTerminate())
- return;
-
- terminate();
-}
-
void AuxiliaryProcess::stopRunLoop()
{
platformStopRunLoop();
Modified: releases/WebKitGTK/webkit-2.36/Source/WebKit/Shared/AuxiliaryProcess.h (291477 => 291478)
--- releases/WebKitGTK/webkit-2.36/Source/WebKit/Shared/AuxiliaryProcess.h 2022-03-18 12:18:00 UTC (rev 291477)
+++ releases/WebKitGTK/webkit-2.36/Source/WebKit/Shared/AuxiliaryProcess.h 2022-03-18 12:59:24 UTC (rev 291478)
@@ -105,8 +105,6 @@
explicit AuxiliaryProcess();
virtual ~AuxiliaryProcess();
- void setTerminationTimeout(Seconds seconds) { m_terminationTimeout = seconds; }
-
virtual void initializeProcess(const AuxiliaryProcessInitializationParameters&);
virtual void initializeProcessName(const AuxiliaryProcessInitializationParameters&);
virtual void initializeSandbox(const AuxiliaryProcessInitializationParameters&, SandboxInitializationParameters&);
@@ -162,21 +160,12 @@
void shutDown();
- void terminationTimerFired();
-
void platformInitialize(const AuxiliaryProcessInitializationParameters&);
void platformStopRunLoop();
- // The timeout, in seconds, before this process will be terminated if termination
- // has been enabled. If the timeout is 0 seconds, the process will be terminated immediately.
- Seconds m_terminationTimeout;
-
- // A termination counter; when the counter reaches zero, the process will be terminated
- // after a given period of time.
+ // A termination counter; when the counter reaches zero, the process will be terminated.
unsigned m_terminationCounter;
- RunLoop::Timer<AuxiliaryProcess> m_terminationTimer;
-
RefPtr<IPC::Connection> m_connection;
IPC::MessageReceiverMap m_messageReceiverMap;
Modified: releases/WebKitGTK/webkit-2.36/Source/WebKit/Shared/WebProcessCreationParameters.cpp (291477 => 291478)
--- releases/WebKitGTK/webkit-2.36/Source/WebKit/Shared/WebProcessCreationParameters.cpp 2022-03-18 12:18:00 UTC (rev 291477)
+++ releases/WebKitGTK/webkit-2.36/Source/WebKit/Shared/WebProcessCreationParameters.cpp 2022-03-18 12:59:24 UTC (rev 291478)
@@ -80,7 +80,6 @@
encoder << shouldSuppressMemoryPressureHandler;
encoder << shouldUseFontSmoothing;
encoder << fontAllowList;
- encoder << terminationTimeout;
encoder << overrideLanguages;
#if USE(GSTREAMER)
encoder << gstreamerOptions;
@@ -310,8 +309,6 @@
return false;
if (!decoder.decode(parameters.fontAllowList))
return false;
- if (!decoder.decode(parameters.terminationTimeout))
- return false;
if (!decoder.decode(parameters.overrideLanguages))
return false;
#if USE(GSTREAMER)
Modified: releases/WebKitGTK/webkit-2.36/Source/WebKit/Shared/WebProcessCreationParameters.h (291477 => 291478)
--- releases/WebKitGTK/webkit-2.36/Source/WebKit/Shared/WebProcessCreationParameters.h 2022-03-18 12:18:00 UTC (rev 291477)
+++ releases/WebKitGTK/webkit-2.36/Source/WebKit/Shared/WebProcessCreationParameters.h 2022-03-18 12:59:24 UTC (rev 291478)
@@ -143,8 +143,6 @@
bool hasRichContentServices { false };
#endif
- Seconds terminationTimeout;
-
TextCheckerState textCheckerState;
#if PLATFORM(COCOA)
Modified: releases/WebKitGTK/webkit-2.36/Source/WebKit/UIProcess/WebProcessPool.cpp (291477 => 291478)
--- releases/WebKitGTK/webkit-2.36/Source/WebKit/UIProcess/WebProcessPool.cpp 2022-03-18 12:18:00 UTC (rev 291477)
+++ releases/WebKitGTK/webkit-2.36/Source/WebKit/UIProcess/WebProcessPool.cpp 2022-03-18 12:59:24 UTC (rev 291478)
@@ -877,8 +877,6 @@
parameters.shouldAlwaysUseComplexTextCodePath = m_alwaysUsesComplexTextCodePath;
parameters.shouldUseFontSmoothing = m_shouldUseFontSmoothing;
- parameters.terminationTimeout = 0_s;
-
parameters.textCheckerState = TextChecker::state();
parameters.fullKeyboardAccessEnabled = WebProcessProxy::fullKeyboardAccessEnabled();
Modified: releases/WebKitGTK/webkit-2.36/Source/WebKit/WebProcess/WebProcess.cpp (291477 => 291478)
--- releases/WebKitGTK/webkit-2.36/Source/WebKit/WebProcess/WebProcess.cpp 2022-03-18 12:18:00 UTC (rev 291477)
+++ releases/WebKitGTK/webkit-2.36/Source/WebKit/WebProcess/WebProcess.cpp 2022-03-18 12:59:24 UTC (rev 291478)
@@ -550,8 +550,6 @@
setShouldUseFontSmoothing(parameters.shouldUseFontSmoothing);
- setTerminationTimeout(parameters.terminationTimeout);
-
setMemoryCacheDisabled(parameters.memoryCacheDisabled);
WebCore::RuntimeEnabledFeatures::sharedFeatures().setAttrStyleEnabled(parameters.attrStyleEnabled);
