Attachment 342007 Details for Bug 186329 – Patch

[patch] Patch

bug-186329-20180605170627.patch (text/plain), 15.54 KB, created by Keith Rollin on 2018-06-05 17:06:27 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Rollin

Created: 2018-06-05 17:06:27 PDT

Size: 15.54 KB

patch

obsolete

>Subversion Revision: 232479
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 7a011b83751cae67a5a6b36e0bf0ea4437cf1d85..e82fb10f93739455477a7c9b5958a6499ed00bbe 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,45 @@
>+2018-06-05  Keith Rollin  <krollin@apple.com>
>+
>+        Remove tracksResourceLoadMilestones support
>+        https://bugs.webkit.org/show_bug.cgi?id=186329
>+        <rdar://problem/40829898>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove the mechanism for enabling/disabling the tracking of
>+        resource-load milestones. This was initially added in order to enable
>+        the tracking only for Safari. However, the decision has been made to
>+        enable the tracking for all WebKit clients, so it's now enabled
>+        unconditionally.
>+
>+        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
>+        (WebKit::NetworkConnectionToWebProcess::startTrackingResourceLoad):
>+        (WebKit::NetworkConnectionToWebProcess::stopTrackingResourceLoad):
>+        (WebKit::NetworkConnectionToWebProcess::stopAllNetworkActivityTracking):
>+        (WebKit::NetworkConnectionToWebProcess::stopAllNetworkActivityTrackingForPage):
>+        (WebKit::networkActivityTrackingEnabled): Deleted.
>+        * NetworkProcess/NetworkProcess.cpp:
>+        (WebKit::NetworkProcess::initializeNetworkProcess):
>+        * NetworkProcess/NetworkProcess.h:
>+        (WebKit::NetworkProcess::tracksResourceLoadMilestones const): Deleted.
>+        * NetworkProcess/NetworkProcessCreationParameters.cpp:
>+        (WebKit::NetworkProcessCreationParameters::encode const):
>+        (WebKit::NetworkProcessCreationParameters::decode):
>+        * NetworkProcess/NetworkProcessCreationParameters.h:
>+        * UIProcess/API/APIProcessPoolConfiguration.cpp:
>+        (API::ProcessPoolConfiguration::copy):
>+        * UIProcess/API/APIProcessPoolConfiguration.h:
>+        * UIProcess/API/C/WKContextConfigurationRef.cpp:
>+        (WKContextConfigurationTracksResourceLoadMilestones): Deleted.
>+        (WKContextConfigurationSetTracksResourceLoadMilestones): Deleted.
>+        * UIProcess/API/C/WKContextConfigurationRef.h:
>+        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
>+        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
>+        (-[_WKProcessPoolConfiguration tracksResourceLoadMilestones]): Deleted.
>+        (-[_WKProcessPoolConfiguration setTracksResourceLoadMilestones:]): Deleted.
>+        * UIProcess/WebProcessPool.cpp:
>+        (WebKit::WebProcessPool::ensureNetworkProcess):
>+
> 2018-06-04  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [WebKit on watchOS] Remove all uses of the EXTRA_ZOOM_MODE compiler flag
>diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
>index 9b54bc3a516edd93160d3ca380f7ddac7652ba7e..7812a8d0fbfe2aca6059b570a1715ecd30eab8d0 100644
>--- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
>@@ -542,19 +542,11 @@ void NetworkConnectionToWebProcess::resetOriginAccessWhitelists()
>     SecurityPolicy::resetOriginAccessWhitelists();
> }
> 
>-static bool networkActivityTrackingEnabled()
>-{
>-    return NetworkProcess::singleton().tracksResourceLoadMilestones();
>-}
>-
> 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;
>-
>     // Either get the existing root activity tracker for this page or create a
>     // new one if this is the main resource.
> 
>@@ -603,9 +595,6 @@ std::optional<NetworkActivityTracker> NetworkConnectionToWebProcess::startTracki
> 
> void NetworkConnectionToWebProcess::stopTrackingResourceLoad(ResourceLoadIdentifier resourceID, NetworkActivityTracker::CompletionCode code)
> {
>-    if (!networkActivityTrackingEnabled())
>-        return;
>-
>     auto itemIndex = findNetworkActivityTracker(resourceID);
>     if (itemIndex == notFound)
>         return;
>@@ -616,9 +605,6 @@ void NetworkConnectionToWebProcess::stopTrackingResourceLoad(ResourceLoadIdentif
> 
> void NetworkConnectionToWebProcess::stopAllNetworkActivityTracking()
> {
>-    if (!networkActivityTrackingEnabled())
>-        return;
>-
>     for (auto& activityTracker : m_networkActivityTrackers)
>         activityTracker.networkActivity.complete(NetworkActivityTracker::CompletionCode::None);
> 
>@@ -627,9 +613,6 @@ void NetworkConnectionToWebProcess::stopAllNetworkActivityTracking()
> 
> void NetworkConnectionToWebProcess::stopAllNetworkActivityTrackingForPage(uint64_t pageID)
> {
>-    if (!networkActivityTrackingEnabled())
>-        return;
>-
>     for (auto& activityTracker : m_networkActivityTrackers) {
>         if (activityTracker.pageID == pageID)
>             activityTracker.networkActivity.complete(NetworkActivityTracker::CompletionCode::None);
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>index 91d30b66b99acd9311f6bc58cb7f9eae97961ca3..23652bafd241744e8013ef1303b64d4822a4f19d 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>@@ -289,8 +289,6 @@ void NetworkProcess::initializeNetworkProcess(NetworkProcessCreationParameters&&
>     for (auto& scheme : parameters.urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest)
>         registerURLSchemeAsCanDisplayOnlyIfCanRequest(scheme);
> 
>-    m_tracksResourceLoadMilestones = parameters.tracksResourceLoadMilestones;
>-
>     RELEASE_LOG(Process, "%p - NetworkProcess::initializeNetworkProcess: Presenting process = %d", this, WebCore::presentingApplicationPID());
> }
> 
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h
>index 83ea2401b0ca16f78dffe56fe5db90fc6281ac6d..08e24dce6108247297305b86adcebe2844747681 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.h
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.h
>@@ -159,8 +159,6 @@ public:
>     NetworkContentRuleListManager& networkContentRuleListManager() { return m_NetworkContentRuleListManager; }
> #endif
> 
>-    bool tracksResourceLoadMilestones() const { return m_tracksResourceLoadMilestones; }
>-
> private:
>     NetworkProcess();
>     ~NetworkProcess();
>@@ -297,8 +295,6 @@ private:
> #if ENABLE(CONTENT_EXTENSIONS)
>     NetworkContentRuleListManager m_NetworkContentRuleListManager;
> #endif
>-
>-    bool m_tracksResourceLoadMilestones { false };
> };
> 
> } // namespace WebKit
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
>index fc2255440582398a0b6c22ccbbcee2acc7f2d852..8c909fd0ced9a4f12d53d1133ef8eda9320dee96 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
>@@ -109,8 +109,6 @@ void NetworkProcessCreationParameters::encode(IPC::Encoder& encoder) const
>     encoder << urlSchemesRegisteredAsCORSEnabled;
>     encoder << urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest;
> 
>-    encoder << tracksResourceLoadMilestones;
>-    
> #if ENABLE(WIFI_ASSERTIONS)
>     encoder << wirelessContextIdentifier;
> #endif
>@@ -263,9 +261,6 @@ bool NetworkProcessCreationParameters::decode(IPC::Decoder& decoder, NetworkProc
>     if (!decoder.decode(result.urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest))
>         return false;
> 
>-    if (!decoder.decode(result.tracksResourceLoadMilestones))
>-        return false;
>-
> #if ENABLE(WIFI_ASSERTIONS)
>     if (!decoder.decode(result.wirelessContextIdentifier))
>         return false;
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>index 06f4d40050ff1a3e28b8612bcdd0085fa874eec1..22e1b9ba2219d603edc5e32af859d0dc01b1115e 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>+++ b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>@@ -124,8 +124,6 @@ struct NetworkProcessCreationParameters {
>     Vector<String> urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest;
>     Vector<String> urlSchemesRegisteredAsCORSEnabled;
> 
>-    bool tracksResourceLoadMilestones { false };
>-    
> #if ENABLE(WIFI_ASSERTIONS)
>     unsigned wirelessContextIdentifier { 0 };
> #endif
>diff --git a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp
>index a3d8b639a638bae1f7c3dbf90570c9a35f8b80f7..ec77348d4df2de27186d9f7fb598670cd8947473 100644
>--- a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp
>+++ b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp
>@@ -130,7 +130,6 @@ Ref<ProcessPoolConfiguration> ProcessPoolConfiguration::copy()
>     copy->m_processSwapsOnNavigation = this->m_processSwapsOnNavigation;
>     copy->m_alwaysKeepAndReuseSwappedProcesses = this->m_alwaysKeepAndReuseSwappedProcesses;
>     copy->m_processSwapsOnWindowOpenWithOpener = this->m_processSwapsOnWindowOpenWithOpener;
>-    copy->m_tracksResourceLoadMilestones = this->m_tracksResourceLoadMilestones;
> #if ENABLE(WIFI_ASSERTIONS)
>     copy->m_wirelessContextIdentifier = this->m_wirelessContextIdentifier;
> #endif
>diff --git a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h
>index 72f369c2548f696bdab40cac0f3f102938aec6b7..053e91be2916875adb40937d025be94fe997af8c 100644
>--- a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h
>+++ b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h
>@@ -144,9 +144,6 @@ public:
>     bool processSwapsOnWindowOpenWithOpener() const { return m_processSwapsOnWindowOpenWithOpener; }
>     void setProcessSwapsOnWindowOpenWithOpener(bool swaps) { m_processSwapsOnWindowOpenWithOpener = swaps; }
> 
>-    bool tracksResourceLoadMilestones() const { return m_tracksResourceLoadMilestones; }
>-    void setTracksResourceLoadMilestones(bool track) { m_tracksResourceLoadMilestones = track; }
>-
> #if ENABLE(WIFI_ASSERTIONS)
>     unsigned wirelessContextIdentifier() const { return m_wirelessContextIdentifier; }
>     void setWirelessContextIdentifier(unsigned wirelessContextIdentifier) { m_wirelessContextIdentifier = wirelessContextIdentifier; }
>@@ -191,7 +188,6 @@ private:
>     bool m_processSwapsOnNavigation { false };
>     bool m_alwaysKeepAndReuseSwappedProcesses { false };
>     bool m_processSwapsOnWindowOpenWithOpener { false };
>-    bool m_tracksResourceLoadMilestones { false };
> 
> #if PLATFORM(IOS)
>     WTF::String m_ctDataConnectionServiceType;
>diff --git a/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp b/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp
>index 1c307f6021ad57534bcec4969efeeed6c1851cd4..c5c4664d61a0b7851d1d98481bf8bee35bc12b67 100644
>--- a/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp
>+++ b/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp
>@@ -188,16 +188,6 @@ void WKContextConfigurationSetProcessSwapsOnWindowOpenWithOpener(WKContextConfig
>     toImpl(configuration)->setProcessSwapsOnWindowOpenWithOpener(swaps);
> }
> 
>-bool WKContextConfigurationTracksResourceLoadMilestones(WKContextConfigurationRef configuration)
>-{
>-    return toImpl(configuration)->tracksResourceLoadMilestones();
>-}
>-
>-void WKContextConfigurationSetTracksResourceLoadMilestones(WKContextConfigurationRef configuration, bool track)
>-{
>-    toImpl(configuration)->setTracksResourceLoadMilestones(track);
>-}
>-
> int64_t WKContextConfigurationDiskCacheSizeOverride(WKContextConfigurationRef configuration)
> {
>     return toImpl(configuration)->diskCacheSizeOverride();
>diff --git a/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h b/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h
>index 6af3b2a5d7a1fce0f815cf8f7328d5e5abe8cbf5..0580116d4fe7d283201520ea6b5b223e95e9016f 100644
>--- a/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h
>+++ b/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h
>@@ -77,9 +77,6 @@ WK_EXPORT void WKContextConfigurationSetAlwaysKeepAndReuseSwappedProcesses(WKCon
> WK_EXPORT bool WKContextConfigurationProcessSwapsOnWindowOpenWithOpener(WKContextConfigurationRef configuration);
> WK_EXPORT void WKContextConfigurationSetProcessSwapsOnWindowOpenWithOpener(WKContextConfigurationRef configuration, bool swaps);
> 
>-WK_EXPORT bool WKContextConfigurationTracksResourceLoadMilestones(WKContextConfigurationRef configuration);
>-WK_EXPORT void WKContextConfigurationSetTracksResourceLoadMilestones(WKContextConfigurationRef configuration, bool track);
>-
> WK_EXPORT int64_t WKContextConfigurationDiskCacheSizeOverride(WKContextConfigurationRef configuration);
> WK_EXPORT void WKContextConfigurationSetDiskCacheSizeOverride(WKContextConfigurationRef configuration, int64_t size);
>     
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h
>index 9fbbc4f7870740db50ca515d6fe7bcccebf9da44..cfab13af7a02de3b89a5afdfc83d4fd0816d3489 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h
>+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h
>@@ -64,7 +64,6 @@ WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
> @property (nonatomic) BOOL processSwapsOnNavigation WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
> @property (nonatomic) BOOL alwaysKeepAndReuseSwappedProcesses WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
> @property (nonatomic) BOOL processSwapsOnWindowOpenWithOpener WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
>-@property (nonatomic) BOOL tracksResourceLoadMilestones WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
> @property (nonatomic) BOOL pageCacheEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
> @property (nonatomic) BOOL suppressesConnectionTerminationOnSystemChange WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
> 
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
>index 61438884e87dacb155db2fe1fbfd9837dff8cd8f..75c8b18d246608e7c152cb25b2ad9eabcb9be9a5 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
>@@ -269,16 +269,6 @@ - (BOOL)processSwapsOnWindowOpenWithOpener
>     return _processPoolConfiguration->processSwapsOnWindowOpenWithOpener();
> }
> 
>-- (BOOL)tracksResourceLoadMilestones
>-{
>-    return _processPoolConfiguration->tracksResourceLoadMilestones();
>-}
>-
>-- (void)setTracksResourceLoadMilestones:(BOOL)track
>-{
>-    _processPoolConfiguration->setTracksResourceLoadMilestones(track);
>-}
>-
> - (BOOL)pageCacheEnabled
> {
>     return _processPoolConfiguration->cacheModel() != WebKit::CacheModelDocumentViewer;
>diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp
>index e7e916907d243b2669d6c4be8613d905e27e9b09..c504d606438d8feed6bb87929d507bf742f61a57 100644
>--- a/Source/WebKit/UIProcess/WebProcessPool.cpp
>+++ b/Source/WebKit/UIProcess/WebProcessPool.cpp
>@@ -519,8 +519,6 @@ NetworkProcessProxy& WebProcessPool::ensureNetworkProcess(WebsiteDataStore* with
>     parameters.urlSchemesRegisteredAsCORSEnabled = copyToVector(m_schemesToRegisterAsCORSEnabled);
>     parameters.urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest = copyToVector(m_schemesToRegisterAsCanDisplayOnlyIfCanRequest);
> 
>-    parameters.tracksResourceLoadMilestones = m_configuration->tracksResourceLoadMilestones();
>-
>     // Add any platform specific parameters
>     platformInitializeNetworkProcess(parameters);
>

Actions: View | Formatted Diff | Diff

Attachments on bug 186329: 342007