Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 7513a10f40090089dc205e36f5955c44812638f6
https://github.com/WebKit/WebKit/commit/7513a10f40090089dc205e36f5955c44812638f6
Author: Brent Fulgham <[email protected]>
Date: 2026-03-17 (Tue, 17 Mar 2026)
Changed paths:
M Source/WebCore/loader/FrameLoader.cpp
M Source/WebKit/CMakeLists.txt
M Source/WebKit/DerivedSources-input.xcfilelist
M Source/WebKit/DerivedSources.make
M Source/WebKit/NetworkProcess/NetworkActivityTracker.h
A Source/WebKit/NetworkProcess/NetworkActivityTracker.serialization.in
M Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
M Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
M Source/WebKit/NetworkProcess/NetworkProcess.cpp
M Source/WebKit/NetworkProcess/NetworkProcess.h
M Source/WebKit/NetworkProcess/NetworkProcess.messages.in
M Source/WebKit/Scripts/webkit/messages.py
M Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivateForTesting.h
M Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm
M Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp
M Source/WebKit/UIProcess/Network/NetworkProcessProxy.h
M Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
M Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
M Source/WebKit/WebKit.xcodeproj/project.pbxproj
M Tools/TestWebKitAPI/SourcesCocoa.txt
M Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
A Tools/TestWebKitAPI/Tests/WebKitCocoa/NetworkActivityTrackerTests.mm
M Tools/TestWebKitAPI/Tests/WebKitCocoa/SiteIsolationUtilities.mm
Log Message:
-----------
100% of page load nw_activities from WebKit appear to be completed with
reason "cancelled"
https://bugs.webkit.org/show_bug.cgi?id=309852
<rdar://problem/81871432>
Reviewed by Chris Dumez.
The `nw_activity` mechanism in libnetcore provides us an opportunity to
indicate load
success or failure in a way that can be reviewed with a sysdiagnose so that we
can help
track down load failures. Currently all WebKit loads appear to be user
cancelled (though
sub-resource loads do show success properly).
This patch corrects the cause of this problem (easy), and adds a new test to
confirm this
continues to work (much harder!)
The bug was that
NetworkConnectionToWebProcess::stopAllNetworkActivityTrackingForPage was
called unconditionally with CompletionCode::Cancel for all activities even when
a page
load completed successfully.
This patch passes a root page completion status to
`stopAllNetworkActivityTrackingForPage`
that defaults to `Cancel` (current behavior). In
`NetworkConnectionToWebProcess::pageLoadCompleted`
we can pass a `Success` state so that we see good page loads.
It also modifies FrameLoader::checkLoadCompleteForThisFrame so that we pass a
success
flag when the load is working, and a failure flag when the load is aborted or
cancelled
by the user. This allows us to update nw_activity appropriate for various
conditions.
Tests: Tools/TestWebKitAPI/Tests/WebKitCocoa/NetworkActivityTrackerTests.mm
* Source/WebCore/loader/FrameLoader.cpp:
(WebCore::FrameLoader::clearProvisionalLoad):
(WebCore::FrameLoader::checkLoadCompleteForThisFrame):
* Source/WebKit/CMakeLists.txt:
* Source/WebKit/DerivedSources-input.xcfilelist:
* Source/WebKit/DerivedSources.make:
* Source/WebKit/NetworkProcess/NetworkActivityTracker.h:
* Source/WebKit/NetworkProcess/NetworkActivityTracker.serialization.in: Added.
* Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::pageLoadCompleted):
(WebKit::NetworkConnectionToWebProcess::browsingContextRemoved):
(WebKit::NetworkConnectionToWebProcess::startTrackingResourceLoad):
(WebKit::NetworkConnectionToWebProcess::stopTrackingResourceLoad):
(WebKit::NetworkConnectionToWebProcess::stopAllNetworkActivityTracking):
(WebKit::NetworkConnectionToWebProcess::stopAllNetworkActivityTrackingForPage):
(WebKit::NetworkConnectionToWebProcess::lastRootActivityCompletionCodeForTesting
const):
* Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h:
* Source/WebKit/NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::lastPageLoadNetworkActivityCompletionCodeForTesting):
* Source/WebKit/NetworkProcess/NetworkProcess.h:
* Source/WebKit/NetworkProcess/NetworkProcess.messages.in:
* Source/WebKit/Scripts/webkit/messages.py:
(headers_for_type):
* Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivateForTesting.h:
* Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm:
(-[WKWebView _lastPageLoadNetworkActivityCompletionCodeForTesting:]):
* Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp:
(WebKit::NetworkProcessProxy::lastPageLoadNetworkActivityCompletionCodeForTesting):
* Source/WebKit/UIProcess/Network/NetworkProcessProxy.h:
* Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::lastPageLoadNetworkActivityCompletionCodeForTesting):
* Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h:
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
* Tools/TestWebKitAPI/SourcesCocoa.txt:
* Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/NetworkActivityTrackerTests.mm: Added.
(TestWebKitAPI::TEST(NetworkActivityTracker, PageLoadCompletedReportsSuccess)):
(TestWebKitAPI::TEST(NetworkActivityTracker, NavigationCancelReportsCancel)):
* Tools/TestWebKitAPI/Tests/WebKitCocoa/SiteIsolationUtilities.mm:
Canonical link: https://commits.webkit.org/309444@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
