Attachment 341215 Details for Bug 185828 – Patch

[patch] Patch

bug-185828-20180524122705.patch (text/plain), 5.45 KB, created by Keith Rollin on 2018-05-24 12:27:06 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Rollin

Created: 2018-05-24 12:27:06 PDT

Size: 5.45 KB

patch

obsolete

>Subversion Revision: 232155
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 87b2e441b7606673531fef5bb497dbfdb084eeaf..1451e5319633de326b7ea9a2ad08973324a3b286 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,23 @@
>+2018-05-21  Keith Rollin  <krollin@apple.com>
>+
>+        Don't track resource load milestones in private sessions
>+        https://bugs.webkit.org/show_bug.cgi?id=185828
>+        <rdar://problem/40424197>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         Unreviewed. Fix GTK+ input method unit tests after r232049.
>diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
>index 1ead39a2ce70acd7a5517b839482e5a9d6beaa8f..9b54bc3a516edd93160d3ca380f7ddac7652ba7e 100644
>--- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
>@@ -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 @@ static bool networkActivityTrackingEnabled()
>     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 @@ void NetworkConnectionToWebProcess::stopTrackingResourceLoad(ResourceLoadIdentif
>         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);
>diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
>index f58ae982b3c9d51506e514ab857b7156daad6dba..15e5b211e8f9c37791f1a09e33e83a8543867583 100644
>--- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
>+++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
>@@ -112,7 +112,7 @@ public:
>         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:
>diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>index f44b7f5698348393bab25e76fe7e53d2397a4b3d..240f4a26b6306b6bc7a6a121a42600d7fae5d53c 100644
>--- a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>@@ -173,7 +173,7 @@ void NetworkResourceLoader::start()
> {
>     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());

Actions: View | Formatted Diff | Diff

Attachments on bug 185828: 341215