Diff
Modified: trunk/Source/WebKit/ChangeLog (232530 => 232531)
--- trunk/Source/WebKit/ChangeLog 2018-06-06 01:44:03 UTC (rev 232530)
+++ trunk/Source/WebKit/ChangeLog 2018-06-06 01:46:17 UTC (rev 232531)
@@ -1,3 +1,45 @@
+2018-06-05 Keith Rollin <[email protected]>
+
+ Remove tracksResourceLoadMilestones support
+ https://bugs.webkit.org/show_bug.cgi?id=186329
+ <rdar://problem/40829898>
+
+ Reviewed by Darin Adler.
+
+ 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-05 Darin Adler <[email protected]>
[Cocoa] Retire DispatchPtr, and add more move semantics and simpler #ifs to other smart pointers
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (232530 => 232531)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2018-06-06 01:44:03 UTC (rev 232530)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2018-06-06 01:46:17 UTC (rev 232531)
@@ -542,19 +542,11 @@
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 @@
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::stopAllNetworkActivityTracking()
{
- if (!networkActivityTrackingEnabled())
- return;
-
for (auto& activityTracker : m_networkActivityTrackers)
activityTracker.networkActivity.complete(NetworkActivityTracker::CompletionCode::None);
@@ -627,9 +613,6 @@
void NetworkConnectionToWebProcess::stopAllNetworkActivityTrackingForPage(uint64_t pageID)
{
- if (!networkActivityTrackingEnabled())
- return;
-
for (auto& activityTracker : m_networkActivityTrackers) {
if (activityTracker.pageID == pageID)
activityTracker.networkActivity.complete(NetworkActivityTracker::CompletionCode::None);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (232530 => 232531)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-06-06 01:44:03 UTC (rev 232530)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-06-06 01:46:17 UTC (rev 232531)
@@ -289,8 +289,6 @@
for (auto& scheme : parameters.urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest)
registerURLSchemeAsCanDisplayOnlyIfCanRequest(scheme);
- m_tracksResourceLoadMilestones = parameters.tracksResourceLoadMilestones;
-
RELEASE_LOG(Process, "%p - NetworkProcess::initializeNetworkProcess: Presenting process = %d", this, WebCore::presentingApplicationPID());
}
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (232530 => 232531)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2018-06-06 01:44:03 UTC (rev 232530)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2018-06-06 01:46:17 UTC (rev 232531)
@@ -159,8 +159,6 @@
NetworkContentRuleListManager& networkContentRuleListManager() { return m_NetworkContentRuleListManager; }
#endif
- bool tracksResourceLoadMilestones() const { return m_tracksResourceLoadMilestones; }
-
private:
NetworkProcess();
~NetworkProcess();
@@ -297,8 +295,6 @@
#if ENABLE(CONTENT_EXTENSIONS)
NetworkContentRuleListManager m_NetworkContentRuleListManager;
#endif
-
- bool m_tracksResourceLoadMilestones { false };
};
} // namespace WebKit
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (232530 => 232531)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2018-06-06 01:44:03 UTC (rev 232530)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2018-06-06 01:46:17 UTC (rev 232531)
@@ -109,8 +109,6 @@
encoder << urlSchemesRegisteredAsCORSEnabled;
encoder << urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest;
- encoder << tracksResourceLoadMilestones;
-
#if ENABLE(WIFI_ASSERTIONS)
encoder << wirelessContextIdentifier;
#endif
@@ -263,9 +261,6 @@
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;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (232530 => 232531)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2018-06-06 01:44:03 UTC (rev 232530)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2018-06-06 01:46:17 UTC (rev 232531)
@@ -124,8 +124,6 @@
Vector<String> urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest;
Vector<String> urlSchemesRegisteredAsCORSEnabled;
- bool tracksResourceLoadMilestones { false };
-
#if ENABLE(WIFI_ASSERTIONS)
unsigned wirelessContextIdentifier { 0 };
#endif
Modified: trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp (232530 => 232531)
--- trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp 2018-06-06 01:44:03 UTC (rev 232530)
+++ trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp 2018-06-06 01:46:17 UTC (rev 232531)
@@ -130,7 +130,6 @@
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
Modified: trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h (232530 => 232531)
--- trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2018-06-06 01:44:03 UTC (rev 232530)
+++ trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2018-06-06 01:46:17 UTC (rev 232531)
@@ -144,9 +144,6 @@
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 @@
bool m_processSwapsOnNavigation { false };
bool m_alwaysKeepAndReuseSwappedProcesses { false };
bool m_processSwapsOnWindowOpenWithOpener { false };
- bool m_tracksResourceLoadMilestones { false };
#if PLATFORM(IOS)
WTF::String m_ctDataConnectionServiceType;
Modified: trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp (232530 => 232531)
--- trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp 2018-06-06 01:44:03 UTC (rev 232530)
+++ trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp 2018-06-06 01:46:17 UTC (rev 232531)
@@ -188,16 +188,6 @@
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();
Modified: trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h (232530 => 232531)
--- trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h 2018-06-06 01:44:03 UTC (rev 232530)
+++ trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h 2018-06-06 01:46:17 UTC (rev 232531)
@@ -77,9 +77,6 @@
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);
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h (232530 => 232531)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2018-06-06 01:44:03 UTC (rev 232530)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2018-06-06 01:46:17 UTC (rev 232531)
@@ -64,7 +64,6 @@
@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));
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm (232530 => 232531)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2018-06-06 01:44:03 UTC (rev 232530)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2018-06-06 01:46:17 UTC (rev 232531)
@@ -269,16 +269,6 @@
return _processPoolConfiguration->processSwapsOnWindowOpenWithOpener();
}
-- (BOOL)tracksResourceLoadMilestones
-{
- return _processPoolConfiguration->tracksResourceLoadMilestones();
-}
-
-- (void)setTracksResourceLoadMilestones:(BOOL)track
-{
- _processPoolConfiguration->setTracksResourceLoadMilestones(track);
-}
-
- (BOOL)pageCacheEnabled
{
return _processPoolConfiguration->cacheModel() != WebKit::CacheModelDocumentViewer;
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (232530 => 232531)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2018-06-06 01:44:03 UTC (rev 232530)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2018-06-06 01:46:17 UTC (rev 232531)
@@ -519,8 +519,6 @@
parameters.urlSchemesRegisteredAsCORSEnabled = copyToVector(m_schemesToRegisterAsCORSEnabled);
parameters.urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest = copyToVector(m_schemesToRegisterAsCanDisplayOnlyIfCanRequest);
- parameters.tracksResourceLoadMilestones = m_configuration->tracksResourceLoadMilestones();
-
// Add any platform specific parameters
platformInitializeNetworkProcess(parameters);
