<!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>[212832] trunk/Source/WebKit2</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/212832">212832</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-02-22 09:15:45 -0800 (Wed, 22 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Call processDidBecomeUnresponsive delegate when a background process is unresponsive
https://bugs.webkit.org/show_bug.cgi?id=168683
<rdar://problem/30558745>
Reviewed by Dan Bernstein.
Call processDidBecomeUnresponsive delegate when a background process is unresponsive
instead of killing it on WebKit side. This gives the client the choice about what it
wants to do about this process.
* UIProcess/API/APIProcessPoolConfiguration.cpp:
(API::ProcessPoolConfiguration::copy):
* UIProcess/API/APIProcessPoolConfiguration.h:
* UIProcess/API/C/WKContext.cpp:
* UIProcess/API/C/WKContextPrivate.h:
* UIProcess/BackgroundProcessResponsivenessTimer.cpp: Renamed from Source/WebKit2/UIProcess/UnresponsiveWebProcessTerminator.cpp.
(WebKit::BackgroundProcessResponsivenessTimer::BackgroundProcessResponsivenessTimer):
(WebKit::BackgroundProcessResponsivenessTimer::updateState):
(WebKit::BackgroundProcessResponsivenessTimer::timerFired):
* UIProcess/BackgroundProcessResponsivenessTimer.h: Renamed from Source/WebKit2/UIProcess/UnresponsiveWebProcessTerminator.h.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::reattachToWebProcess):
(WebKit::WebPageProxy::dispatchActivityStateChange):
(WebKit::WebPageProxy::terminateProcess):
* UIProcess/WebPageProxy.h:
* UIProcess/WebProcessProxy.cpp:
(WebKit::m_backgroundResponsivenessTimer):
* UIProcess/WebProcessProxy.h:
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationcpp">trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationh">trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextPrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</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="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessBackgroundProcessResponsivenessTimercpp">trunk/Source/WebKit2/UIProcess/BackgroundProcessResponsivenessTimer.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessBackgroundProcessResponsivenessTimerh">trunk/Source/WebKit2/UIProcess/BackgroundProcessResponsivenessTimer.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessUnresponsiveWebProcessTerminatorcpp">trunk/Source/WebKit2/UIProcess/UnresponsiveWebProcessTerminator.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessUnresponsiveWebProcessTerminatorh">trunk/Source/WebKit2/UIProcess/UnresponsiveWebProcessTerminator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (212831 => 212832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2017-02-22 17:05:22 UTC (rev 212831)
+++ trunk/Source/WebKit2/CMakeLists.txt 2017-02-22 17:15:45 UTC (rev 212832)
</span><span class="lines">@@ -273,6 +273,7 @@
</span><span class="cx">
</span><span class="cx"> Shared/WebsiteData/WebsiteData.cpp
</span><span class="cx">
</span><ins>+ UIProcess/BackgroundProcessResponsivenessTimer.cpp
</ins><span class="cx"> UIProcess/ChildProcessProxy.cpp
</span><span class="cx"> UIProcess/DrawingAreaProxy.cpp
</span><span class="cx"> UIProcess/FrameLoadState.cpp
</span><span class="lines">@@ -285,7 +286,6 @@
</span><span class="cx"> UIProcess/ResponsivenessTimer.cpp
</span><span class="cx"> UIProcess/StatisticsRequest.cpp
</span><span class="cx"> UIProcess/TextCheckerCompletion.cpp
</span><del>- UIProcess/UnresponsiveWebProcessTerminator.cpp
</del><span class="cx"> UIProcess/UserMediaPermissionCheckProxy.cpp
</span><span class="cx"> UIProcess/UserMediaPermissionRequestManagerProxy.cpp
</span><span class="cx"> UIProcess/UserMediaPermissionRequestProxy.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (212831 => 212832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-22 17:05:22 UTC (rev 212831)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-22 17:15:45 UTC (rev 212832)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2017-02-22 Chris Dumez <cdumez@apple.com>
+
+ [WK2] Call processDidBecomeUnresponsive delegate when a background process is unresponsive
+ https://bugs.webkit.org/show_bug.cgi?id=168683
+ <rdar://problem/30558745>
+
+ Reviewed by Dan Bernstein.
+
+ Call processDidBecomeUnresponsive delegate when a background process is unresponsive
+ instead of killing it on WebKit side. This gives the client the choice about what it
+ wants to do about this process.
+
+ * UIProcess/API/APIProcessPoolConfiguration.cpp:
+ (API::ProcessPoolConfiguration::copy):
+ * UIProcess/API/APIProcessPoolConfiguration.h:
+ * UIProcess/API/C/WKContext.cpp:
+ * UIProcess/API/C/WKContextPrivate.h:
+ * UIProcess/BackgroundProcessResponsivenessTimer.cpp: Renamed from Source/WebKit2/UIProcess/UnresponsiveWebProcessTerminator.cpp.
+ (WebKit::BackgroundProcessResponsivenessTimer::BackgroundProcessResponsivenessTimer):
+ (WebKit::BackgroundProcessResponsivenessTimer::updateState):
+ (WebKit::BackgroundProcessResponsivenessTimer::timerFired):
+ * UIProcess/BackgroundProcessResponsivenessTimer.h: Renamed from Source/WebKit2/UIProcess/UnresponsiveWebProcessTerminator.h.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::reattachToWebProcess):
+ (WebKit::WebPageProxy::dispatchActivityStateChange):
+ (WebKit::WebPageProxy::terminateProcess):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::m_backgroundResponsivenessTimer):
+ * UIProcess/WebProcessProxy.h:
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2017-02-22 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> NetworkProcess: Stop disabling buffering when NETWORK_CACHE is disabled in build
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp (212831 => 212832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2017-02-22 17:05:22 UTC (rev 212831)
+++ trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2017-02-22 17:15:45 UTC (rev 212832)
</span><span class="lines">@@ -96,7 +96,6 @@
</span><span class="cx"> copy->m_maximumProcessCount = this->m_maximumProcessCount;
</span><span class="cx"> copy->m_cacheModel = this->m_cacheModel;
</span><span class="cx"> copy->m_diskCacheSpeculativeValidationEnabled = this->m_diskCacheSpeculativeValidationEnabled;
</span><del>- copy->m_unresponsiveBackgroundProcessesTerminationEnabled = this->m_unresponsiveBackgroundProcessesTerminationEnabled;
</del><span class="cx"> copy->m_diskCacheSizeOverride = this->m_diskCacheSizeOverride;
</span><span class="cx"> copy->m_applicationCacheDirectory = this->m_applicationCacheDirectory;
</span><span class="cx"> copy->m_applicationCacheFlatFileSubdirectoryName = this->m_applicationCacheFlatFileSubdirectoryName;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h (212831 => 212832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2017-02-22 17:05:22 UTC (rev 212831)
+++ trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2017-02-22 17:15:45 UTC (rev 212832)
</span><span class="lines">@@ -55,9 +55,6 @@
</span><span class="cx"> bool diskCacheSpeculativeValidationEnabled() const { return m_diskCacheSpeculativeValidationEnabled; }
</span><span class="cx"> void setDiskCacheSpeculativeValidationEnabled(bool enabled) { m_diskCacheSpeculativeValidationEnabled = enabled; }
</span><span class="cx">
</span><del>- bool unresponsiveBackgroundProcessesTerminationEnabled() const { return m_unresponsiveBackgroundProcessesTerminationEnabled; }
- void setUnresponsiveBackgroundProcessesTerminationEnabled(bool enabled) { m_unresponsiveBackgroundProcessesTerminationEnabled = enabled; }
-
</del><span class="cx"> WebKit::CacheModel cacheModel() const { return m_cacheModel; }
</span><span class="cx"> void setCacheModel(WebKit::CacheModel cacheModel) { m_cacheModel = cacheModel; }
</span><span class="cx">
</span><span class="lines">@@ -124,7 +121,6 @@
</span><span class="cx">
</span><span class="cx"> unsigned m_maximumProcessCount { 0 };
</span><span class="cx"> bool m_diskCacheSpeculativeValidationEnabled { false };
</span><del>- bool m_unresponsiveBackgroundProcessesTerminationEnabled { false };
</del><span class="cx"> WebKit::CacheModel m_cacheModel { WebKit::CacheModelPrimaryWebBrowser };
</span><span class="cx"> int64_t m_diskCacheSizeOverride { -1 };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (212831 => 212832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2017-02-22 17:05:22 UTC (rev 212831)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2017-02-22 17:15:45 UTC (rev 212832)
</span><span class="lines">@@ -397,11 +397,6 @@
</span><span class="cx"> toImpl(contextRef)->configuration().setDiskCacheSpeculativeValidationEnabled(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKContextSetUnresponsiveBackgroundProcessesTerminationEnabled(WKContextRef contextRef, bool value)
-{
- toImpl(contextRef)->configuration().setUnresponsiveBackgroundProcessesTerminationEnabled(value);
-}
-
</del><span class="cx"> WKCookieManagerRef WKContextGetCookieManager(WKContextRef contextRef)
</span><span class="cx"> {
</span><span class="cx"> return toAPI(toImpl(contextRef)->supplement<WebCookieManagerProxy>());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h (212831 => 212832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h 2017-02-22 17:05:22 UTC (rev 212831)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h 2017-02-22 17:15:45 UTC (rev 212832)
</span><span class="lines">@@ -62,8 +62,6 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT void WKContextSetDiskCacheSpeculativeValidationEnabled(WKContextRef context, bool value);
</span><span class="cx">
</span><del>-WK_EXPORT void WKContextSetUnresponsiveBackgroundProcessesTerminationEnabled(WKContextRef context, bool value);
-
</del><span class="cx"> WK_EXPORT void WKContextSetIconDatabasePath(WKContextRef context, WKStringRef iconDatabasePath);
</span><span class="cx">
</span><span class="cx"> WK_EXPORT void WKContextAllowSpecificHTTPSCertificateForHost(WKContextRef context, WKCertificateInfoRef certificate, WKStringRef host);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessBackgroundProcessResponsivenessTimercppfromrev212831trunkSourceWebKit2UIProcessUnresponsiveWebProcessTerminatorcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/BackgroundProcessResponsivenessTimer.cpp (from rev 212831, trunk/Source/WebKit2/UIProcess/UnresponsiveWebProcessTerminator.cpp) (0 => 212832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/BackgroundProcessResponsivenessTimer.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/BackgroundProcessResponsivenessTimer.cpp 2017-02-22 17:15:45 UTC (rev 212832)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "BackgroundProcessResponsivenessTimer.h"
+
+#include "Logging.h"
+
+namespace WebKit {
+
+static const std::chrono::seconds initialInterval { 20s };
+static const std::chrono::seconds maximumInterval { 8h };
+
+BackgroundProcessResponsivenessTimer::BackgroundProcessResponsivenessTimer(WebProcessProxy& webProcessProxy)
+ : m_webProcessProxy(webProcessProxy)
+ , m_interval(initialInterval)
+ , m_timer(RunLoop::main(), this, &BackgroundProcessResponsivenessTimer::timerFired)
+{
+}
+
+void BackgroundProcessResponsivenessTimer::updateState()
+{
+ if (!shouldBeActive()) {
+ if (m_timer.isActive()) {
+ m_interval = initialInterval;
+ m_timer.stop();
+ }
+ return;
+ }
+
+ if (!m_timer.isActive())
+ m_timer.startOneShot(m_interval);
+}
+
+void BackgroundProcessResponsivenessTimer::timerFired()
+{
+ ASSERT(shouldBeActive());
+ // WebProcessProxy::responsive() takes care of calling processDidBecomeUnresponsive for us.
+ m_webProcessProxy.isResponsive([this](bool processIsResponsive) {
+ if (processIsResponsive) {
+ // Exponential backoff to avoid waking up the process too often.
+ m_interval = std::min(m_interval * 2, maximumInterval);
+ m_timer.startOneShot(m_interval);
+ return;
+ }
+
+ RELEASE_LOG_ERROR(PerformanceLogging, "Notified the client that a background WebProcess has become unresponsive");
+ WTFLogAlways("Notified the client that a background WebProcess has become unresponsive");
+ m_interval = initialInterval;
+ });
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessBackgroundProcessResponsivenessTimerhfromrev212831trunkSourceWebKit2UIProcessUnresponsiveWebProcessTerminatorh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/BackgroundProcessResponsivenessTimer.h (from rev 212831, trunk/Source/WebKit2/UIProcess/UnresponsiveWebProcessTerminator.h) (0 => 212832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/BackgroundProcessResponsivenessTimer.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/BackgroundProcessResponsivenessTimer.h 2017-02-22 17:15:45 UTC (rev 212832)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include "WebProcessProxy.h"
+#include <wtf/RunLoop.h>
+
+namespace WebKit {
+
+class BackgroundProcessResponsivenessTimer {
+public:
+ explicit BackgroundProcessResponsivenessTimer(WebProcessProxy&);
+ void updateState();
+
+private:
+ void timerFired();
+ bool shouldBeActive() const { return !m_webProcessProxy.visiblePageCount() && m_webProcessProxy.pageCount(); }
+
+ WebProcessProxy& m_webProcessProxy;
+ std::chrono::seconds m_interval;
+ RunLoop::Timer<BackgroundProcessResponsivenessTimer> m_timer;
+};
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUnresponsiveWebProcessTerminatorcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/UnresponsiveWebProcessTerminator.cpp (212831 => 212832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UnresponsiveWebProcessTerminator.cpp 2017-02-22 17:05:22 UTC (rev 212831)
+++ trunk/Source/WebKit2/UIProcess/UnresponsiveWebProcessTerminator.cpp 2017-02-22 17:15:45 UTC (rev 212832)
</span><span class="lines">@@ -1,82 +0,0 @@
</span><del>-/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "UnresponsiveWebProcessTerminator.h"
-
-#include "Logging.h"
-
-namespace WebKit {
-
-static const std::chrono::seconds initialInterval { 20s };
-static const std::chrono::seconds maximumInterval { 8h };
-
-UnresponsiveWebProcessTerminator::UnresponsiveWebProcessTerminator(WebProcessProxy& webProcessProxy)
- : m_webProcessProxy(webProcessProxy)
- , m_interval(initialInterval)
- , m_timer(RunLoop::main(), this, &UnresponsiveWebProcessTerminator::timerFired)
-{
-}
-
-void UnresponsiveWebProcessTerminator::updateState()
-{
- if (!shouldBeActive()) {
- if (m_timer.isActive()) {
- m_interval = initialInterval;
- m_timer.stop();
- }
- return;
- }
-
- if (!m_timer.isActive())
- m_timer.startOneShot(m_interval);
-}
-
-static Vector<RefPtr<WebPageProxy>> pagesCopy(WTF::IteratorRange<WebProcessProxy::WebPageProxyMap::const_iterator::Values> pages)
-{
- Vector<RefPtr<WebPageProxy>> vector;
- for (auto& page : pages)
- vector.append(page);
- return vector;
-}
-
-void UnresponsiveWebProcessTerminator::timerFired()
-{
- ASSERT(shouldBeActive());
- m_webProcessProxy.isResponsive([this](bool processIsResponsive) {
- if (processIsResponsive) {
- // Exponential backoff to avoid waking up the process too often.
- m_interval = std::min(m_interval * 2, maximumInterval);
- m_timer.startOneShot(m_interval);
- return;
- }
-
- RELEASE_LOG_ERROR(PerformanceLogging, "Killing a background WebProcess because it is not responsive");
- for (auto& page : pagesCopy(m_webProcessProxy.pages()))
- page->terminateProcess(WebPageProxy::TerminationReason::UnresponsiveWhileInBackground);
- });
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUnresponsiveWebProcessTerminatorh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/UnresponsiveWebProcessTerminator.h (212831 => 212832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UnresponsiveWebProcessTerminator.h 2017-02-22 17:05:22 UTC (rev 212831)
+++ trunk/Source/WebKit2/UIProcess/UnresponsiveWebProcessTerminator.h 2017-02-22 17:15:45 UTC (rev 212832)
</span><span class="lines">@@ -1,47 +0,0 @@
</span><del>-/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include "WebProcessProxy.h"
-#include <wtf/RunLoop.h>
-
-namespace WebKit {
-
-class UnresponsiveWebProcessTerminator {
-public:
- explicit UnresponsiveWebProcessTerminator(WebProcessProxy&);
- void updateState();
-
-private:
- void timerFired();
- bool shouldBeActive() const { return !m_webProcessProxy.visiblePageCount() && m_webProcessProxy.pageCount(); }
-
- WebProcessProxy& m_webProcessProxy;
- std::chrono::seconds m_interval;
- RunLoop::Timer<UnresponsiveWebProcessTerminator> m_timer;
-};
-
-}
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (212831 => 212832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-02-22 17:05:22 UTC (rev 212831)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-02-22 17:15:45 UTC (rev 212832)
</span><span class="lines">@@ -712,7 +712,6 @@
</span><span class="cx"> ASSERT(m_process->state() == WebProcessProxy::State::Terminated);
</span><span class="cx">
</span><span class="cx"> m_isValid = true;
</span><del>- m_wasKilledForBeingUnresponsiveWhileInBackground = false;
</del><span class="cx"> m_process->removeWebPage(m_pageID);
</span><span class="cx"> m_process->removeMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID);
</span><span class="cx">
</span><span class="lines">@@ -1514,19 +1513,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::reloadAfterBeingKilledInBackground()
-{
- ASSERT(!isValid());
-
- RELEASE_LOG_IF_ALLOWED("%p - Reloading tab that was killed in the background", this);
-
- // Only report as a crash if the page was ever visible, otherwise silently reload.
- if (m_hasEverBeenVisible)
- processDidCrash();
- else
- reattachToWebProcessForReload();
-}
-
</del><span class="cx"> void WebPageProxy::dispatchActivityStateChange()
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -1533,11 +1519,8 @@
</span><span class="cx"> m_activityStateChangeDispatcher->invalidate();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (!isValid()) {
- if (m_potentiallyChangedActivityStateFlags & ActivityState::IsVisible && m_wasKilledForBeingUnresponsiveWhileInBackground)
- reloadAfterBeingKilledInBackground();
</del><ins>+ if (!isValid())
</ins><span class="cx"> return;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> // If the visibility state may have changed, then so may the visually idle & occluded agnostic state.
</span><span class="cx"> if (m_potentiallyChangedActivityStateFlags & ActivityState::IsVisible)
</span><span class="lines">@@ -1576,10 +1559,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (changed & ActivityState::IsVisible) {
</span><del>- if (isViewVisible()) {
- m_hasEverBeenVisible = true;
</del><ins>+ if (isViewVisible())
</ins><span class="cx"> m_visiblePageToken = m_process->visiblePageToken();
</span><del>- } else {
</del><ins>+ else {
</ins><span class="cx"> m_visiblePageToken = nullptr;
</span><span class="cx">
</span><span class="cx"> // If we've started the responsiveness timer as part of telling the web process to update the backing store
</span><span class="lines">@@ -2394,7 +2376,7 @@
</span><span class="cx"> m_process->send(Messages::WebPage::SetCustomTextEncodingName(encodingName), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::terminateProcess(TerminationReason terminationReason)
</del><ins>+void WebPageProxy::terminateProcess()
</ins><span class="cx"> {
</span><span class="cx"> // NOTE: This uses a check of m_isValid rather than calling isValid() since
</span><span class="cx"> // we want this to run even for pages being closed or that already closed.
</span><span class="lines">@@ -2403,7 +2385,6 @@
</span><span class="cx">
</span><span class="cx"> m_process->requestTermination();
</span><span class="cx"> resetStateAfterProcessExited();
</span><del>- m_wasKilledForBeingUnresponsiveWhileInBackground = terminationReason == TerminationReason::UnresponsiveWhileInBackground;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SessionState WebPageProxy::sessionState(const std::function<bool (WebBackForwardListItem&)>& filter) const
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (212831 => 212832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-02-22 17:05:22 UTC (rev 212831)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-02-22 17:15:45 UTC (rev 212832)
</span><span class="lines">@@ -675,8 +675,7 @@
</span><span class="cx">
</span><span class="cx"> double estimatedProgress() const;
</span><span class="cx">
</span><del>- enum class TerminationReason { UnresponsiveWhileInBackground, Other };
- void terminateProcess(TerminationReason = TerminationReason::Other);
</del><ins>+ void terminateProcess();
</ins><span class="cx">
</span><span class="cx"> SessionState sessionState(const std::function<bool (WebBackForwardListItem&)>& = nullptr) const;
</span><span class="cx"> RefPtr<API::Navigation> restoreFromSessionState(SessionState, bool navigate);
</span><span class="lines">@@ -1575,7 +1574,6 @@
</span><span class="cx"> void dispatchActivityStateChange();
</span><span class="cx"> void viewDidLeaveWindow();
</span><span class="cx"> void viewDidEnterWindow();
</span><del>- void reloadAfterBeingKilledInBackground();
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> void didPerformImmediateActionHitTest(const WebHitTestResultData&, bool contentPreventsDefault, const UserData&);
</span><span class="lines">@@ -1950,7 +1948,6 @@
</span><span class="cx"> bool m_hasHadSelectionChangesFromUserInteraction { false };
</span><span class="cx"> bool m_needsHiddenContentEditableQuirk { false };
</span><span class="cx"> bool m_needsPlainTextQuirk { false };
</span><del>- bool m_hasEverBeenVisible { false };
</del><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx"> bool m_hasMediaSessionWithActiveMediaElements { false };
</span><span class="lines">@@ -1976,7 +1973,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool m_isUsingHighPerformanceWebGL { false };
</span><del>- bool m_wasKilledForBeingUnresponsiveWhileInBackground { false };
</del><span class="cx">
</span><span class="cx"> WeakPtrFactory<WebPageProxy> m_weakPtrFactory;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (212831 => 212832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2017-02-22 17:05:22 UTC (rev 212831)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2017-02-22 17:15:45 UTC (rev 212832)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "APIFrameHandle.h"
</span><span class="cx"> #include "APIPageGroupHandle.h"
</span><span class="cx"> #include "APIPageHandle.h"
</span><ins>+#include "BackgroundProcessResponsivenessTimer.h"
</ins><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "DownloadProxyMap.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="lines">@@ -36,7 +37,6 @@
</span><span class="cx"> #include "PluginProcessManager.h"
</span><span class="cx"> #include "TextChecker.h"
</span><span class="cx"> #include "TextCheckerState.h"
</span><del>-#include "UnresponsiveWebProcessTerminator.h"
</del><span class="cx"> #include "UserData.h"
</span><span class="cx"> #include "WebBackForwardListItem.h"
</span><span class="cx"> #include "WebIconDatabase.h"
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> , m_throttler(*this)
</span><span class="cx"> , m_isResponsive(NoOrMaybe::Maybe)
</span><span class="cx"> , m_visiblePageCounter([this](RefCounterEvent) { updateBackgroundResponsivenessTimer(); })
</span><del>- , m_backgroundResponsivenessTimer(processPool.configuration().unresponsiveBackgroundProcessesTerminationEnabled() ? std::make_unique<UnresponsiveWebProcessTerminator>(*this) : nullptr)
</del><ins>+ , m_backgroundResponsivenessTimer(std::make_unique<BackgroundProcessResponsivenessTimer>(*this))
</ins><span class="cx"> {
</span><span class="cx"> WebPasteboardProxy::singleton().addWebProcessProxy(*this);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (212831 => 212832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2017-02-22 17:05:22 UTC (rev 212831)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2017-02-22 17:15:45 UTC (rev 212832)
</span><span class="lines">@@ -54,8 +54,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+class BackgroundProcessResponsivenessTimer;
</ins><span class="cx"> class NetworkProcessProxy;
</span><del>-class UnresponsiveWebProcessTerminator;
</del><span class="cx"> class WebBackForwardListItem;
</span><span class="cx"> class WebPageGroup;
</span><span class="cx"> class WebProcessPool;
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx"> Vector<std::function<void(bool webProcessIsResponsive)>> m_isResponsiveCallbacks;
</span><span class="cx">
</span><span class="cx"> VisibleWebPageCounter m_visiblePageCounter;
</span><del>- std::unique_ptr<UnresponsiveWebProcessTerminator> m_backgroundResponsivenessTimer;
</del><ins>+ std::unique_ptr<BackgroundProcessResponsivenessTimer> m_backgroundResponsivenessTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (212831 => 212832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2017-02-22 17:05:22 UTC (rev 212831)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2017-02-22 17:15:45 UTC (rev 212832)
</span><span class="lines">@@ -898,8 +898,8 @@
</span><span class="cx"> 41FAF5F81E3C1021001AE678 /* LibWebRTCResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FAF5F61E3C0B47001AE678 /* LibWebRTCResolver.h */; };
</span><span class="cx"> 41FAF5F91E3C1025001AE678 /* LibWebRTCResolver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41FAF5F71E3C0B47001AE678 /* LibWebRTCResolver.cpp */; };
</span><span class="cx"> 4450AEC01DC3FAE5009943F2 /* SharedMemoryCocoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4450AEBF1DC3FAE5009943F2 /* SharedMemoryCocoa.cpp */; };
</span><del>- 46A2B6081E5676A600C3DEDA /* UnresponsiveWebProcessTerminator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A2B6061E5675A200C3DEDA /* UnresponsiveWebProcessTerminator.cpp */; };
- 46A2B6091E5676A600C3DEDA /* UnresponsiveWebProcessTerminator.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A2B6071E5675A200C3DEDA /* UnresponsiveWebProcessTerminator.h */; };
</del><ins>+ 46A2B6081E5676A600C3DEDA /* BackgroundProcessResponsivenessTimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A2B6061E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.cpp */; };
+ 46A2B6091E5676A600C3DEDA /* BackgroundProcessResponsivenessTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A2B6071E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.h */; };
</ins><span class="cx"> 4A3CC18A19B063E700D14AEF /* UserMediaPermissionRequestManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A410F3919AF7B04002EBAB5 /* UserMediaPermissionRequestManagerProxy.cpp */; };
</span><span class="cx"> 4A3CC18B19B0640F00D14AEF /* UserMediaPermissionRequestManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A410F3A19AF7B04002EBAB5 /* UserMediaPermissionRequestManagerProxy.h */; };
</span><span class="cx"> 4A3CC18C19B0641500D14AEF /* UserMediaPermissionRequestProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A410F3B19AF7B04002EBAB5 /* UserMediaPermissionRequestProxy.cpp */; };
</span><span class="lines">@@ -3061,8 +3061,8 @@
</span><span class="cx"> 41FAF5F61E3C0B47001AE678 /* LibWebRTCResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LibWebRTCResolver.h; path = Network/webrtc/LibWebRTCResolver.h; sourceTree = "<group>"; };
</span><span class="cx"> 41FAF5F71E3C0B47001AE678 /* LibWebRTCResolver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LibWebRTCResolver.cpp; path = Network/webrtc/LibWebRTCResolver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 4450AEBF1DC3FAE5009943F2 /* SharedMemoryCocoa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SharedMemoryCocoa.cpp; path = cocoa/SharedMemoryCocoa.cpp; sourceTree = "<group>"; };
</span><del>- 46A2B6061E5675A200C3DEDA /* UnresponsiveWebProcessTerminator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UnresponsiveWebProcessTerminator.cpp; sourceTree = "<group>"; };
- 46A2B6071E5675A200C3DEDA /* UnresponsiveWebProcessTerminator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnresponsiveWebProcessTerminator.h; sourceTree = "<group>"; };
</del><ins>+ 46A2B6061E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BackgroundProcessResponsivenessTimer.cpp; sourceTree = "<group>"; };
+ 46A2B6071E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackgroundProcessResponsivenessTimer.h; sourceTree = "<group>"; };
</ins><span class="cx"> 4A410F3519AF7AC3002EBAB5 /* WKUserMediaPermissionRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKUserMediaPermissionRequest.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 4A410F3619AF7AC3002EBAB5 /* WKUserMediaPermissionRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserMediaPermissionRequest.h; sourceTree = "<group>"; };
</span><span class="cx"> 4A410F3919AF7B04002EBAB5 /* UserMediaPermissionRequestManagerProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserMediaPermissionRequestManagerProxy.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -6479,6 +6479,8 @@
</span><span class="cx"> 1AAF089E192681AC00B6390C /* UserContent */,
</span><span class="cx"> 1A53C2A31A325691004E8C70 /* WebsiteData */,
</span><span class="cx"> 7CD102D91866770600ED429D /* AutoCorrectionCallback.h */,
</span><ins>+ 46A2B6061E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.cpp */,
+ 46A2B6071E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.h */,
</ins><span class="cx"> E1513C64166EABB200149FCB /* ChildProcessProxy.cpp */,
</span><span class="cx"> E1513C65166EABB200149FCB /* ChildProcessProxy.h */,
</span><span class="cx"> BC2652121182608100243E12 /* DrawingAreaProxy.cpp */,
</span><span class="lines">@@ -6514,8 +6516,6 @@
</span><span class="cx"> 1AA417C912C00CCA002BE67B /* TextChecker.h */,
</span><span class="cx"> 1BB417C912C00CCA002BE67B /* TextCheckerCompletion.cpp */,
</span><span class="cx"> 1CC417C912C00CCA002BE67B /* TextCheckerCompletion.h */,
</span><del>- 46A2B6061E5675A200C3DEDA /* UnresponsiveWebProcessTerminator.cpp */,
- 46A2B6071E5675A200C3DEDA /* UnresponsiveWebProcessTerminator.h */,
</del><span class="cx"> 07297F9C1C17BBEA003F0735 /* UserMediaPermissionCheckProxy.cpp */,
</span><span class="cx"> 07297F9D1C17BBEA003F0735 /* UserMediaPermissionCheckProxy.h */,
</span><span class="cx"> 4A410F3919AF7B04002EBAB5 /* UserMediaPermissionRequestManagerProxy.cpp */,
</span><span class="lines">@@ -8027,7 +8027,7 @@
</span><span class="cx"> 4F601432155C5AA2001FBDE0 /* BlockingResponseMap.h in Headers */,
</span><span class="cx"> 1A5705111BE410E600874AF1 /* BlockSPI.h in Headers */,
</span><span class="cx"> BC3065FA1259344E00E71278 /* CacheModel.h in Headers */,
</span><del>- 46A2B6091E5676A600C3DEDA /* UnresponsiveWebProcessTerminator.h in Headers */,
</del><ins>+ 46A2B6091E5676A600C3DEDA /* BackgroundProcessResponsivenessTimer.h in Headers */,
</ins><span class="cx"> 1AA2E51D12E4C05E00BC4966 /* CGUtilities.h in Headers */,
</span><span class="cx"> 1A2D956F12848564001EB962 /* ChildProcess.h in Headers */,
</span><span class="cx"> 51FAEC3A1B0657630009C4E7 /* ChildProcessMessages.h in Headers */,
</span><span class="lines">@@ -9714,7 +9714,7 @@
</span><span class="cx"> 532159531DBAE7180054AA3C /* NetworkSession.cpp in Sources */,
</span><span class="cx"> 5C20CB9D1BB0DCFA00895BB1 /* NetworkSessionCocoa.mm in Sources */,
</span><span class="cx"> 31A2EC551489982E00810D71 /* NotificationPermissionRequest.cpp in Sources */,
</span><del>- 46A2B6081E5676A600C3DEDA /* UnresponsiveWebProcessTerminator.cpp in Sources */,
</del><ins>+ 46A2B6081E5676A600C3DEDA /* BackgroundProcessResponsivenessTimer.cpp in Sources */,
</ins><span class="cx"> 3131261E148FF82C00BA2A39 /* NotificationPermissionRequestManager.cpp in Sources */,
</span><span class="cx"> 31A2EC501489980500810D71 /* NotificationPermissionRequestManagerProxy.cpp in Sources */,
</span><span class="cx"> 1A2D848C127F6A49001EB962 /* NPIdentifierData.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>