- Revision
- 232163
- Author
- [email protected]
- Date
- 2018-05-24 13:54:21 -0700 (Thu, 24 May 2018)
Log Message
Don't track resource load milestones in private sessions
https://bugs.webkit.org/show_bug.cgi?id=185828
<rdar://problem/40424197>
Reviewed by Brent Fulgham.
Bug 184838 adds the facility for tracing the beginning and ending of
resources loads and reporting so that historical information can be
gathered to assess the health of the networking stack. Disable this
facility for private browsing sessions.
* NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::startTrackingResourceLoad):
(WebKit::NetworkConnectionToWebProcess::stopTrackingResourceLoad):
* NetworkProcess/NetworkConnectionToWebProcess.h:
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::start):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (232162 => 232163)
--- trunk/Source/WebKit/ChangeLog 2018-05-24 20:33:17 UTC (rev 232162)
+++ trunk/Source/WebKit/ChangeLog 2018-05-24 20:54:21 UTC (rev 232163)
@@ -1,3 +1,23 @@
+2018-05-24 Keith Rollin <[email protected]>
+
+ Don't track resource load milestones in private sessions
+ https://bugs.webkit.org/show_bug.cgi?id=185828
+ <rdar://problem/40424197>
+
+ Reviewed by Brent Fulgham.
+
+ Bug 184838 adds the facility for tracing the beginning and ending of
+ resources loads and reporting so that historical information can be
+ gathered to assess the health of the networking stack. Disable this
+ facility for private browsing sessions.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::startTrackingResourceLoad):
+ (WebKit::NetworkConnectionToWebProcess::stopTrackingResourceLoad):
+ * NetworkProcess/NetworkConnectionToWebProcess.h:
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::start):
+
2018-05-24 Brent Fulgham <[email protected]>
REGRESSION(r224908): [macOS] Media playback not honoring custom caption styles
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (232162 => 232163)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2018-05-24 20:33:17 UTC (rev 232162)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2018-05-24 20:54:21 UTC (rev 232163)
@@ -29,7 +29,6 @@
#include "BlobDataFileReferenceWithSandboxExtension.h"
#include "CacheStorageEngineConnectionMessages.h"
#include "DataReference.h"
-#include "Logging.h"
#include "NetworkBlobRegistry.h"
#include "NetworkCache.h"
#include "NetworkConnectionToWebProcessMessages.h"
@@ -62,9 +61,6 @@
using namespace WebCore;
-#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(true, Network, "%p - NetworkConnectionToWebProcess::" fmt, this, ##__VA_ARGS__)
-#define RELEASE_LOG_ERROR_IF_ALLOWED(fmt, ...) RELEASE_LOG_ERROR_IF(true, Network, "%p - NetworkConnectionToWebProcess::" fmt, this, ##__VA_ARGS__)
-
namespace WebKit {
Ref<NetworkConnectionToWebProcess> NetworkConnectionToWebProcess::create(IPC::Connection::Identifier connectionIdentifier)
@@ -551,8 +547,11 @@
return NetworkProcess::singleton().tracksResourceLoadMilestones();
}
-std::optional<NetworkActivityTracker> NetworkConnectionToWebProcess::startTrackingResourceLoad(uint64_t pageID, ResourceLoadIdentifier resourceID, bool isMainResource)
+std::optional<NetworkActivityTracker> NetworkConnectionToWebProcess::startTrackingResourceLoad(uint64_t pageID, ResourceLoadIdentifier resourceID, bool isMainResource, const PAL::SessionID& sessionID)
{
+ if (sessionID.isEphemeral())
+ return std::nullopt;
+
if (!networkActivityTrackingEnabled())
return std::nullopt;
@@ -608,10 +607,8 @@
return;
auto itemIndex = findNetworkActivityTracker(resourceID);
- if (itemIndex == notFound) {
- RELEASE_LOG_ERROR(Network, "stopTrackingResourceLoad: Unable to find network activity for resource: %d", static_cast<int>(resourceID));
+ if (itemIndex == notFound)
return;
- }
m_networkActivityTrackers[itemIndex].networkActivity.complete(code);
m_networkActivityTrackers.remove(itemIndex);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h (232162 => 232163)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h 2018-05-24 20:33:17 UTC (rev 232162)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h 2018-05-24 20:54:21 UTC (rev 232163)
@@ -112,7 +112,7 @@
m_networkLoadInformationByID.remove(identifier);
}
- std::optional<NetworkActivityTracker> startTrackingResourceLoad(uint64_t pageID, ResourceLoadIdentifier resourceID, bool isMainResource);
+ std::optional<NetworkActivityTracker> startTrackingResourceLoad(uint64_t pageID, ResourceLoadIdentifier resourceID, bool isMainResource, const PAL::SessionID&);
void stopTrackingResourceLoad(ResourceLoadIdentifier resourceID, NetworkActivityTracker::CompletionCode);
private:
Modified: trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp (232162 => 232163)
--- trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp 2018-05-24 20:33:17 UTC (rev 232162)
+++ trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp 2018-05-24 20:54:21 UTC (rev 232163)
@@ -173,7 +173,7 @@
{
ASSERT(RunLoop::isMain());
- m_networkActivityTracker = m_connection->startTrackingResourceLoad(m_parameters.webPageID, m_parameters.identifier, isMainResource());
+ m_networkActivityTracker = m_connection->startTrackingResourceLoad(m_parameters.webPageID, m_parameters.identifier, isMainResource(), sessionID());
if (m_defersLoading) {
RELEASE_LOG_IF_ALLOWED("start: Loading is deferred (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", isMainResource = %d, isSynchronous = %d)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, isMainResource(), isSynchronous());
