Changeset 238792 in webkit


Ignore:
Timestamp:
Dec 3, 2018 12:22:56 AM (5 years ago)
Author:
Keith Rollin
Message:

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:
Location:
trunk/Source/WebKit
Files:
1 deleted
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/CMakeLists.txt

    r236690 r238792  
    1313    "${WEBKIT_DIR}/NetworkProcess/ServiceWorker"
    1414    "${WEBKIT_DIR}/NetworkProcess/cache"
    15     "${WEBKIT_DIR}/NetworkProcess/capture"
    1615    "${WEBKIT_DIR}/NetworkProcess/watchos"
    1716    "${WEBKIT_DIR}/NetworkProcess/webrtc"

  • trunk/Source/WebKit/ChangeLog

    r238791 r238792  
     12018-12-03  Keith Rollin  <krollin@apple.com>
     2
     3        Remove Network Capture
     4        https://bugs.webkit.org/show_bug.cgi?id=192296
     5        <rdar://problem/46408648>
     6
     7        Reviewed by Daniel Bates.
     8
     9        r209498 introduced an embedded record and replay facility for network
     10        resource loading. This facility was added in order to support a new
     11        implementation of the PLT and related performance tests. The PLT is
     12        currenty taking a different direction, and so this record/replace
     13        facility is no longer needed. Removing it as unused code.
     14
     15        * CMakeLists.txt:
     16        * NetworkProcess/NetworkLoad.cpp:
     17        (WebKit::NetworkLoad::NetworkLoad):
     18        (WebKit::NetworkLoad::setDefersLoading):
     19        (WebKit::NetworkLoad::continueWillSendRequest):
     20        (WebKit::NetworkLoad::willPerformHTTPRedirection):
     21        (WebKit::NetworkLoad::notifyDidReceiveResponse):
     22        (WebKit::NetworkLoad::didReceiveData):
     23        (WebKit::NetworkLoad::didCompleteWithError):
     24        (WebKit::NetworkLoad::initializeForRecord): Deleted.
     25        (WebKit::NetworkLoad::initializeForReplay): Deleted.
     26        * NetworkProcess/NetworkLoad.h:
     27        * NetworkProcess/NetworkProcess.cpp:
     28        (WebKit::NetworkProcess::initializeNetworkProcess):
     29        (WebKit::NetworkProcess::terminate):
     30        * NetworkProcess/NetworkProcessCreationParameters.cpp:
     31        (WebKit::NetworkProcessCreationParameters::encode const):
     32        (WebKit::NetworkProcessCreationParameters::decode):
     33        * NetworkProcess/NetworkProcessCreationParameters.h:
     34        * NetworkProcess/capture/NetworkCaptureEvent.cpp: Removed.
     35        * NetworkProcess/capture/NetworkCaptureEvent.h: Removed.
     36        * NetworkProcess/capture/NetworkCaptureLogging.h: Removed.
     37        * NetworkProcess/capture/NetworkCaptureManager.cpp: Removed.
     38        * NetworkProcess/capture/NetworkCaptureManager.h: Removed.
     39        * NetworkProcess/capture/NetworkCaptureRecorder.cpp: Removed.
     40        * NetworkProcess/capture/NetworkCaptureRecorder.h: Removed.
     41        * NetworkProcess/capture/NetworkCaptureReplayer.cpp: Removed.
     42        * NetworkProcess/capture/NetworkCaptureReplayer.h: Removed.
     43        * NetworkProcess/capture/NetworkCaptureResource.cpp: Removed.
     44        * NetworkProcess/capture/NetworkCaptureResource.h: Removed.
     45        * NetworkProcess/capture/NetworkDataTaskReplay.cpp: Removed.
     46        * NetworkProcess/capture/NetworkDataTaskReplay.h: Removed.
     47        * NetworkProcess/capture/json.hpp: Removed.
     48        * Sources.txt:
     49        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
     50        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
     51        * WebKit.xcodeproj/project.pbxproj:
     52        * config.h:
     53
    1542018-12-02  Zalan Bujtas  <zalan@apple.com>
    255

  • trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp

    r238654 r238792  
    4747#endif
    4848
    49 #if ENABLE(NETWORK_CAPTURE)
    50 #include "NetworkCaptureManager.h"
    51 #endif
    52 
    5349namespace WebKit {
    5450
    … …  
    7470    , m_currentRequest(m_parameters.request)
    7571{
    76 #if ENABLE(NETWORK_CAPTURE)
    77     switch (NetworkCapture::Manager::singleton().mode()) {
    78     case NetworkCapture::Manager::RecordReplayMode::Record:
    79         initializeForRecord(networkSession);
    80         break;
    81     case NetworkCapture::Manager::RecordReplayMode::Replay:
    82         initializeForReplay(networkSession);
    83         break;
    84     case NetworkCapture::Manager::RecordReplayMode::Disabled:
    85         initialize(networkSession);
    86         break;
    87     }
    88 #else
    8972    initialize(networkSession);
    90 #endif
    91 }
    92 
    93 #if ENABLE(NETWORK_CAPTURE)
    94 void NetworkLoad::initializeForRecord(NetworkSession& networkSession)
    95 {
    96     m_recorder = std::make_unique<NetworkCapture::Recorder>();
    97     m_task = NetworkDataTask::create(networkSession, *this, m_parameters);
    98     if (!m_parameters.defersLoading) {
    99         m_task->resume();
    100         m_recorder->recordRequestSent(m_parameters.request);
    101     }
    102 }
    103 
    104 void NetworkLoad::initializeForReplay(NetworkSession& networkSession)
    105 {
    106     m_replayer = std::make_unique<NetworkCapture::Replayer>();
    107     m_task = m_replayer->replayResource(networkSession, *this, m_parameters);
    108     if (!m_parameters.defersLoading)
    109         m_task->resume();
    110 }
    111 #endif
     73}
    11274
    11375void NetworkLoad::initialize(NetworkSession& networkSession)
    … …  
    13294        if (defers)
    13395            m_task->suspend();
    134         else {
     96        else
    13597            m_task->resume();
    136 #if ENABLE(NETWORK_CAPTURE)
    137             if (m_recorder)
    138                 m_recorder->recordRequestSent(m_parameters.request);
    139 #endif
    140         }
    14198    }
    14299}
    … …  
    155112    // FIXME: Implement ResourceRequest::updateFromDelegatePreservingOldProperties. See https://bugs.webkit.org/show_bug.cgi?id=126127.
    156113    m_currentRequest.updateFromDelegatePreservingOldProperties(newRequest);
    157 #endif
    158 
    159 #if ENABLE(NETWORK_CAPTURE)
    160     if (m_recorder)
    161         m_recorder->recordRedirectSent(newRequest);
    162114#endif
    163115
    … …  
    231183    m_redirectCompletionHandler = WTFMove(completionHandler);
    232184
    233 #if ENABLE(NETWORK_CAPTURE)
    234     if (m_recorder)
    235         m_recorder->recordRedirectReceived(request, redirectResponse);
    236 #endif
    237 
    238185    auto oldRequest = WTFMove(m_currentRequest);
    239186    request.setRequester(oldRequest.requester());
    … …  
    282229    ASSERT(RunLoop::isMain());
    283230
    284 #if ENABLE(NETWORK_CAPTURE)
    285     if (m_recorder)
    286         m_recorder->recordResponseReceived(response);
    287 #endif
    288 
    289231    response.setSource(ResourceResponse::Source::Network);
    290232    if (m_parameters.needsCertificateInfo)
    … …  
    298240    ASSERT(!m_throttle);
    299241
    300 #if ENABLE(NETWORK_CAPTURE)
    301     if (m_recorder)
    302         m_recorder->recordDataReceived(buffer.get());
    303 #endif
    304 
    305242    // FIXME: This should be the encoded data length, not the decoded data length.
    306243    auto size = buffer->size();
    … …  
    311248{
    312249    ASSERT(!m_throttle);
    313 
    314 #if ENABLE(NETWORK_CAPTURE)
    315     if (m_recorder)
    316         m_recorder->recordFinish(error);
    317 #endif
    318250
    319251    if (error.isNull())

  • trunk/Source/WebKit/NetworkProcess/NetworkLoad.h

    r238654 r238792  
    3535#include <wtf/text/WTFString.h>
    3636
    37 #if ENABLE(NETWORK_CAPTURE)
    38 #include "NetworkCaptureRecorder.h"
    39 #include "NetworkCaptureReplayer.h"
    40 #endif
    41 
    4237namespace WebKit {
    4338
    … …  
    7267
    7368private:
    74 #if ENABLE(NETWORK_CAPTURE)
    75     void initializeForRecord(NetworkSession&);
    76     void initializeForReplay(NetworkSession&);
    77 #endif
    7869    void initialize(NetworkSession&);
    7970
    … …  
    10192
    10293    WebCore::ResourceRequest m_currentRequest; // Updated on redirects.
    103 
    104 #if ENABLE(NETWORK_CAPTURE)
    105     std::unique_ptr<NetworkCapture::Recorder> m_recorder;
    106     std::unique_ptr<NetworkCapture::Replayer> m_replayer;
    107 #endif
    10894};
    10995

  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

    r238771 r238792  
    9494#include "NetworkCacheCoders.h"
    9595
    96 #if ENABLE(NETWORK_CAPTURE)
    97 #include "NetworkCaptureManager.h"
    98 #endif
    99 
    10096#if PLATFORM(COCOA)
    10197#include "NetworkSessionCocoa.h"
    … …  
    300296        memoryPressureHandler.install();
    301297    }
    302 
    303 #if ENABLE(NETWORK_CAPTURE)
    304     NetworkCapture::Manager::singleton().initialize(
    305         parameters.recordReplayMode,
    306         parameters.recordReplayCacheLocation);
    307 #endif
    308298
    309299    m_diskCacheIsDisabledForTesting = parameters.shouldUseTestingNetworkSession;
    … …  
    930920void NetworkProcess::terminate()
    931921{
    932 #if ENABLE(NETWORK_CAPTURE)
    933     NetworkCapture::Manager::singleton().terminate();
    934 #endif
    935 
    936922    platformTerminate();
    937923    ChildProcess::terminate();

  • trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp

    r238745 r238792  
    9191    encoder << cookiePersistentStorageFile;
    9292#endif
    93 #if ENABLE(NETWORK_CAPTURE)
    94     encoder << recordReplayMode;
    95     encoder << recordReplayCacheLocation;
    96 #endif
    9793
    9894    encoder << urlSchemesRegisteredAsSecure;
    … …  
    225221#endif
    226222
    227 #if ENABLE(NETWORK_CAPTURE)
    228     if (!decoder.decode(result.recordReplayMode))
    229         return false;
    230     if (!decoder.decode(result.recordReplayCacheLocation))
    231         return false;
    232 #endif
    233 
    234223    if (!decoder.decode(result.urlSchemesRegisteredAsSecure))
    235224        return false;

  • trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h

    r238745 r238792  
    107107#endif
    108108
    109 #if ENABLE(NETWORK_CAPTURE)
    110     String recordReplayMode;
    111     String recordReplayCacheLocation;
    112 #endif
    113 
    114109    Vector<String> urlSchemesRegisteredAsSecure;
    115110    Vector<String> urlSchemesRegisteredAsBypassingContentSecurityPolicy;

  • trunk/Source/WebKit/Sources.txt

    r238654 r238792  
    7171NetworkProcess/cache/NetworkCacheStorage.cpp
    7272NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp
    73 
    74 NetworkProcess/capture/NetworkCaptureEvent.cpp
    75 NetworkProcess/capture/NetworkCaptureManager.cpp
    76 NetworkProcess/capture/NetworkCaptureRecorder.cpp
    77 NetworkProcess/capture/NetworkCaptureReplayer.cpp
    78 NetworkProcess/capture/NetworkCaptureResource.cpp
    79 NetworkProcess/capture/NetworkDataTaskReplay.cpp
    8073
    8174NetworkProcess/webrtc/NetworkMDNSRegister.cpp

  • trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm

    r238746 r238792  
    8181#endif
    8282
    83 #if ENABLE(NETWORK_CAPTURE)
    84 static NSString * const WebKitRecordReplayModeDefaultsKey = @"WebKitRecordReplayMode";
    85 static NSString * const WebKitRecordReplayCacheLocationDefaultsKey = @"WebKitRecordReplayCacheLocation";
    86 #endif
    87 
    8883namespace WebKit {
    8984using namespace WebCore;
    … …  
    287282    parameters.storageAccessAPIEnabled = storageAccessAPIEnabled();
    288283    parameters.suppressesConnectionTerminationOnSystemChange = m_configuration->suppressesConnectionTerminationOnSystemChange();
    289 
    290 #if ENABLE(NETWORK_CAPTURE)
    291     parameters.recordReplayMode = [defaults stringForKey:WebKitRecordReplayModeDefaultsKey];
    292     parameters.recordReplayCacheLocation = [defaults stringForKey:WebKitRecordReplayCacheLocationDefaultsKey];
    293     if (parameters.recordReplayCacheLocation.isEmpty())
    294         parameters.recordReplayCacheLocation = parameters.diskCacheDirectory;
    295 #endif
    296284
    297285#if ENABLE(PROXIMITY_NETWORKING)

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r238739 r238792  
    10061006                52D5A1B01C57495A00DE34A3 /* VideoFullscreenManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 52D5A1AA1C57494E00DE34A3 /* VideoFullscreenManagerProxy.h */; };
    10071007                52F060E11654318500F3281B /* NetworkContentRuleListManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 52F060DD1654317500F3281B /* NetworkContentRuleListManagerMessageReceiver.cpp */; };
    1008                 5302583C1DCBBD2200DA89C2 /* NetworkCaptureResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 5302582F1DCBBD1D00DA89C2 /* NetworkCaptureResource.h */; };
    1009                 5302583E1DCBBD2200DA89C2 /* NetworkCaptureEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 530258311DCBBD1D00DA89C2 /* NetworkCaptureEvent.h */; };
    1010                 5302583F1DCBBD2200DA89C2 /* NetworkCaptureLogging.h in Headers */ = {isa = PBXBuildFile; fileRef = 530258321DCBBD1D00DA89C2 /* NetworkCaptureLogging.h */; };
    1011                 530258411DCBBD2200DA89C2 /* NetworkCaptureManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 530258341DCBBD1D00DA89C2 /* NetworkCaptureManager.h */; };
    1012                 530258431DCBBD2200DA89C2 /* NetworkCaptureRecorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 530258361DCBBD1D00DA89C2 /* NetworkCaptureRecorder.h */; };
    1013                 530258451DCBBD2200DA89C2 /* NetworkCaptureReplayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 530258381DCBBD1D00DA89C2 /* NetworkCaptureReplayer.h */; };
    1014                 530258471DCBBD2200DA89C2 /* NetworkDataTaskReplay.h in Headers */ = {isa = PBXBuildFile; fileRef = 5302583A1DCBBD1D00DA89C2 /* NetworkDataTaskReplay.h */; };
    10151008                532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 532159501DBAE6D70054AA3C /* NetworkSessionCocoa.h */; };
    10161009                532159561DBAE72D0054AA3C /* NetworkDataTaskCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 5321594F1DBAE6D70054AA3C /* NetworkDataTaskCocoa.h */; };
    10171010                535BCB922069C49C00CCCE02 /* NetworkActivityTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 535BCB902069C49C00CCCE02 /* NetworkActivityTracker.h */; };
    10181011                53BA47D11DC2EF5E004DF4AD /* NetworkDataTaskBlob.h in Headers */ = {isa = PBXBuildFile; fileRef = 539EB5471DC2EE40009D48CF /* NetworkDataTaskBlob.h */; };
    1019                 53DEA3661DDE423100E82648 /* json.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 53DEA3651DDE422E00E82648 /* json.hpp */; };
    10201012                570AB8F320AE3BD700B8BE87 /* SecKeyProxyStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 570AB8F220AE3BD700B8BE87 /* SecKeyProxyStore.h */; };
    10211013                57597EB921811D9A0037F924 /* CtapHidDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 57597EB721811D9A0037F924 /* CtapHidDriver.h */; };
    … …  
    33463338                52D5A1B41C5749F200DE34A3 /* VideoFullscreenManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = VideoFullscreenManager.mm; sourceTree = "<group>"; };
    33473339                52F060DD1654317500F3281B /* NetworkContentRuleListManagerMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkContentRuleListManagerMessageReceiver.cpp; path = DerivedSources/WebKit2/NetworkContentRuleListManagerMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
    3348                 5302582E1DCBBD1D00DA89C2 /* NetworkCaptureResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCaptureResource.cpp; sourceTree = "<group>"; };
    3349                 5302582F1DCBBD1D00DA89C2 /* NetworkCaptureResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCaptureResource.h; sourceTree = "<group>"; };
    3350                 530258301DCBBD1D00DA89C2 /* NetworkCaptureEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCaptureEvent.cpp; sourceTree = "<group>"; };
    3351                 530258311DCBBD1D00DA89C2 /* NetworkCaptureEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCaptureEvent.h; sourceTree = "<group>"; };
    3352                 530258321DCBBD1D00DA89C2 /* NetworkCaptureLogging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCaptureLogging.h; sourceTree = "<group>"; };
    3353                 530258331DCBBD1D00DA89C2 /* NetworkCaptureManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCaptureManager.cpp; sourceTree = "<group>"; };
    3354                 530258341DCBBD1D00DA89C2 /* NetworkCaptureManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCaptureManager.h; sourceTree = "<group>"; };
    3355                 530258351DCBBD1D00DA89C2 /* NetworkCaptureRecorder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCaptureRecorder.cpp; sourceTree = "<group>"; };
    3356                 530258361DCBBD1D00DA89C2 /* NetworkCaptureRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCaptureRecorder.h; sourceTree = "<group>"; };
    3357                 530258371DCBBD1D00DA89C2 /* NetworkCaptureReplayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCaptureReplayer.cpp; sourceTree = "<group>"; };
    3358                 530258381DCBBD1D00DA89C2 /* NetworkCaptureReplayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCaptureReplayer.h; sourceTree = "<group>"; };
    3359                 530258391DCBBD1D00DA89C2 /* NetworkDataTaskReplay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkDataTaskReplay.cpp; sourceTree = "<group>"; };
    3360                 5302583A1DCBBD1D00DA89C2 /* NetworkDataTaskReplay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkDataTaskReplay.h; sourceTree = "<group>"; };
    33613340                5315876B2076B713004BF9F3 /* NetworkActivityTrackerCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkActivityTrackerCocoa.mm; sourceTree = "<group>"; };
    33623341                5321594F1DBAE6D70054AA3C /* NetworkDataTaskCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkDataTaskCocoa.h; sourceTree = "<group>"; };
    … …  
    33673346                539EB5461DC2EE40009D48CF /* NetworkDataTaskBlob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkDataTaskBlob.cpp; sourceTree = "<group>"; };
    33683347                539EB5471DC2EE40009D48CF /* NetworkDataTaskBlob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkDataTaskBlob.h; sourceTree = "<group>"; };
    3369                 53DEA3651DDE422E00E82648 /* json.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = json.hpp; sourceTree = "<group>"; };
    33703348                53F3CAA5206C443E0086490E /* NetworkActivityTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkActivityTracker.cpp; sourceTree = "<group>"; };
    33713349                570AB8F220AE3BD700B8BE87 /* SecKeyProxyStore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecKeyProxyStore.h; sourceTree = "<group>"; };
    … …  
    64046382                        children = (
    64056383                                E489D2821A0A2BE80078C06A /* cache */,
    6406                                 539BD5B21DADB0BA00F2E4E1 /* capture */,
    64076384                                7EC4F0F818E4A922008056AF /* cocoa */,
    64086385                                3309344B1315B93A0097A7BC /* Cookies */,
    … …  
    66676644                        );
    66686645                        path = ios;
    6669                         sourceTree = "<group>";
    6670                 };
    6671                 539BD5B21DADB0BA00F2E4E1 /* capture */ = {
    6672                         isa = PBXGroup;
    6673                         children = (
    6674                                 53DEA3651DDE422E00E82648 /* json.hpp */,
    6675                                 530258301DCBBD1D00DA89C2 /* NetworkCaptureEvent.cpp */,
    6676                                 530258311DCBBD1D00DA89C2 /* NetworkCaptureEvent.h */,
    6677                                 530258321DCBBD1D00DA89C2 /* NetworkCaptureLogging.h */,
    6678                                 530258331DCBBD1D00DA89C2 /* NetworkCaptureManager.cpp */,
    6679                                 530258341DCBBD1D00DA89C2 /* NetworkCaptureManager.h */,
    6680                                 530258351DCBBD1D00DA89C2 /* NetworkCaptureRecorder.cpp */,
    6681                                 530258361DCBBD1D00DA89C2 /* NetworkCaptureRecorder.h */,
    6682                                 530258371DCBBD1D00DA89C2 /* NetworkCaptureReplayer.cpp */,
    6683                                 530258381DCBBD1D00DA89C2 /* NetworkCaptureReplayer.h */,
    6684                                 5302582E1DCBBD1D00DA89C2 /* NetworkCaptureResource.cpp */,
    6685                                 5302582F1DCBBD1D00DA89C2 /* NetworkCaptureResource.h */,
    6686                                 530258391DCBBD1D00DA89C2 /* NetworkDataTaskReplay.cpp */,
    6687                                 5302583A1DCBBD1D00DA89C2 /* NetworkDataTaskReplay.h */,
    6688                         );
    6689                         path = capture;
    66906646                        sourceTree = "<group>";
    66916647                };
    … …  
    90749030                                1AE49A4911FFA8CE0048B464 /* JSNPMethod.h in Headers */,
    90759031                                1AE4987811FF7FAA0048B464 /* JSNPObject.h in Headers */,
    9076                                 53DEA3661DDE423100E82648 /* json.hpp in Headers */,
    90779032                                BCE0937814FB128C001138D9 /* LayerHostingContext.h in Headers */,
    90789033                                0F0C365A18C0555800F607D7 /* LayerRepresentation.h in Headers */,
    … …  
    91379092                                E4436ECF1A0D040B00EAD204 /* NetworkCacheStorage.h in Headers */,
    91389093                                8310428B1BD6B66F00A715E4 /* NetworkCacheSubresourcesEntry.h in Headers */,
    9139                                 5302583E1DCBBD2200DA89C2 /* NetworkCaptureEvent.h in Headers */,
    9140                                 5302583F1DCBBD2200DA89C2 /* NetworkCaptureLogging.h in Headers */,
    9141                                 530258411DCBBD2200DA89C2 /* NetworkCaptureManager.h in Headers */,
    9142                                 530258431DCBBD2200DA89C2 /* NetworkCaptureRecorder.h in Headers */,
    9143                                 530258451DCBBD2200DA89C2 /* NetworkCaptureReplayer.h in Headers */,
    9144                                 5302583C1DCBBD2200DA89C2 /* NetworkCaptureResource.h in Headers */,
    91459094                                513A164D1630A9BF005D7D22 /* NetworkConnectionToWebProcess.h in Headers */,
    91469095                                51DD9F2916367DA2001578E9 /* NetworkConnectionToWebProcessMessages.h in Headers */,
    … …  
    91499098                                53BA47D11DC2EF5E004DF4AD /* NetworkDataTaskBlob.h in Headers */,
    91509099                                532159561DBAE72D0054AA3C /* NetworkDataTaskCocoa.h in Headers */,
    9151                                 530258471DCBBD2200DA89C2 /* NetworkDataTaskReplay.h in Headers */,
    91529100                                839902031BE9A02B000F3653 /* NetworkLoad.h in Headers */,
    91539101                                83D454D71BE9D3C4006C93BD /* NetworkLoadClient.h in Headers */,

  • trunk/Source/WebKit/config.h

    r238249 r238792  
    9090#endif
    9191
    92 #ifndef ENABLE_NETWORK_CAPTURE
    93 #if PLATFORM(COCOA)
    94 #define ENABLE_NETWORK_CAPTURE 1
    95 #endif
    96 #endif
    97 
    9892#ifndef ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION
    9993#if (PLATFORM(COCOA) || PLATFORM(GTK))
Note: See TracChangeset for help on using the changeset viewer.