Attachment 340116 Details for Bug 185523 – Patch

[patch] Patch

bug-185523-20180510120847.patch (text/plain), 14.04 KB, created by Keith Rollin on 2018-05-10 12:08:58 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Rollin

Created: 2018-05-10 12:08:58 PDT

Size: 14.04 KB

patch

obsolete

>Subversion Revision: 231651
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 69a11bd9a5e575f444c149e3dfba304c61a875de..b745db5df7b886302e2fd507f2073efdbc762e3a 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,40 @@
>+2018-05-10  Keith Rollin  <krollin@apple.com>
>+
>+        Renamed "trackNetworkActivity" to "tracksResourceLoadMilestone"
>+        https://bugs.webkit.org/show_bug.cgi?id=185523
>+        <rdar://problem/40136361>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
>+        (WebKit::networkActivityTrackingEnabled):
>+        * NetworkProcess/NetworkProcess.cpp:
>+        (WebKit::NetworkProcess::initializeNetworkProcess):
>+        * NetworkProcess/NetworkProcess.h:
>+        (WebKit::NetworkProcess::tracksResourceLoadMilestones const):
>+        (WebKit::NetworkProcess::trackNetworkActivity 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):
>+        (WKContextConfigurationSetTracksResourceLoadMilestones):
>+        (WKContextConfigurationTrackNetworkActivity): Deleted.
>+        (WKContextConfigurationSetTrackNetworkActivity): Deleted.
>+        * UIProcess/API/C/WKContextConfigurationRef.h:
>+        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
>+        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
>+        (-[_WKProcessPoolConfiguration tracksResourceLoadMilestones]):
>+        (-[_WKProcessPoolConfiguration setTracksResourceLoadMilestones:]):
>+        (-[_WKProcessPoolConfiguration trackNetworkActivity]): Deleted.
>+        (-[_WKProcessPoolConfiguration setTrackNetworkActivity:]): Deleted.
>+        * UIProcess/WebProcessPool.cpp:
>+        (WebKit::WebProcessPool::ensureNetworkProcess):
>+
> 2018-05-10  Eric Carlson  <eric.carlson@apple.com>
> 
>         [MediaStream, iOS] Don't check authorizationStatusForMediaType when using mock capture devices
>diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
>index 94d8623a94df24a5b556097389486dd8cb7f9cc0..c808f6ae2c171c3bf07669c2bd8bf72ba752637e 100644
>--- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
>@@ -548,7 +548,7 @@ void NetworkConnectionToWebProcess::resetOriginAccessWhitelists()
> 
> static bool networkActivityTrackingEnabled()
> {
>-    return NetworkProcess::singleton().trackNetworkActivity();
>+    return NetworkProcess::singleton().tracksResourceLoadMilestones();
> }
> 
> std::optional<NetworkActivityTracker> NetworkConnectionToWebProcess::startTrackingResourceLoad(uint64_t pageID, ResourceLoadIdentifier resourceID, bool isMainResource)
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>index 9becb93c90b1a1be6a3620a8debedd5d1632f32c..9e294a4fbb688b0b7fe9aa276ff99a9da0ebcb86 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>@@ -292,7 +292,7 @@ void NetworkProcess::initializeNetworkProcess(NetworkProcessCreationParameters&&
>     for (auto& scheme : parameters.urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest)
>         registerURLSchemeAsCanDisplayOnlyIfCanRequest(scheme);
> 
>-    m_trackNetworkActivity = parameters.trackNetworkActivity;
>+    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 b1ab0b23bf0d088736e0aff505f3a5edcb5a04fd..d3a790b9359fda4d4c71daca50710b8325172c7f 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.h
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.h
>@@ -162,7 +162,7 @@ public:
>     NetworkContentRuleListManager& networkContentRuleListManager() { return m_NetworkContentRuleListManager; }
> #endif
> 
>-    bool trackNetworkActivity() const { return m_trackNetworkActivity; }
>+    bool tracksResourceLoadMilestones() const { return m_tracksResourceLoadMilestones; }
> 
> private:
>     NetworkProcess();
>@@ -304,7 +304,7 @@ private:
>     NetworkContentRuleListManager m_NetworkContentRuleListManager;
> #endif
> 
>-    bool m_trackNetworkActivity { false };
>+    bool m_tracksResourceLoadMilestones { false };
> };
> 
> } // namespace WebKit
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
>index 3d24d23a4f5323e287022a1784dc3eecf1828341..e5b63443beed9495a11400ed651186e82813acdd 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
>@@ -116,7 +116,7 @@ void NetworkProcessCreationParameters::encode(IPC::Encoder& encoder) const
>     encoder << urlSchemesRegisteredAsCORSEnabled;
>     encoder << urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest;
> 
>-    encoder << trackNetworkActivity;
>+    encoder << tracksResourceLoadMilestones;
> }
> 
> bool NetworkProcessCreationParameters::decode(IPC::Decoder& decoder, NetworkProcessCreationParameters& result)
>@@ -277,7 +277,7 @@ bool NetworkProcessCreationParameters::decode(IPC::Decoder& decoder, NetworkProc
>     if (!decoder.decode(result.urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest))
>         return false;
> 
>-    if (!decoder.decode(result.trackNetworkActivity))
>+    if (!decoder.decode(result.tracksResourceLoadMilestones))
>         return false;
> 
>     return true;
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>index d147533ba21ea987a7e989da018cee7d9977a518..e0cdd7460810e98ea2b9b32d955f8d8b5d6adcb0 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>+++ b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>@@ -133,7 +133,7 @@ struct NetworkProcessCreationParameters {
>     Vector<String> urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest;
>     Vector<String> urlSchemesRegisteredAsCORSEnabled;
> 
>-    bool trackNetworkActivity { false };
>+    bool tracksResourceLoadMilestones { false };
> };
> 
> } // namespace WebKit
>diff --git a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp
>index a69db0717a94693ba7a985a1bb5ffdbcdf247937..0a0389c586213b2a777d3f920d12280e308f344f 100644
>--- a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp
>+++ b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp
>@@ -130,7 +130,7 @@ Ref<ProcessPoolConfiguration> ProcessPoolConfiguration::copy()
>     copy->m_processSwapsOnNavigation = this->m_processSwapsOnNavigation;
>     copy->m_alwaysKeepAndReuseSwappedProcesses = this->m_alwaysKeepAndReuseSwappedProcesses;
>     copy->m_processSwapsOnWindowOpenWithOpener = this->m_processSwapsOnWindowOpenWithOpener;
>-    copy->m_trackNetworkActivity = this->m_trackNetworkActivity;
>+    copy->m_tracksResourceLoadMilestones = this->m_tracksResourceLoadMilestones;
> 
>     return copy;
> }
>diff --git a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h
>index edbd09e0b771f7e743be931e5dd26dab47c936f3..5020ef128e120c3f847b9644ebf04d2704985eb2 100644
>--- a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h
>+++ b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h
>@@ -144,8 +144,8 @@ public:
>     bool processSwapsOnWindowOpenWithOpener() const { return m_processSwapsOnWindowOpenWithOpener; }
>     void setProcessSwapsOnWindowOpenWithOpener(bool swaps) { m_processSwapsOnWindowOpenWithOpener = swaps; }
> 
>-    bool trackNetworkActivity() const { return m_trackNetworkActivity; }
>-    void setTrackNetworkActivity(bool track) { m_trackNetworkActivity = track; }
>+    bool tracksResourceLoadMilestones() const { return m_tracksResourceLoadMilestones; }
>+    void setTracksResourceLoadMilestones(bool track) { m_tracksResourceLoadMilestones = track; }
> 
> private:
>     bool m_shouldHaveLegacyDataStore { false };
>@@ -181,7 +181,7 @@ private:
>     bool m_processSwapsOnNavigation { false };
>     bool m_alwaysKeepAndReuseSwappedProcesses { false };
>     bool m_processSwapsOnWindowOpenWithOpener { false };
>-    bool m_trackNetworkActivity { 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 c56e7d558453d5448d9e7e9aa4a6cf05c3d305fb..7fd3ac635f1cdb8166b79c91f753fdc492186276 100644
>--- a/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp
>+++ b/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp
>@@ -188,12 +188,12 @@ void WKContextConfigurationSetProcessSwapsOnWindowOpenWithOpener(WKContextConfig
>     toImpl(configuration)->setProcessSwapsOnWindowOpenWithOpener(swaps);
> }
> 
>-bool WKContextConfigurationTrackNetworkActivity(WKContextConfigurationRef configuration)
>+bool WKContextConfigurationTracksResourceLoadMilestones(WKContextConfigurationRef configuration)
> {
>-    return toImpl(configuration)->trackNetworkActivity();
>+    return toImpl(configuration)->tracksResourceLoadMilestones();
> }
> 
>-void WKContextConfigurationSetTrackNetworkActivity(WKContextConfigurationRef configuration, bool track)
>+void WKContextConfigurationSetTracksResourceLoadMilestones(WKContextConfigurationRef configuration, bool track)
> {
>-    toImpl(configuration)->setTrackNetworkActivity(track);
>+    toImpl(configuration)->setTracksResourceLoadMilestones(track);
> }
>diff --git a/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h b/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h
>index d79535c1a6648620d77f01eb8429c60227a59d36..c9578fc5c7ef804a797e06510588a498d8ae40d2 100644
>--- a/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h
>+++ b/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h
>@@ -77,8 +77,8 @@ WK_EXPORT void WKContextConfigurationSetAlwaysKeepAndReuseSwappedProcesses(WKCon
> WK_EXPORT bool WKContextConfigurationProcessSwapsOnWindowOpenWithOpener(WKContextConfigurationRef configuration);
> WK_EXPORT void WKContextConfigurationSetProcessSwapsOnWindowOpenWithOpener(WKContextConfigurationRef configuration, bool swaps);
> 
>-WK_EXPORT bool WKContextConfigurationTrackNetworkActivity(WKContextConfigurationRef configuration);
>-WK_EXPORT void WKContextConfigurationSetTrackNetworkActivity(WKContextConfigurationRef configuration, bool track);
>+WK_EXPORT bool WKContextConfigurationTracksResourceLoadMilestones(WKContextConfigurationRef configuration);
>+WK_EXPORT void WKContextConfigurationSetTracksResourceLoadMilestones(WKContextConfigurationRef configuration, bool track);
> 
> #ifdef __cplusplus
> }
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h
>index 424e4f40e0c7ebf4d1fe4417626812b58487ad50..637ca21c221558aa42ba86fb315ece4adf76a25f 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h
>+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h
>@@ -60,7 +60,7 @@ 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 trackNetworkActivity 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));
> 
> @end
> 
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
>index 5b69b619a3c3c9455a77c50210038fca207c4850..6a76b398a4be51fa0363009cd250bc34dc2d3e47 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
>@@ -257,14 +257,14 @@ - (BOOL)processSwapsOnWindowOpenWithOpener
>     return _processPoolConfiguration->processSwapsOnWindowOpenWithOpener();
> }
> 
>-- (BOOL)trackNetworkActivity
>+- (BOOL)tracksResourceLoadMilestones
> {
>-    return _processPoolConfiguration->trackNetworkActivity();
>+    return _processPoolConfiguration->tracksResourceLoadMilestones();
> }
> 
>-- (void)setTrackNetworkActivity:(BOOL)track
>+- (void)setTracksResourceLoadMilestones:(BOOL)track
> {
>-    _processPoolConfiguration->setTrackNetworkActivity(track);
>+    _processPoolConfiguration->setTracksResourceLoadMilestones(track);
> }
> 
> #if PLATFORM(IOS)
>diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp
>index 11cc8bd5c2ceaf5132c1bfa498e8fa9129e620b3..9665a588709cbbea895228e32b3a9fa72e6579aa 100644
>--- a/Source/WebKit/UIProcess/WebProcessPool.cpp
>+++ b/Source/WebKit/UIProcess/WebProcessPool.cpp
>@@ -502,7 +502,7 @@ NetworkProcessProxy& WebProcessPool::ensureNetworkProcess(WebsiteDataStore* with
>     parameters.urlSchemesRegisteredAsCORSEnabled = copyToVector(m_schemesToRegisterAsCORSEnabled);
>     parameters.urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest = copyToVector(m_schemesToRegisterAsCanDisplayOnlyIfCanRequest);
> 
>-    parameters.trackNetworkActivity = m_configuration->trackNetworkActivity();
>+    parameters.tracksResourceLoadMilestones = m_configuration->tracksResourceLoadMilestones();
> 
>     // Add any platform specific parameters
>     platformInitializeNetworkProcess(parameters);

Actions: View | Formatted Diff | Diff

Attachments on bug 185523: 340116 | 340130 | 340622 | 340692