<!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>[287907] trunk</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/287907">287907</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2022-01-11 20:01:30 -0800 (Tue, 11 Jan 2022)</dd>
</dl>

<h3>Log Message</h3>
<pre>WebPageProxy destruction should not launch a network process
https://bugs.webkit.org/show_bug.cgi?id=235086

Reviewed by Alex Christensen.

Source/WebKit:

Inspired by a backtrace in rdar://86706412.

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::~WebPageProxy): No need to message the network
process requesting our removal if it doesn't exist.

Tools:

* TestWebKitAPI/Tests/WebKitCocoa/NetworkProcess.mm:
(TEST): Include WebView destruction in the test. Also do a little
run loop spinning, to give the test a better chance of failing when
async behavior does launch the Network process.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebPageProxycpp">trunk/Source/WebKit/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaNetworkProcessmm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/NetworkProcess.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (287906 => 287907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2022-01-12 02:14:34 UTC (rev 287906)
+++ trunk/Source/WebKit/ChangeLog       2022-01-12 04:01:30 UTC (rev 287907)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2022-01-11  Geoffrey Garen  <ggaren@apple.com>
+
+        WebPageProxy destruction should not launch a network process
+        https://bugs.webkit.org/show_bug.cgi?id=235086
+
+        Reviewed by Alex Christensen.
+
+        Inspired by a backtrace in rdar://86706412.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::~WebPageProxy): No need to message the network
+        process requesting our removal if it doesn't exist.
+
</ins><span class="cx"> 2022-01-11  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Remove references to moved/deleted files in WebKit.xcodeproj
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (287906 => 287907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp   2022-01-12 02:14:34 UTC (rev 287906)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp      2022-01-12 04:01:30 UTC (rev 287907)
</span><span class="lines">@@ -606,7 +606,8 @@
</span><span class="cx">     for (auto& callback : m_nextActivityStateChangeCallbacks)
</span><span class="cx">         callback();
</span><span class="cx"> 
</span><del>-    websiteDataStore().networkProcess().send(Messages::NetworkProcess::RemoveWebPageNetworkParameters(sessionID(), m_identifier), 0);
</del><ins>+    if (auto* networkProcess = websiteDataStore().networkProcessIfExists())
+        networkProcess->send(Messages::NetworkProcess::RemoveWebPageNetworkParameters(sessionID(), m_identifier), 0);
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(MEDIA_SESSION_COORDINATOR) && HAVE(GROUP_ACTIVITIES)
</span><span class="cx">     if (m_preferences->mediaSessionCoordinatorEnabled())
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (287906 => 287907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2022-01-12 02:14:34 UTC (rev 287906)
+++ trunk/Tools/ChangeLog       2022-01-12 04:01:30 UTC (rev 287907)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2022-01-11  Geoffrey Garen  <ggaren@apple.com>
+
+        WebPageProxy destruction should not launch a network process
+        https://bugs.webkit.org/show_bug.cgi?id=235086
+
+        Reviewed by Alex Christensen.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/NetworkProcess.mm:
+        (TEST): Include WebView destruction in the test. Also do a little
+        run loop spinning, to give the test a better chance of failing when
+        async behavior does launch the Network process.
+
</ins><span class="cx"> 2022-01-11  Carlos Garcia Campos  <cgarcia@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GTK][a11y] Web process crashes in some sites having SVG images
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaNetworkProcessmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/NetworkProcess.mm (287906 => 287907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/NetworkProcess.mm    2022-01-12 02:14:34 UTC (rev 287906)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/NetworkProcess.mm       2022-01-12 04:01:30 UTC (rev 287907)
</span><span class="lines">@@ -87,11 +87,18 @@
</span><span class="cx"> 
</span><span class="cx"> TEST(NetworkProcess, LaunchOnlyWhenNecessary)
</span><span class="cx"> {
</span><del>-    auto webView = adoptNS([WKWebView new]);
-    [webView configuration].websiteDataStore._resourceLoadStatisticsEnabled = YES;
-    [[webView configuration].processPool _registerURLSchemeAsSecure:@"test"];
-    [[webView configuration].processPool _registerURLSchemeAsBypassingContentSecurityPolicy:@"test"];
-    EXPECT_FALSE([[webView configuration].websiteDataStore _networkProcessExists]);
</del><ins>+    RetainPtr<WKWebsiteDataStore> websiteDataStore;
+
+    @autoreleasepool {
+        auto webView = adoptNS([WKWebView new]);
+        websiteDataStore = adoptNS([webView configuration].websiteDataStore);
+        [websiteDataStore _setResourceLoadStatisticsEnabled:YES];
+        [[webView configuration].processPool _registerURLSchemeAsSecure:@"test"];
+        [[webView configuration].processPool _registerURLSchemeAsBypassingContentSecurityPolicy:@"test"];
+    }
+
+    TestWebKitAPI::Util::spinRunLoop(10);
+    EXPECT_FALSE([websiteDataStore _networkProcessExists]);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(NetworkProcess, CrashWhenNotAssociatedWithDataStore)
</span></span></pre>
</div>
</div>

</body>
</html>