Diff
Modified: trunk/Source/WebKit/CMakeLists.txt (238791 => 238792)
--- trunk/Source/WebKit/CMakeLists.txt 2018-12-03 03:24:42 UTC (rev 238791)
+++ trunk/Source/WebKit/CMakeLists.txt 2018-12-03 08:22:56 UTC (rev 238792)
@@ -12,7 +12,6 @@
"${WEBKIT_DIR}/NetworkProcess/IndexedDB"
"${WEBKIT_DIR}/NetworkProcess/ServiceWorker"
"${WEBKIT_DIR}/NetworkProcess/cache"
- "${WEBKIT_DIR}/NetworkProcess/capture"
"${WEBKIT_DIR}/NetworkProcess/watchos"
"${WEBKIT_DIR}/NetworkProcess/webrtc"
"${WEBKIT_DIR}/Platform"
Modified: trunk/Source/WebKit/ChangeLog (238791 => 238792)
--- trunk/Source/WebKit/ChangeLog 2018-12-03 03:24:42 UTC (rev 238791)
+++ trunk/Source/WebKit/ChangeLog 2018-12-03 08:22:56 UTC (rev 238792)
@@ -1,3 +1,56 @@
+2018-12-03 Keith Rollin <[email protected]>
+
+ Remove Network Capture
+ https://bugs.webkit.org/show_bug.cgi?id=192296
+ <rdar://problem/46408648>
+
+ Reviewed by Daniel Bates.
+
+ r209498 introduced an embedded record and replay facility for network
+ resource loading. This facility was added in order to support a new
+ implementation of the PLT and related performance tests. The PLT is
+ currenty taking a different direction, and so this record/replace
+ facility is no longer needed. Removing it as unused code.
+
+ * CMakeLists.txt:
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::NetworkLoad):
+ (WebKit::NetworkLoad::setDefersLoading):
+ (WebKit::NetworkLoad::continueWillSendRequest):
+ (WebKit::NetworkLoad::willPerformHTTPRedirection):
+ (WebKit::NetworkLoad::notifyDidReceiveResponse):
+ (WebKit::NetworkLoad::didReceiveData):
+ (WebKit::NetworkLoad::didCompleteWithError):
+ (WebKit::NetworkLoad::initializeForRecord): Deleted.
+ (WebKit::NetworkLoad::initializeForReplay): Deleted.
+ * NetworkProcess/NetworkLoad.h:
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::initializeNetworkProcess):
+ (WebKit::NetworkProcess::terminate):
+ * NetworkProcess/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode const):
+ (WebKit::NetworkProcessCreationParameters::decode):
+ * NetworkProcess/NetworkProcessCreationParameters.h:
+ * NetworkProcess/capture/NetworkCaptureEvent.cpp: Removed.
+ * NetworkProcess/capture/NetworkCaptureEvent.h: Removed.
+ * NetworkProcess/capture/NetworkCaptureLogging.h: Removed.
+ * NetworkProcess/capture/NetworkCaptureManager.cpp: Removed.
+ * NetworkProcess/capture/NetworkCaptureManager.h: Removed.
+ * NetworkProcess/capture/NetworkCaptureRecorder.cpp: Removed.
+ * NetworkProcess/capture/NetworkCaptureRecorder.h: Removed.
+ * NetworkProcess/capture/NetworkCaptureReplayer.cpp: Removed.
+ * NetworkProcess/capture/NetworkCaptureReplayer.h: Removed.
+ * NetworkProcess/capture/NetworkCaptureResource.cpp: Removed.
+ * NetworkProcess/capture/NetworkCaptureResource.h: Removed.
+ * NetworkProcess/capture/NetworkDataTaskReplay.cpp: Removed.
+ * NetworkProcess/capture/NetworkDataTaskReplay.h: Removed.
+ * NetworkProcess/capture/json.hpp: Removed.
+ * Sources.txt:
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+ * WebKit.xcodeproj/project.pbxproj:
+ * config.h:
+
2018-12-02 Zalan Bujtas <[email protected]>
Add a runtime feature flag for LayoutFormattingContext.
Modified: trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp (238791 => 238792)
--- trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp 2018-12-03 03:24:42 UTC (rev 238791)
+++ trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp 2018-12-03 08:22:56 UTC (rev 238792)
@@ -46,10 +46,6 @@
#include "NetworkSessionCocoa.h"
#endif
-#if ENABLE(NETWORK_CAPTURE)
-#include "NetworkCaptureManager.h"
-#endif
-
namespace WebKit {
using namespace WebCore;
@@ -73,43 +69,9 @@
, m_loadThrottleLatency(networkSession.loadThrottleLatency())
, m_currentRequest(m_parameters.request)
{
-#if ENABLE(NETWORK_CAPTURE)
- switch (NetworkCapture::Manager::singleton().mode()) {
- case NetworkCapture::Manager::RecordReplayMode::Record:
- initializeForRecord(networkSession);
- break;
- case NetworkCapture::Manager::RecordReplayMode::Replay:
- initializeForReplay(networkSession);
- break;
- case NetworkCapture::Manager::RecordReplayMode::Disabled:
- initialize(networkSession);
- break;
- }
-#else
initialize(networkSession);
-#endif
}
-#if ENABLE(NETWORK_CAPTURE)
-void NetworkLoad::initializeForRecord(NetworkSession& networkSession)
-{
- m_recorder = std::make_unique<NetworkCapture::Recorder>();
- m_task = NetworkDataTask::create(networkSession, *this, m_parameters);
- if (!m_parameters.defersLoading) {
- m_task->resume();
- m_recorder->recordRequestSent(m_parameters.request);
- }
-}
-
-void NetworkLoad::initializeForReplay(NetworkSession& networkSession)
-{
- m_replayer = std::make_unique<NetworkCapture::Replayer>();
- m_task = m_replayer->replayResource(networkSession, *this, m_parameters);
- if (!m_parameters.defersLoading)
- m_task->resume();
-}
-#endif
-
void NetworkLoad::initialize(NetworkSession& networkSession)
{
m_task = NetworkDataTask::create(networkSession, *this, m_parameters);
@@ -131,13 +93,8 @@
if (m_task) {
if (defers)
m_task->suspend();
- else {
+ else
m_task->resume();
-#if ENABLE(NETWORK_CAPTURE)
- if (m_recorder)
- m_recorder->recordRequestSent(m_parameters.request);
-#endif
- }
}
}
@@ -156,11 +113,6 @@
m_currentRequest.updateFromDelegatePreservingOldProperties(newRequest);
#endif
-#if ENABLE(NETWORK_CAPTURE)
- if (m_recorder)
- m_recorder->recordRedirectSent(newRequest);
-#endif
-
auto redirectCompletionHandler = std::exchange(m_redirectCompletionHandler, nullptr);
ASSERT(redirectCompletionHandler);
if (m_currentRequest.isNull()) {
@@ -230,11 +182,6 @@
redirectResponse.setSource(ResourceResponse::Source::Network);
m_redirectCompletionHandler = WTFMove(completionHandler);
-#if ENABLE(NETWORK_CAPTURE)
- if (m_recorder)
- m_recorder->recordRedirectReceived(request, redirectResponse);
-#endif
-
auto oldRequest = WTFMove(m_currentRequest);
request.setRequester(oldRequest.requester());
@@ -281,11 +228,6 @@
{
ASSERT(RunLoop::isMain());
-#if ENABLE(NETWORK_CAPTURE)
- if (m_recorder)
- m_recorder->recordResponseReceived(response);
-#endif
-
response.setSource(ResourceResponse::Source::Network);
if (m_parameters.needsCertificateInfo)
response.includeCertificateInfo();
@@ -297,11 +239,6 @@
{
ASSERT(!m_throttle);
-#if ENABLE(NETWORK_CAPTURE)
- if (m_recorder)
- m_recorder->recordDataReceived(buffer.get());
-#endif
-
// FIXME: This should be the encoded data length, not the decoded data length.
auto size = buffer->size();
m_client.get().didReceiveBuffer(WTFMove(buffer), size);
@@ -311,11 +248,6 @@
{
ASSERT(!m_throttle);
-#if ENABLE(NETWORK_CAPTURE)
- if (m_recorder)
- m_recorder->recordFinish(error);
-#endif
-
if (error.isNull())
m_client.get().didFinishLoading(networkLoadMetrics);
else
Modified: trunk/Source/WebKit/NetworkProcess/NetworkLoad.h (238791 => 238792)
--- trunk/Source/WebKit/NetworkProcess/NetworkLoad.h 2018-12-03 03:24:42 UTC (rev 238791)
+++ trunk/Source/WebKit/NetworkProcess/NetworkLoad.h 2018-12-03 08:22:56 UTC (rev 238792)
@@ -34,11 +34,6 @@
#include <wtf/Optional.h>
#include <wtf/text/WTFString.h>
-#if ENABLE(NETWORK_CAPTURE)
-#include "NetworkCaptureRecorder.h"
-#include "NetworkCaptureReplayer.h"
-#endif
-
namespace WebKit {
class NetworkLoad final : private NetworkDataTaskClient
@@ -71,10 +66,6 @@
String description() const;
private:
-#if ENABLE(NETWORK_CAPTURE)
- void initializeForRecord(NetworkSession&);
- void initializeForReplay(NetworkSession&);
-#endif
void initialize(NetworkSession&);
// NetworkDataTaskClient
@@ -100,11 +91,6 @@
Seconds m_loadThrottleLatency;
WebCore::ResourceRequest m_currentRequest; // Updated on redirects.
-
-#if ENABLE(NETWORK_CAPTURE)
- std::unique_ptr<NetworkCapture::Recorder> m_recorder;
- std::unique_ptr<NetworkCapture::Replayer> m_replayer;
-#endif
};
} // namespace WebKit
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (238791 => 238792)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-12-03 03:24:42 UTC (rev 238791)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-12-03 08:22:56 UTC (rev 238792)
@@ -93,10 +93,6 @@
#include "NetworkCache.h"
#include "NetworkCacheCoders.h"
-#if ENABLE(NETWORK_CAPTURE)
-#include "NetworkCaptureManager.h"
-#endif
-
#if PLATFORM(COCOA)
#include "NetworkSessionCocoa.h"
#endif
@@ -300,12 +296,6 @@
memoryPressureHandler.install();
}
-#if ENABLE(NETWORK_CAPTURE)
- NetworkCapture::Manager::singleton().initialize(
- parameters.recordReplayMode,
- parameters.recordReplayCacheLocation);
-#endif
-
m_diskCacheIsDisabledForTesting = parameters.shouldUseTestingNetworkSession;
m_diskCacheSizeOverride = parameters.diskCacheSizeOverride;
@@ -929,10 +919,6 @@
void NetworkProcess::terminate()
{
-#if ENABLE(NETWORK_CAPTURE)
- NetworkCapture::Manager::singleton().terminate();
-#endif
-
platformTerminate();
ChildProcess::terminate();
}
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (238791 => 238792)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2018-12-03 03:24:42 UTC (rev 238791)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2018-12-03 08:22:56 UTC (rev 238792)
@@ -90,10 +90,6 @@
#elif USE(CURL)
encoder << cookiePersistentStorageFile;
#endif
-#if ENABLE(NETWORK_CAPTURE)
- encoder << recordReplayMode;
- encoder << recordReplayCacheLocation;
-#endif
encoder << urlSchemesRegisteredAsSecure;
encoder << urlSchemesRegisteredAsBypassingContentSecurityPolicy;
@@ -224,13 +220,6 @@
return false;
#endif
-#if ENABLE(NETWORK_CAPTURE)
- if (!decoder.decode(result.recordReplayMode))
- return false;
- if (!decoder.decode(result.recordReplayCacheLocation))
- return false;
-#endif
-
if (!decoder.decode(result.urlSchemesRegisteredAsSecure))
return false;
if (!decoder.decode(result.urlSchemesRegisteredAsBypassingContentSecurityPolicy))
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (238791 => 238792)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2018-12-03 03:24:42 UTC (rev 238791)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2018-12-03 08:22:56 UTC (rev 238792)
@@ -106,11 +106,6 @@
String cookiePersistentStorageFile;
#endif
-#if ENABLE(NETWORK_CAPTURE)
- String recordReplayMode;
- String recordReplayCacheLocation;
-#endif
-
Vector<String> urlSchemesRegisteredAsSecure;
Vector<String> urlSchemesRegisteredAsBypassingContentSecurityPolicy;
Vector<String> urlSchemesRegisteredAsLocal;
Modified: trunk/Source/WebKit/Sources.txt (238791 => 238792)
--- trunk/Source/WebKit/Sources.txt 2018-12-03 03:24:42 UTC (rev 238791)
+++ trunk/Source/WebKit/Sources.txt 2018-12-03 08:22:56 UTC (rev 238792)
@@ -71,13 +71,6 @@
NetworkProcess/cache/NetworkCacheStorage.cpp
NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp
-NetworkProcess/capture/NetworkCaptureEvent.cpp
-NetworkProcess/capture/NetworkCaptureManager.cpp
-NetworkProcess/capture/NetworkCaptureRecorder.cpp
-NetworkProcess/capture/NetworkCaptureReplayer.cpp
-NetworkProcess/capture/NetworkCaptureResource.cpp
-NetworkProcess/capture/NetworkDataTaskReplay.cpp
-
NetworkProcess/webrtc/NetworkMDNSRegister.cpp
// TODO: We should unify these files once GTK's PluginProcess2 is removed.
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (238791 => 238792)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2018-12-03 03:24:42 UTC (rev 238791)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2018-12-03 08:22:56 UTC (rev 238792)
@@ -80,11 +80,6 @@
static NSString * const WebKitLogCookieInformationDefaultsKey = @"WebKitLogCookieInformation";
#endif
-#if ENABLE(NETWORK_CAPTURE)
-static NSString * const WebKitRecordReplayModeDefaultsKey = @"WebKitRecordReplayMode";
-static NSString * const WebKitRecordReplayCacheLocationDefaultsKey = @"WebKitRecordReplayCacheLocation";
-#endif
-
namespace WebKit {
using namespace WebCore;
@@ -287,13 +282,6 @@
parameters.storageAccessAPIEnabled = storageAccessAPIEnabled();
parameters.suppressesConnectionTerminationOnSystemChange = m_configuration->suppressesConnectionTerminationOnSystemChange();
-#if ENABLE(NETWORK_CAPTURE)
- parameters.recordReplayMode = [defaults stringForKey:WebKitRecordReplayModeDefaultsKey];
- parameters.recordReplayCacheLocation = [defaults stringForKey:WebKitRecordReplayCacheLocationDefaultsKey];
- if (parameters.recordReplayCacheLocation.isEmpty())
- parameters.recordReplayCacheLocation = parameters.diskCacheDirectory;
-#endif
-
#if ENABLE(PROXIMITY_NETWORKING)
parameters.wirelessContextIdentifier = m_configuration->wirelessContextIdentifier();
#endif
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (238791 => 238792)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2018-12-03 03:24:42 UTC (rev 238791)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2018-12-03 08:22:56 UTC (rev 238792)
@@ -1005,18 +1005,10 @@
528C37C1195CBB1A00D8B9CC /* WKBackForwardListPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9F28101958F478008CAC72 /* WKBackForwardListPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
52D5A1B01C57495A00DE34A3 /* VideoFullscreenManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 52D5A1AA1C57494E00DE34A3 /* VideoFullscreenManagerProxy.h */; };
52F060E11654318500F3281B /* NetworkContentRuleListManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 52F060DD1654317500F3281B /* NetworkContentRuleListManagerMessageReceiver.cpp */; };
- 5302583C1DCBBD2200DA89C2 /* NetworkCaptureResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 5302582F1DCBBD1D00DA89C2 /* NetworkCaptureResource.h */; };
- 5302583E1DCBBD2200DA89C2 /* NetworkCaptureEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 530258311DCBBD1D00DA89C2 /* NetworkCaptureEvent.h */; };
- 5302583F1DCBBD2200DA89C2 /* NetworkCaptureLogging.h in Headers */ = {isa = PBXBuildFile; fileRef = 530258321DCBBD1D00DA89C2 /* NetworkCaptureLogging.h */; };
- 530258411DCBBD2200DA89C2 /* NetworkCaptureManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 530258341DCBBD1D00DA89C2 /* NetworkCaptureManager.h */; };
- 530258431DCBBD2200DA89C2 /* NetworkCaptureRecorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 530258361DCBBD1D00DA89C2 /* NetworkCaptureRecorder.h */; };
- 530258451DCBBD2200DA89C2 /* NetworkCaptureReplayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 530258381DCBBD1D00DA89C2 /* NetworkCaptureReplayer.h */; };
- 530258471DCBBD2200DA89C2 /* NetworkDataTaskReplay.h in Headers */ = {isa = PBXBuildFile; fileRef = 5302583A1DCBBD1D00DA89C2 /* NetworkDataTaskReplay.h */; };
532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 532159501DBAE6D70054AA3C /* NetworkSessionCocoa.h */; };
532159561DBAE72D0054AA3C /* NetworkDataTaskCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 5321594F1DBAE6D70054AA3C /* NetworkDataTaskCocoa.h */; };
535BCB922069C49C00CCCE02 /* NetworkActivityTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 535BCB902069C49C00CCCE02 /* NetworkActivityTracker.h */; };
53BA47D11DC2EF5E004DF4AD /* NetworkDataTaskBlob.h in Headers */ = {isa = PBXBuildFile; fileRef = 539EB5471DC2EE40009D48CF /* NetworkDataTaskBlob.h */; };
- 53DEA3661DDE423100E82648 /* json.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 53DEA3651DDE422E00E82648 /* json.hpp */; };
570AB8F320AE3BD700B8BE87 /* SecKeyProxyStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 570AB8F220AE3BD700B8BE87 /* SecKeyProxyStore.h */; };
57597EB921811D9A0037F924 /* CtapHidDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 57597EB721811D9A0037F924 /* CtapHidDriver.h */; };
57597EBD218184900037F924 /* CtapHidAuthenticator.h in Headers */ = {isa = PBXBuildFile; fileRef = 57597EBB2181848F0037F924 /* CtapHidAuthenticator.h */; };
@@ -3345,19 +3337,6 @@
52D5A1B31C5749F200DE34A3 /* VideoFullscreenManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VideoFullscreenManager.messages.in; sourceTree = "<group>"; };
52D5A1B41C5749F200DE34A3 /* VideoFullscreenManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = VideoFullscreenManager.mm; sourceTree = "<group>"; };
52F060DD1654317500F3281B /* NetworkContentRuleListManagerMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkContentRuleListManagerMessageReceiver.cpp; path = DerivedSources/WebKit2/NetworkContentRuleListManagerMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
- 5302582E1DCBBD1D00DA89C2 /* NetworkCaptureResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCaptureResource.cpp; sourceTree = "<group>"; };
- 5302582F1DCBBD1D00DA89C2 /* NetworkCaptureResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCaptureResource.h; sourceTree = "<group>"; };
- 530258301DCBBD1D00DA89C2 /* NetworkCaptureEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCaptureEvent.cpp; sourceTree = "<group>"; };
- 530258311DCBBD1D00DA89C2 /* NetworkCaptureEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCaptureEvent.h; sourceTree = "<group>"; };
- 530258321DCBBD1D00DA89C2 /* NetworkCaptureLogging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCaptureLogging.h; sourceTree = "<group>"; };
- 530258331DCBBD1D00DA89C2 /* NetworkCaptureManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCaptureManager.cpp; sourceTree = "<group>"; };
- 530258341DCBBD1D00DA89C2 /* NetworkCaptureManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCaptureManager.h; sourceTree = "<group>"; };
- 530258351DCBBD1D00DA89C2 /* NetworkCaptureRecorder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCaptureRecorder.cpp; sourceTree = "<group>"; };
- 530258361DCBBD1D00DA89C2 /* NetworkCaptureRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCaptureRecorder.h; sourceTree = "<group>"; };
- 530258371DCBBD1D00DA89C2 /* NetworkCaptureReplayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCaptureReplayer.cpp; sourceTree = "<group>"; };
- 530258381DCBBD1D00DA89C2 /* NetworkCaptureReplayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCaptureReplayer.h; sourceTree = "<group>"; };
- 530258391DCBBD1D00DA89C2 /* NetworkDataTaskReplay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkDataTaskReplay.cpp; sourceTree = "<group>"; };
- 5302583A1DCBBD1D00DA89C2 /* NetworkDataTaskReplay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkDataTaskReplay.h; sourceTree = "<group>"; };
5315876B2076B713004BF9F3 /* NetworkActivityTrackerCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkActivityTrackerCocoa.mm; sourceTree = "<group>"; };
5321594F1DBAE6D70054AA3C /* NetworkDataTaskCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkDataTaskCocoa.h; sourceTree = "<group>"; };
532159501DBAE6D70054AA3C /* NetworkSessionCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkSessionCocoa.h; sourceTree = "<group>"; };
@@ -3366,7 +3345,6 @@
535BCB902069C49C00CCCE02 /* NetworkActivityTracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NetworkActivityTracker.h; sourceTree = "<group>"; };
539EB5461DC2EE40009D48CF /* NetworkDataTaskBlob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkDataTaskBlob.cpp; sourceTree = "<group>"; };
539EB5471DC2EE40009D48CF /* NetworkDataTaskBlob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkDataTaskBlob.h; sourceTree = "<group>"; };
- 53DEA3651DDE422E00E82648 /* json.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = json.hpp; sourceTree = "<group>"; };
53F3CAA5206C443E0086490E /* NetworkActivityTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkActivityTracker.cpp; sourceTree = "<group>"; };
570AB8F220AE3BD700B8BE87 /* SecKeyProxyStore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecKeyProxyStore.h; sourceTree = "<group>"; };
570AB90020B2517400B8BE87 /* AuthenticationChallengeProxyCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AuthenticationChallengeProxyCocoa.mm; sourceTree = "<group>"; };
@@ -6403,7 +6381,6 @@
isa = PBXGroup;
children = (
E489D2821A0A2BE80078C06A /* cache */,
- 539BD5B21DADB0BA00F2E4E1 /* capture */,
7EC4F0F818E4A922008056AF /* cocoa */,
3309344B1315B93A0097A7BC /* Cookies */,
5C1426F21C23F82D00D41183 /* CustomProtocols */,
@@ -6668,27 +6645,6 @@
path = ios;
sourceTree = "<group>";
};
- 539BD5B21DADB0BA00F2E4E1 /* capture */ = {
- isa = PBXGroup;
- children = (
- 53DEA3651DDE422E00E82648 /* json.hpp */,
- 530258301DCBBD1D00DA89C2 /* NetworkCaptureEvent.cpp */,
- 530258311DCBBD1D00DA89C2 /* NetworkCaptureEvent.h */,
- 530258321DCBBD1D00DA89C2 /* NetworkCaptureLogging.h */,
- 530258331DCBBD1D00DA89C2 /* NetworkCaptureManager.cpp */,
- 530258341DCBBD1D00DA89C2 /* NetworkCaptureManager.h */,
- 530258351DCBBD1D00DA89C2 /* NetworkCaptureRecorder.cpp */,
- 530258361DCBBD1D00DA89C2 /* NetworkCaptureRecorder.h */,
- 530258371DCBBD1D00DA89C2 /* NetworkCaptureReplayer.cpp */,
- 530258381DCBBD1D00DA89C2 /* NetworkCaptureReplayer.h */,
- 5302582E1DCBBD1D00DA89C2 /* NetworkCaptureResource.cpp */,
- 5302582F1DCBBD1D00DA89C2 /* NetworkCaptureResource.h */,
- 530258391DCBBD1D00DA89C2 /* NetworkDataTaskReplay.cpp */,
- 5302583A1DCBBD1D00DA89C2 /* NetworkDataTaskReplay.h */,
- );
- path = capture;
- sourceTree = "<group>";
- };
570AB8F620AE81AB00B8BE87 /* cocoa */ = {
isa = PBXGroup;
children = (
@@ -9073,7 +9029,6 @@
2D4D2C811DF60BF3002EB10C /* InteractionInformationRequest.h in Headers */,
1AE49A4911FFA8CE0048B464 /* JSNPMethod.h in Headers */,
1AE4987811FF7FAA0048B464 /* JSNPObject.h in Headers */,
- 53DEA3661DDE423100E82648 /* json.hpp in Headers */,
BCE0937814FB128C001138D9 /* LayerHostingContext.h in Headers */,
0F0C365A18C0555800F607D7 /* LayerRepresentation.h in Headers */,
1A92DC1112F8BA460017AF65 /* LayerTreeContext.h in Headers */,
@@ -9136,12 +9091,6 @@
834B25121A842C8700CFB150 /* NetworkCacheStatistics.h in Headers */,
E4436ECF1A0D040B00EAD204 /* NetworkCacheStorage.h in Headers */,
8310428B1BD6B66F00A715E4 /* NetworkCacheSubresourcesEntry.h in Headers */,
- 5302583E1DCBBD2200DA89C2 /* NetworkCaptureEvent.h in Headers */,
- 5302583F1DCBBD2200DA89C2 /* NetworkCaptureLogging.h in Headers */,
- 530258411DCBBD2200DA89C2 /* NetworkCaptureManager.h in Headers */,
- 530258431DCBBD2200DA89C2 /* NetworkCaptureRecorder.h in Headers */,
- 530258451DCBBD2200DA89C2 /* NetworkCaptureReplayer.h in Headers */,
- 5302583C1DCBBD2200DA89C2 /* NetworkCaptureResource.h in Headers */,
513A164D1630A9BF005D7D22 /* NetworkConnectionToWebProcess.h in Headers */,
51DD9F2916367DA2001578E9 /* NetworkConnectionToWebProcessMessages.h in Headers */,
46DF063C1F3905F8001980BB /* NetworkCORSPreflightChecker.h in Headers */,
@@ -9148,7 +9097,6 @@
5CBC9B8E1C652CA000A8FDCF /* NetworkDataTask.h in Headers */,
53BA47D11DC2EF5E004DF4AD /* NetworkDataTaskBlob.h in Headers */,
532159561DBAE72D0054AA3C /* NetworkDataTaskCocoa.h in Headers */,
- 530258471DCBBD2200DA89C2 /* NetworkDataTaskReplay.h in Headers */,
839902031BE9A02B000F3653 /* NetworkLoad.h in Headers */,
83D454D71BE9D3C4006C93BD /* NetworkLoadClient.h in Headers */,
839149651BEA838500D2D953 /* NetworkLoadParameters.h in Headers */,
Modified: trunk/Source/WebKit/config.h (238791 => 238792)
--- trunk/Source/WebKit/config.h 2018-12-03 03:24:42 UTC (rev 238791)
+++ trunk/Source/WebKit/config.h 2018-12-03 08:22:56 UTC (rev 238792)
@@ -89,12 +89,6 @@
#endif
#endif
-#ifndef ENABLE_NETWORK_CAPTURE
-#if PLATFORM(COCOA)
-#define ENABLE_NETWORK_CAPTURE 1
-#endif
-#endif
-
#ifndef ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION
#if (PLATFORM(COCOA) || PLATFORM(GTK))
#define ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION 1
