Changeset 251862 in webkit


Ignore:
Timestamp:
Oct 31, 2019 10:54:01 AM (4 years ago)
Author:
achristensen@apple.com
Message:

Remove unneeded HAVE_TIMINGDATAOPTIONS
​https://bugs.webkit.org/show_bug.cgi?id=202990

Reviewed by Brady Eidson.

Source/WebCore:

This macro allowed us to adopt CFNetwork SPI, but now that the SPI is available everywhere we support, we don't need it.

  • platform/network/NetworkLoadMetrics.h:
  • platform/network/cocoa/NetworkLoadMetrics.mm:

(WebCore::copyTimingData):
(WebCore::setCollectsTimingData): Deleted.

  • platform/network/mac/ResourceHandleMac.mm:

(WebCore::ResourceHandle::createNSURLConnection):

Source/WebKit:

  • NetworkProcess/cocoa/NetworkSessionCocoa.mm:

(WebKit::NetworkSessionCocoa::NetworkSessionCocoa):

Source/WTF:

  • wtf/Platform.h:
Location:
trunk/Source
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r251852 r251862  
     12019-10-31  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove unneeded HAVE_TIMINGDATAOPTIONS
     4        https://bugs.webkit.org/show_bug.cgi?id=202990
     5
     6        Reviewed by Brady Eidson.
     7
     8        * wtf/Platform.h:
     9
    1102019-10-31  Yusuke Suzuki  <ysuzuki@apple.com>
    211

  • trunk/Source/WTF/wtf/Platform.h

    r251518 r251862  
    12771277
    12781278#if PLATFORM(COCOA)
    1279 #define HAVE_TIMINGDATAOPTIONS 1
    1280 #endif
    1281 
    1282 #if PLATFORM(COCOA)
    12831279#define USE_AUDIO_SESSION 1
    12841280#endif

  • trunk/Source/WebCore/ChangeLog

    r251861 r251862  
     12019-10-31  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove unneeded HAVE_TIMINGDATAOPTIONS
     4        https://bugs.webkit.org/show_bug.cgi?id=202990
     5
     6        Reviewed by Brady Eidson.
     7
     8        This macro allowed us to adopt CFNetwork SPI, but now that the SPI is available everywhere we support, we don't need it.
     9
     10        * platform/network/NetworkLoadMetrics.h:
     11        * platform/network/cocoa/NetworkLoadMetrics.mm:
     12        (WebCore::copyTimingData):
     13        (WebCore::setCollectsTimingData): Deleted.
     14        * platform/network/mac/ResourceHandleMac.mm:
     15        (WebCore::ResourceHandle::createNSURLConnection):
     16
    1172019-10-31  Alex Christensen  <achristensen@webkit.org>
    218

  • trunk/Source/WebCore/platform/network/NetworkLoadMetrics.h

    r251021 r251862  
    188188#endif
    189189
    190 #if PLATFORM(COCOA) && !HAVE(TIMINGDATAOPTIONS)
    191 WEBCORE_EXPORT void setCollectsTimingData();
    192 #endif
    193 
    194190template<class Encoder>
    195191void NetworkLoadMetrics::encode(Encoder& encoder) const

  • trunk/Source/WebCore/platform/network/cocoa/NetworkLoadMetrics.mm

    r220506 r251862  
    6565    // NOTE: responseEnd is not populated in this code path.
    6666}
    67 
    68 #if !HAVE(TIMINGDATAOPTIONS)
    69 void setCollectsTimingData()
    70 {
    71     static dispatch_once_t onceToken;
    72     dispatch_once(&onceToken, ^{
    73         [NSURLConnection _setCollectsTimingData:YES];
    74         [NSURLConnection _collectTimingDataWithOptions:TimingDataCollectionNStatsOff | TimingDataCollectionConnectionDataOff];
    75     });
    76 }
    77 #endif
    7867   
    7968}

  • trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm

    r248190 r251862  
    142142#endif
    143143{
    144 #if !HAVE(TIMINGDATAOPTIONS)
    145     setCollectsTimingData();
    146 #endif
    147 
    148144    // Credentials for ftp can only be passed in URL, the connection:didReceiveAuthenticationChallenge: delegate call won't be made.
    149145    if ((!d->m_user.isEmpty() || !d->m_pass.isEmpty()) && !firstRequest().url().protocolIsInHTTPFamily()) {
    … …  
    218214    const bool usesCache = true;
    219215#endif
    220 #if HAVE(TIMINGDATAOPTIONS)
    221216    [propertyDictionary setObject:@{@"_kCFURLConnectionPropertyTimingDataOptions": @(_TimingDataOptionsEnableW3CNavigationTiming)} forKey:@"kCFURLConnectionURLConnectionProperties"];
    222 #endif
    223217
    224218    // This is used to signal that to CFNetwork that this connection should be considered

  • trunk/Source/WebKit/ChangeLog

    r251861 r251862  
     12019-10-31  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove unneeded HAVE_TIMINGDATAOPTIONS
     4        https://bugs.webkit.org/show_bug.cgi?id=202990
     5
     6        Reviewed by Brady Eidson.
     7
     8        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
     9        (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
     10
    1112019-10-31  Alex Christensen  <achristensen@webkit.org>
    212

  • trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm

    r251676 r251862  
    10351035#endif
    10361036
    1037 #if HAVE(TIMINGDATAOPTIONS)
    10381037    configuration._timingDataOptions = _TimingDataOptionsEnableW3CNavigationTiming;
    1039 #else
    1040     setCollectsTimingData();
    1041 #endif
    10421038
    10431039#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || PLATFORM(IOS_FAMILY)
Note: See TracChangeset for help on using the changeset viewer.