Diff
Modified: trunk/Source/WebKit/ChangeLog (231965 => 231966)
--- trunk/Source/WebKit/ChangeLog 2018-05-18 17:58:53 UTC (rev 231965)
+++ trunk/Source/WebKit/ChangeLog 2018-05-18 18:17:28 UTC (rev 231966)
@@ -1,3 +1,40 @@
+2018-05-18 Keith Rollin <[email protected]>
+
+ Renamed "trackNetworkActivity" to "tracksResourceLoadMilestones"
+ https://bugs.webkit.org/show_bug.cgi?id=185523
+ <rdar://problem/40136361>
+
+ Reviewed by Geoffrey Garen.
+
+ * 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-18 Chris Dumez <[email protected]>
Avoid keeping the frame alive when ref'ing a WindowProxy
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (231965 => 231966)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2018-05-18 17:58:53 UTC (rev 231965)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2018-05-18 18:17:28 UTC (rev 231966)
@@ -548,7 +548,7 @@
static bool networkActivityTrackingEnabled()
{
- return NetworkProcess::singleton().trackNetworkActivity();
+ return NetworkProcess::singleton().tracksResourceLoadMilestones();
}
std::optional<NetworkActivityTracker> NetworkConnectionToWebProcess::startTrackingResourceLoad(uint64_t pageID, ResourceLoadIdentifier resourceID, bool isMainResource)
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (231965 => 231966)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-05-18 17:58:53 UTC (rev 231965)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-05-18 18:17:28 UTC (rev 231966)
@@ -292,7 +292,7 @@
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());
}
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (231965 => 231966)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2018-05-18 17:58:53 UTC (rev 231965)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2018-05-18 18:17:28 UTC (rev 231966)
@@ -162,7 +162,7 @@
NetworkContentRuleListManager& networkContentRuleListManager() { return m_NetworkContentRuleListManager; }
#endif
- bool trackNetworkActivity() const { return m_trackNetworkActivity; }
+ bool tracksResourceLoadMilestones() const { return m_tracksResourceLoadMilestones; }
private:
NetworkProcess();
@@ -304,7 +304,7 @@
NetworkContentRuleListManager m_NetworkContentRuleListManager;
#endif
- bool m_trackNetworkActivity { false };
+ bool m_tracksResourceLoadMilestones { false };
};
} // namespace WebKit
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (231965 => 231966)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2018-05-18 17:58:53 UTC (rev 231965)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2018-05-18 18:17:28 UTC (rev 231966)
@@ -116,7 +116,7 @@
encoder << urlSchemesRegisteredAsCORSEnabled;
encoder << urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest;
- encoder << trackNetworkActivity;
+ encoder << tracksResourceLoadMilestones;
#if ENABLE(WIFI_ASSERTIONS)
encoder << wirelessContextIdentifier;
@@ -281,7 +281,7 @@
if (!decoder.decode(result.urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest))
return false;
- if (!decoder.decode(result.trackNetworkActivity))
+ if (!decoder.decode(result.tracksResourceLoadMilestones))
return false;
#if ENABLE(WIFI_ASSERTIONS)
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (231965 => 231966)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2018-05-18 17:58:53 UTC (rev 231965)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2018-05-18 18:17:28 UTC (rev 231966)
@@ -133,7 +133,7 @@
Vector<String> urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest;
Vector<String> urlSchemesRegisteredAsCORSEnabled;
- bool trackNetworkActivity { false };
+ bool tracksResourceLoadMilestones { false };
#if ENABLE(WIFI_ASSERTIONS)
unsigned wirelessContextIdentifier { 0 };
Modified: trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp (231965 => 231966)
--- trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp 2018-05-18 17:58:53 UTC (rev 231965)
+++ trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp 2018-05-18 18:17:28 UTC (rev 231966)
@@ -130,7 +130,7 @@
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
Modified: trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h (231965 => 231966)
--- trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2018-05-18 17:58:53 UTC (rev 231965)
+++ trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2018-05-18 18:17:28 UTC (rev 231966)
@@ -144,8 +144,8 @@
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 @@
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;
Modified: trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp (231965 => 231966)
--- trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp 2018-05-18 17:58:53 UTC (rev 231965)
+++ trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp 2018-05-18 18:17:28 UTC (rev 231966)
@@ -188,12 +188,12 @@
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);
}
Modified: trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h (231965 => 231966)
--- trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h 2018-05-18 17:58:53 UTC (rev 231965)
+++ trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h 2018-05-18 18:17:28 UTC (rev 231966)
@@ -77,8 +77,8 @@
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
}
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h (231965 => 231966)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2018-05-18 17:58:53 UTC (rev 231965)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2018-05-18 18:17:28 UTC (rev 231966)
@@ -64,7 +64,7 @@
@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
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm (231965 => 231966)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2018-05-18 17:58:53 UTC (rev 231965)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2018-05-18 18:17:28 UTC (rev 231966)
@@ -269,14 +269,14 @@
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
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (231965 => 231966)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2018-05-18 17:58:53 UTC (rev 231965)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2018-05-18 18:17:28 UTC (rev 231966)
@@ -506,7 +506,7 @@
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);
