Changeset 231966 in webkit


Ignore:
Timestamp:
May 18, 2018 11:17:28 AM (6 years ago)
Author:
Keith Rollin
Message:

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):

Location:
trunk/Source/WebKit
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r231963 r231966  
     12018-05-18  Keith Rollin  <krollin@apple.com>
     2
     3        Renamed "trackNetworkActivity" to "tracksResourceLoadMilestones"
     4        https://bugs.webkit.org/show_bug.cgi?id=185523
     5        <rdar://problem/40136361>
     6
     7        Reviewed by Geoffrey Garen.
     8
     9        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
     10        (WebKit::networkActivityTrackingEnabled):
     11        * NetworkProcess/NetworkProcess.cpp:
     12        (WebKit::NetworkProcess::initializeNetworkProcess):
     13        * NetworkProcess/NetworkProcess.h:
     14        (WebKit::NetworkProcess::tracksResourceLoadMilestones const):
     15        (WebKit::NetworkProcess::trackNetworkActivity const): Deleted.
     16        * NetworkProcess/NetworkProcessCreationParameters.cpp:
     17        (WebKit::NetworkProcessCreationParameters::encode const):
     18        (WebKit::NetworkProcessCreationParameters::decode):
     19        * NetworkProcess/NetworkProcessCreationParameters.h:
     20        * UIProcess/API/APIProcessPoolConfiguration.cpp:
     21        (API::ProcessPoolConfiguration::copy):
     22        * UIProcess/API/APIProcessPoolConfiguration.h:
     23        * UIProcess/API/C/WKContextConfigurationRef.cpp:
     24        (WKContextConfigurationTracksResourceLoadMilestones):
     25        (WKContextConfigurationSetTracksResourceLoadMilestones):
     26        (WKContextConfigurationTrackNetworkActivity): Deleted.
     27        (WKContextConfigurationSetTrackNetworkActivity): Deleted.
     28        * UIProcess/API/C/WKContextConfigurationRef.h:
     29        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
     30        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
     31        (-[_WKProcessPoolConfiguration tracksResourceLoadMilestones]):
     32        (-[_WKProcessPoolConfiguration setTracksResourceLoadMilestones:]):
     33        (-[_WKProcessPoolConfiguration trackNetworkActivity]): Deleted.
     34        (-[_WKProcessPoolConfiguration setTrackNetworkActivity:]): Deleted.
     35        * UIProcess/WebProcessPool.cpp:
     36        (WebKit::WebProcessPool::ensureNetworkProcess):
     37
    1382018-05-18  Chris Dumez  <cdumez@apple.com>
    239

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

    r231931 r231966  
    549549static bool networkActivityTrackingEnabled()
    550550{
    551     return NetworkProcess::singleton().trackNetworkActivity();
     551    return NetworkProcess::singleton().tracksResourceLoadMilestones();
    552552}
    553553

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

    r231536 r231966  
    293293        registerURLSchemeAsCanDisplayOnlyIfCanRequest(scheme);
    294294
    295     m_trackNetworkActivity = parameters.trackNetworkActivity;
     295    m_tracksResourceLoadMilestones = parameters.tracksResourceLoadMilestones;
    296296
    297297    RELEASE_LOG(Process, "%p - NetworkProcess::initializeNetworkProcess: Presenting process = %d", this, WebCore::presentingApplicationPID());

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

    r231536 r231966  
    163163#endif
    164164
    165     bool trackNetworkActivity() const { return m_trackNetworkActivity; }
     165    bool tracksResourceLoadMilestones() const { return m_tracksResourceLoadMilestones; }
    166166
    167167private:
    … …  
    305305#endif
    306306
    307     bool m_trackNetworkActivity { false };
     307    bool m_tracksResourceLoadMilestones { false };
    308308};
    309309

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

    r231770 r231966  
    117117    encoder << urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest;
    118118
    119     encoder << trackNetworkActivity;
     119    encoder << tracksResourceLoadMilestones;
    120120   
    121121#if ENABLE(WIFI_ASSERTIONS)
    … …  
    282282        return false;
    283283
    284     if (!decoder.decode(result.trackNetworkActivity))
     284    if (!decoder.decode(result.tracksResourceLoadMilestones))
    285285        return false;
    286286

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

    r231770 r231966  
    134134    Vector<String> urlSchemesRegisteredAsCORSEnabled;
    135135
    136     bool trackNetworkActivity { false };
     136    bool tracksResourceLoadMilestones { false };
    137137   
    138138#if ENABLE(WIFI_ASSERTIONS)

  • trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp

    r231770 r231966  
    131131    copy->m_alwaysKeepAndReuseSwappedProcesses = this->m_alwaysKeepAndReuseSwappedProcesses;
    132132    copy->m_processSwapsOnWindowOpenWithOpener = this->m_processSwapsOnWindowOpenWithOpener;
    133     copy->m_trackNetworkActivity = this->m_trackNetworkActivity;
     133    copy->m_tracksResourceLoadMilestones = this->m_tracksResourceLoadMilestones;
    134134#if ENABLE(WIFI_ASSERTIONS)
    135135    copy->m_wirelessContextIdentifier = this->m_wirelessContextIdentifier;

  • trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h

    r231770 r231966  
    145145    void setProcessSwapsOnWindowOpenWithOpener(bool swaps) { m_processSwapsOnWindowOpenWithOpener = swaps; }
    146146
    147     bool trackNetworkActivity() const { return m_trackNetworkActivity; }
    148     void setTrackNetworkActivity(bool track) { m_trackNetworkActivity = track; }
     147    bool tracksResourceLoadMilestones() const { return m_tracksResourceLoadMilestones; }
     148    void setTracksResourceLoadMilestones(bool track) { m_tracksResourceLoadMilestones = track; }
    149149
    150150#if ENABLE(WIFI_ASSERTIONS)
    … …  
    187187    bool m_alwaysKeepAndReuseSwappedProcesses { false };
    188188    bool m_processSwapsOnWindowOpenWithOpener { false };
    189     bool m_trackNetworkActivity { false };
     189    bool m_tracksResourceLoadMilestones { false };
    190190
    191191#if PLATFORM(IOS)

  • trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp

    r231282 r231966  
    189189}
    190190
    191 bool WKContextConfigurationTrackNetworkActivity(WKContextConfigurationRef configuration)
     191bool WKContextConfigurationTracksResourceLoadMilestones(WKContextConfigurationRef configuration)
    192192{
    193     return toImpl(configuration)->trackNetworkActivity();
     193    return toImpl(configuration)->tracksResourceLoadMilestones();
    194194}
    195195
    196 void WKContextConfigurationSetTrackNetworkActivity(WKContextConfigurationRef configuration, bool track)
     196void WKContextConfigurationSetTracksResourceLoadMilestones(WKContextConfigurationRef configuration, bool track)
    197197{
    198     toImpl(configuration)->setTrackNetworkActivity(track);
     198    toImpl(configuration)->setTracksResourceLoadMilestones(track);
    199199}

  • trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h

    r231282 r231966  
    7878WK_EXPORT void WKContextConfigurationSetProcessSwapsOnWindowOpenWithOpener(WKContextConfigurationRef configuration, bool swaps);
    7979
    80 WK_EXPORT bool WKContextConfigurationTrackNetworkActivity(WKContextConfigurationRef configuration);
    81 WK_EXPORT void WKContextConfigurationSetTrackNetworkActivity(WKContextConfigurationRef configuration, bool track);
     80WK_EXPORT bool WKContextConfigurationTracksResourceLoadMilestones(WKContextConfigurationRef configuration);
     81WK_EXPORT void WKContextConfigurationSetTracksResourceLoadMilestones(WKContextConfigurationRef configuration, bool track);
    8282
    8383#ifdef __cplusplus

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h

    r231770 r231966  
    6565@property (nonatomic) BOOL alwaysKeepAndReuseSwappedProcesses WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    6666@property (nonatomic) BOOL processSwapsOnWindowOpenWithOpener WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    67 @property (nonatomic) BOOL trackNetworkActivity WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     67@property (nonatomic) BOOL tracksResourceLoadMilestones WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    6868@property (nonatomic) BOOL pageCacheEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    6969

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm

    r231770 r231966  
    270270}
    271271
    272 - (BOOL)trackNetworkActivity
    273 {
    274     return _processPoolConfiguration->trackNetworkActivity();
    275 }
    276 
    277 - (void)setTrackNetworkActivity:(BOOL)track
    278 {
    279     _processPoolConfiguration->setTrackNetworkActivity(track);
     272- (BOOL)tracksResourceLoadMilestones
     273{
     274    return _processPoolConfiguration->tracksResourceLoadMilestones();
     275}
     276
     277- (void)setTracksResourceLoadMilestones:(BOOL)track
     278{
     279    _processPoolConfiguration->setTracksResourceLoadMilestones(track);
    280280}
    281281

  • trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

    r231931 r231966  
    507507    parameters.urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest = copyToVector(m_schemesToRegisterAsCanDisplayOnlyIfCanRequest);
    508508
    509     parameters.trackNetworkActivity = m_configuration->trackNetworkActivity();
     509    parameters.tracksResourceLoadMilestones = m_configuration->tracksResourceLoadMilestones();
    510510
    511511    // Add any platform specific parameters
Note: See TracChangeset for help on using the changeset viewer.