WebKit Bugzilla
Attachment 340622 Details for
Bug 185523
: Renamed "trackNetworkActivity" to "tracksResourceLoadMilestone"
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-185523-20180517121846.patch (text/plain), 14.27 KB, created by
Keith Rollin
on 2018-05-17 12:18:47 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Keith Rollin
Created:
2018-05-17 12:18:47 PDT
Size:
14.27 KB
patch
obsolete
>Subversion Revision: 231859 >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index 51940422374a2719afe00b023c72a9af669ead17..4d193aeb43da2b8b8105fa8c93f962cd1c499006 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,40 @@ >+2018-05-10 Keith Rollin <krollin@apple.com> >+ >+ Renamed "trackNetworkActivity" to "tracksResourceLoadMilestones" >+ 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-16 Fujii Hironori <Hironori.Fujii@sony.com> > > [Win] Implement WebPage::handleEditingKeyboardEvent >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 ed64e0d690ff237fc00cea24918667f99b0383ae..a1b22b9c385ba104ce841fd3a31deaeeee73aee2 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; > > #if ENABLE(WIFI_ASSERTIONS) > encoder << wirelessContextIdentifier; >@@ -281,7 +281,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; > > #if ENABLE(WIFI_ASSERTIONS) >diff --git a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h >index 521e71a7747018bcb5d10a56a37fe4ab58ad7844..ed693836513bd64cb546c1492f03bd5c17f152d6 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 }; > > #if ENABLE(WIFI_ASSERTIONS) > unsigned wirelessContextIdentifier { 0 }; >diff --git a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp >index a17049601676832fcfcf7516495d8e7adfa4060c..5bb28ad6c38f0d7f70b26f8f601dce28d31144ab 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; > #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 1e6ea62ed942f61bfafd4ebed2da98492624bc93..37320ca5e450750c371651d30da7da62fd944c9f 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; } > > #if ENABLE(WIFI_ASSERTIONS) > unsigned wirelessContextIdentifier() const { return m_wirelessContextIdentifier; } >@@ -186,7 +186,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 1897ae522c5fde356fbdbdd9a2b8f4fe9c94078d..20877a96677572a2c44e2452e5984ed60498bea7 100644 >--- a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h >+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h >@@ -64,7 +64,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)); > @property (nonatomic) BOOL pageCacheEnabled 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 5dedec50f77313cda236e35db47ea4c6fe2af29f..a8abb69b95311b3a947f86c21175ae0d09451086 100644 >--- a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm >+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm >@@ -269,14 +269,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); > } > > - (BOOL)pageCacheEnabled >diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp >index 91523ffb5c629a3099b4cb1d6de6be722ead415a..6c1b06aae5dd7122f571b0fd8cf408a89c5b3c32 100644 >--- a/Source/WebKit/UIProcess/WebProcessPool.cpp >+++ b/Source/WebKit/UIProcess/WebProcessPool.cpp >@@ -506,7 +506,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);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 185523
:
340116
|
340130
| 340622 |
340692