<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[214320] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/214320">214320</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2017-03-23 15:21:31 -0700 (Thu, 23 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Let the UI process do memory kills and replace crashes with diagnostic logging.
<https://webkit.org/b/170016>
<rdar://problem/31091292>
Reviewed by Chris Dumez.
Source/WebCore:
Remove the memory kill code from WebCore that just crashes in favor of controlled
teardown from UI process side in WebKit2.
* page/DiagnosticLoggingKeys.cpp:
(WebCore::DiagnosticLoggingKeys::simulatedProcessCrashKey):
(WebCore::DiagnosticLoggingKeys::exceededActiveMemoryLimitKey):
(WebCore::DiagnosticLoggingKeys::exceededInactiveMemoryLimitKey):
(WebCore::DiagnosticLoggingKeys::exceededBackgroundCPULimitKey):
* page/DiagnosticLoggingKeys.h:
* page/MemoryRelease.cpp:
(WebCore::didExceedMemoryLimitAndFailedToRecover): Deleted.
* page/MemoryRelease.h:
Source/WebKit2:
Have the WebProcess memory kill callback send a notification to the UI process
instead of outright crashing. The UI process then sends a diagnostic logging message
before carefully taking down the web process.
Also add drive-by diagnostic logging for background CPU limit kills.
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::simulateProcessCrash):
(WebKit::WebProcessProxy::didExceedActiveMemoryLimit):
(WebKit::WebProcessProxy::didExceedInactiveMemoryLimit):
(WebKit::WebProcessProxy::didExceedBackgroundCPULimit):
* UIProcess/WebProcessProxy.h:
* UIProcess/WebProcessProxy.messages.in:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageDiagnosticLoggingKeyscpp">trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDiagnosticLoggingKeysh">trunk/Source/WebCore/page/DiagnosticLoggingKeys.h</a></li>
<li><a href="#trunkSourceWebCorepageMemoryReleasecpp">trunk/Source/WebCore/page/MemoryRelease.cpp</a></li>
<li><a href="#trunkSourceWebCorepageMemoryReleaseh">trunk/Source/WebCore/page/MemoryRelease.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxymessagesin">trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214319 => 214320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-23 21:54:58 UTC (rev 214319)
+++ trunk/Source/WebCore/ChangeLog 2017-03-23 22:21:31 UTC (rev 214320)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-03-23 Andreas Kling <akling@apple.com>
+
+ Let the UI process do memory kills and replace crashes with diagnostic logging.
+ <https://webkit.org/b/170016>
+ <rdar://problem/31091292>
+
+ Reviewed by Chris Dumez.
+
+ Remove the memory kill code from WebCore that just crashes in favor of controlled
+ teardown from UI process side in WebKit2.
+
+ * page/DiagnosticLoggingKeys.cpp:
+ (WebCore::DiagnosticLoggingKeys::simulatedProcessCrashKey):
+ (WebCore::DiagnosticLoggingKeys::exceededActiveMemoryLimitKey):
+ (WebCore::DiagnosticLoggingKeys::exceededInactiveMemoryLimitKey):
+ (WebCore::DiagnosticLoggingKeys::exceededBackgroundCPULimitKey):
+ * page/DiagnosticLoggingKeys.h:
+ * page/MemoryRelease.cpp:
+ (WebCore::didExceedMemoryLimitAndFailedToRecover): Deleted.
+ * page/MemoryRelease.h:
+
</ins><span class="cx"> 2017-03-23 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean RTCPeerConnection.idl after bug 169978
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeyscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp (214319 => 214320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2017-03-23 21:54:58 UTC (rev 214319)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2017-03-23 22:21:31 UTC (rev 214320)
</span><span class="lines">@@ -353,6 +353,26 @@
</span><span class="cx"> return ASCIILiteral("DomainCausingJetsam");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::simulatedPageCrashKey()
+{
+ return ASCIILiteral("SimulatedPageCrash");
+}
+
+String DiagnosticLoggingKeys::exceededActiveMemoryLimitKey()
+{
+ return ASCIILiteral("ExceededActiveMemoryLimit");
+}
+
+String DiagnosticLoggingKeys::exceededInactiveMemoryLimitKey()
+{
+ return ASCIILiteral("ExceededInactiveMemoryLimit");
+}
+
+String DiagnosticLoggingKeys::exceededBackgroundCPULimitKey()
+{
+ return ASCIILiteral("ExceededBackgroundCPULimit");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::domainVisitedKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("DomainVisited");
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.h (214319 => 214320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2017-03-23 21:54:58 UTC (rev 214319)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2017-03-23 22:21:31 UTC (rev 214320)
</span><span class="lines">@@ -52,6 +52,10 @@
</span><span class="cx"> static String documentLoaderStoppingKey();
</span><span class="cx"> static String domainCausingEnergyDrainKey();
</span><span class="cx"> WEBCORE_EXPORT static String domainCausingJetsamKey();
</span><ins>+ WEBCORE_EXPORT static String simulatedPageCrashKey();
+ WEBCORE_EXPORT static String exceededActiveMemoryLimitKey();
+ WEBCORE_EXPORT static String exceededInactiveMemoryLimitKey();
+ WEBCORE_EXPORT static String exceededBackgroundCPULimitKey();
</ins><span class="cx"> static String domainVisitedKey();
</span><span class="cx"> static String engineFailedToLoadKey();
</span><span class="cx"> WEBCORE_EXPORT static String entryRightlyNotWarmedUpKey();
</span></span></pre></div>
<a id="trunkSourceWebCorepageMemoryReleasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/MemoryRelease.cpp (214319 => 214320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/MemoryRelease.cpp 2017-03-23 21:54:58 UTC (rev 214319)
+++ trunk/Source/WebCore/page/MemoryRelease.cpp 2017-03-23 22:21:31 UTC (rev 214320)
</span><span class="lines">@@ -186,13 +186,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void didExceedMemoryLimitAndFailedToRecover()
-{
- RELEASE_LOG(MemoryPressure, "Crashing non-visible process due to excessive memory usage + inability to free up memory below panic threshold.");
- logMemoryStatisticsAtTimeOfDeath();
- CRASH();
-}
-
</del><span class="cx"> #if !PLATFORM(COCOA)
</span><span class="cx"> void platformReleaseMemory(Critical) { }
</span><span class="cx"> void jettisonExpensiveObjectsOnTopLevelNavigation() { }
</span></span></pre></div>
<a id="trunkSourceWebCorepageMemoryReleaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/MemoryRelease.h (214319 => 214320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/MemoryRelease.h 2017-03-23 21:54:58 UTC (rev 214319)
+++ trunk/Source/WebCore/page/MemoryRelease.h 2017-03-23 22:21:31 UTC (rev 214320)
</span><span class="lines">@@ -34,6 +34,5 @@
</span><span class="cx"> void jettisonExpensiveObjectsOnTopLevelNavigation();
</span><span class="cx"> WEBCORE_EXPORT void registerMemoryReleaseNotifyCallbacks();
</span><span class="cx"> WEBCORE_EXPORT void logMemoryStatisticsAtTimeOfDeath();
</span><del>-WEBCORE_EXPORT NO_RETURN_DUE_TO_CRASH void didExceedMemoryLimitAndFailedToRecover();
</del><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (214319 => 214320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-03-23 21:54:58 UTC (rev 214319)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-23 22:21:31 UTC (rev 214320)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2017-03-23 Andreas Kling <akling@apple.com>
+
+ Let the UI process do memory kills and replace crashes with diagnostic logging.
+ <https://webkit.org/b/170016>
+ <rdar://problem/31091292>
+
+ Reviewed by Chris Dumez.
+
+ Have the WebProcess memory kill callback send a notification to the UI process
+ instead of outright crashing. The UI process then sends a diagnostic logging message
+ before carefully taking down the web process.
+
+ Also add drive-by diagnostic logging for background CPU limit kills.
+
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::simulateProcessCrash):
+ (WebKit::WebProcessProxy::didExceedActiveMemoryLimit):
+ (WebKit::WebProcessProxy::didExceedInactiveMemoryLimit):
+ (WebKit::WebProcessProxy::didExceedBackgroundCPULimit):
+ * UIProcess/WebProcessProxy.h:
+ * UIProcess/WebProcessProxy.messages.in:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess):
+
</ins><span class="cx"> 2017-03-23 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Test DataDetectors supported schemes in lowercase
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (214319 => 214320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2017-03-23 21:54:58 UTC (rev 214319)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2017-03-23 22:21:31 UTC (rev 214320)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span><span class="cx"> #include "WebUserContentControllerProxy.h"
</span><span class="cx"> #include "WebsiteData.h"
</span><ins>+#include <WebCore/DiagnosticLoggingKeys.h>
</ins><span class="cx"> #include <WebCore/SuddenTermination.h>
</span><span class="cx"> #include <WebCore/URL.h>
</span><span class="cx"> #include <stdio.h>
</span><span class="lines">@@ -1127,6 +1128,39 @@
</span><span class="cx"> return vector;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static String diagnosticLoggingKeyForSimulatedCrashReason(SimulatedCrashReason reason)
+{
+ switch (reason) {
+ case SimulatedCrashReason::ExceededActiveMemoryLimit:
+ return DiagnosticLoggingKeys::exceededActiveMemoryLimitKey();
+ case SimulatedCrashReason::ExceededInactiveMemoryLimit:
+ return DiagnosticLoggingKeys::exceededInactiveMemoryLimitKey();
+ case SimulatedCrashReason::ExceededBackgroundCPULimit:
+ return DiagnosticLoggingKeys::exceededBackgroundCPULimitKey();
+ }
+}
+
+void WebProcessProxy::simulateProcessCrash(SimulatedCrashReason reason)
+{
+ for (auto& page : pagesCopy(pages())) {
+ page->logDiagnosticMessage(DiagnosticLoggingKeys::simulatedPageCrashKey(), diagnosticLoggingKeyForSimulatedCrashReason(reason), ShouldSample::No);
+ page->terminateProcess();
+ page->processDidCrash();
+ }
+}
+
+void WebProcessProxy::didExceedActiveMemoryLimit()
+{
+ RELEASE_LOG(PerformanceLogging, "%p - WebProcessProxy::didExceedActiveMemoryLimit() Terminating WebProcess that has exceeded the active memory limit", this);
+ simulateProcessCrash(SimulatedCrashReason::ExceededActiveMemoryLimit);
+}
+
+void WebProcessProxy::didExceedInactiveMemoryLimit()
+{
+ RELEASE_LOG(PerformanceLogging, "%p - WebProcessProxy::didExceedInactiveMemoryLimit() Terminating WebProcess that has exceeded the inactive memory limit", this);
+ simulateProcessCrash(SimulatedCrashReason::ExceededInactiveMemoryLimit);
+}
+
</ins><span class="cx"> void WebProcessProxy::didExceedBackgroundCPULimit()
</span><span class="cx"> {
</span><span class="cx"> for (auto& page : pages()) {
</span><span class="lines">@@ -1140,11 +1174,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RELEASE_LOG(PerformanceLogging, "%p - WebProcessProxy::didExceedBackgroundCPULimit() Terminating background WebProcess that has exceeded the background CPU limit", this);
</span><del>-
- for (auto& page : pagesCopy(pages())) {
- page->terminateProcess();
- page->processDidCrash();
- }
</del><ins>+ simulateProcessCrash(SimulatedCrashReason::ExceededBackgroundCPULimit);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::updateBackgroundResponsivenessTimer()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (214319 => 214320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2017-03-23 21:54:58 UTC (rev 214319)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2017-03-23 22:21:31 UTC (rev 214320)
</span><span class="lines">@@ -55,6 +55,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+enum class SimulatedCrashReason {
+ ExceededActiveMemoryLimit,
+ ExceededInactiveMemoryLimit,
+ ExceededBackgroundCPULimit,
+};
+
</ins><span class="cx"> class NetworkProcessProxy;
</span><span class="cx"> class UserMediaCaptureManagerProxy;
</span><span class="cx"> class WebBackForwardListItem;
</span><span class="lines">@@ -165,7 +171,10 @@
</span><span class="cx"> bool isUnderMemoryPressure() const { return m_isUnderMemoryPressure; }
</span><span class="cx">
</span><span class="cx"> void processTerminated();
</span><ins>+
</ins><span class="cx"> void didExceedBackgroundCPULimit();
</span><ins>+ void didExceedActiveMemoryLimit();
+ void didExceedInactiveMemoryLimit();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit WebProcessProxy(WebProcessPool&, WebsiteDataStore*);
</span><span class="lines">@@ -238,6 +247,8 @@
</span><span class="cx">
</span><span class="cx"> bool canTerminateChildProcess();
</span><span class="cx">
</span><ins>+ void simulateProcessCrash(SimulatedCrashReason);
+
</ins><span class="cx"> ResponsivenessTimer m_responsivenessTimer;
</span><span class="cx"> BackgroundProcessResponsivenessTimer m_backgroundResponsivenessTimer;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in (214319 => 214320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in 2017-03-23 21:54:58 UTC (rev 214319)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in 2017-03-23 22:21:31 UTC (rev 214320)
</span><span class="lines">@@ -45,6 +45,8 @@
</span><span class="cx">
</span><span class="cx"> SetIsHoldingLockedFiles(bool isHoldingLockedFiles)
</span><span class="cx">
</span><ins>+ DidExceedActiveMemoryLimit()
+ DidExceedInactiveMemoryLimit()
</ins><span class="cx"> DidExceedBackgroundCPULimit()
</span><span class="cx">
</span><span class="cx"> RetainIconForPageURL(String pageURL)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (214319 => 214320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2017-03-23 21:54:58 UTC (rev 214319)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2017-03-23 22:21:31 UTC (rev 214320)
</span><span class="lines">@@ -267,8 +267,12 @@
</span><span class="cx"> });
</span><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101200
</span><span class="cx"> memoryPressureHandler.setShouldUsePeriodicMemoryMonitor(true);
</span><del>- memoryPressureHandler.setMemoryKillCallback([] () {
- WebCore::didExceedMemoryLimitAndFailedToRecover();
</del><ins>+ memoryPressureHandler.setMemoryKillCallback([this] () {
+ WebCore::logMemoryStatisticsAtTimeOfDeath();
+ if (MemoryPressureHandler::singleton().processState() == WebsamProcessState::Active)
+ parentProcessConnection()->send(Messages::WebProcessProxy::DidExceedActiveMemoryLimit(), 0);
+ else
+ parentProcessConnection()->send(Messages::WebProcessProxy::DidExceedInactiveMemoryLimit(), 0);
</ins><span class="cx"> });
</span><span class="cx"> #endif
</span><span class="cx"> memoryPressureHandler.setMemoryPressureStatusChangedCallback([this](bool isUnderMemoryPressure) {
</span></span></pre>
</div>
</div>
</body>
</html>