Changeset 231906 in webkit


Ignore:
Timestamp:
May 17, 2018 9:34:15 AM (6 years ago)
Author:
Kocsen Chung
Message:

Cherry-pick r231770. rdar://problem/39915196

[Wi-Fi Assertions] Allow clients to specify a context identifier
​https://bugs.webkit.org/show_bug.cgi?id=185620
<rdar://problem/39915196>

Reviewed by Brady Eidson.

Added an SPI on _WKProcessPoolConfiguration that allows clients to specify a
context identifier.

  • NetworkProcess/NetworkProcessCreationParameters.cpp: (WebKit::NetworkProcessCreationParameters::encode const): (WebKit::NetworkProcessCreationParameters::decode):
  • NetworkProcess/NetworkProcessCreationParameters.h:
  • NetworkProcess/cocoa/NetworkProcessCocoa.mm: (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
  • UIProcess/API/APIProcessPoolConfiguration.cpp: (API::ProcessPoolConfiguration::copy):
  • UIProcess/API/APIProcessPoolConfiguration.h:
  • UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
  • UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm: (-[_WKProcessPoolConfiguration wirelessContextIdentifier]): (-[_WKProcessPoolConfiguration setWirelessContextIdentifier:]):
  • UIProcess/Cocoa/WebProcessPoolCocoa.mm: (WebKit::WebProcessPool::platformInitializeNetworkProcess):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@231770 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:
branches/safari-606.1.17-branch/Source/WebKit
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-606.1.17-branch/Source/WebKit/ChangeLog

    r231900 r231906  
     12018-05-17  Kocsen Chung  <kocsen_chung@apple.com>
     2
     3        Cherry-pick r231770. rdar://problem/39915196
     4
     5    [Wi-Fi Assertions] Allow clients to specify a context identifier
     6    https://bugs.webkit.org/show_bug.cgi?id=185620
     7    <rdar://problem/39915196>
     8   
     9    Reviewed by Brady Eidson.
     10   
     11    Added an SPI on _WKProcessPoolConfiguration that allows clients to specify a
     12    context identifier.
     13   
     14    * NetworkProcess/NetworkProcessCreationParameters.cpp:
     15    (WebKit::NetworkProcessCreationParameters::encode const):
     16    (WebKit::NetworkProcessCreationParameters::decode):
     17    * NetworkProcess/NetworkProcessCreationParameters.h:
     18    * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
     19    (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
     20    * UIProcess/API/APIProcessPoolConfiguration.cpp:
     21    (API::ProcessPoolConfiguration::copy):
     22    * UIProcess/API/APIProcessPoolConfiguration.h:
     23    * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
     24    * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
     25    (-[_WKProcessPoolConfiguration wirelessContextIdentifier]):
     26    (-[_WKProcessPoolConfiguration setWirelessContextIdentifier:]):
     27    * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
     28    (WebKit::WebProcessPool::platformInitializeNetworkProcess):
     29   
     30   
     31    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231770 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     32
     33    2018-05-14  Andy Estes  <aestes@apple.com>
     34
     35            [Wi-Fi Assertions] Allow clients to specify a context identifier
     36            https://bugs.webkit.org/show_bug.cgi?id=185620
     37            <rdar://problem/39915196>
     38
     39            Reviewed by Brady Eidson.
     40
     41            Added an SPI on _WKProcessPoolConfiguration that allows clients to specify a
     42            context identifier.
     43
     44            * NetworkProcess/NetworkProcessCreationParameters.cpp:
     45            (WebKit::NetworkProcessCreationParameters::encode const):
     46            (WebKit::NetworkProcessCreationParameters::decode):
     47            * NetworkProcess/NetworkProcessCreationParameters.h:
     48            * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
     49            (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
     50            * UIProcess/API/APIProcessPoolConfiguration.cpp:
     51            (API::ProcessPoolConfiguration::copy):
     52            * UIProcess/API/APIProcessPoolConfiguration.h:
     53            * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
     54            * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
     55            (-[_WKProcessPoolConfiguration wirelessContextIdentifier]):
     56            (-[_WKProcessPoolConfiguration setWirelessContextIdentifier:]):
     57            * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
     58            (WebKit::WebProcessPool::platformInitializeNetworkProcess):
     59
    1602018-05-17  Kocsen Chung  <kocsen_chung@apple.com>
    261

  • branches/safari-606.1.17-branch/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp

    r231282 r231906  
    118118
    119119    encoder << trackNetworkActivity;
     120   
     121#if ENABLE(WIFI_ASSERTIONS)
     122    encoder << wirelessContextIdentifier;
     123#endif
    120124}
    121125
    … …  
    281285        return false;
    282286
     287#if ENABLE(WIFI_ASSERTIONS)
     288    if (!decoder.decode(result.wirelessContextIdentifier))
     289        return false;
     290#endif
     291
    283292    return true;
    284293}

  • branches/safari-606.1.17-branch/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h

    r231282 r231906  
    135135
    136136    bool trackNetworkActivity { false };
     137   
     138#if ENABLE(WIFI_ASSERTIONS)
     139    unsigned wirelessContextIdentifier { 0 };
     140#endif
    137141};
    138142

  • branches/safari-606.1.17-branch/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm

    r231536 r231906  
    4545#import <wtf/ProcessPrivilege.h>
    4646
     47#if USE(APPLE_INTERNAL_SDK)
     48#import <WebKitAdditions/NetworkProcessCocoaAdditions.mm>
     49#endif
     50
    4751namespace WebKit {
    4852
    … …  
    111115        SandboxExtension::consumePermanently(parameters.cacheStorageDirectoryExtensionHandle);
    112116    }
     117
     118#if ENABLE(WIFI_ASSERTIONS)
     119    initializeWiFiAssertions(parameters);
     120#endif
    113121
    114122    if (!m_diskCacheDirectory.isNull()) {

  • branches/safari-606.1.17-branch/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp

    r231282 r231906  
    132132    copy->m_processSwapsOnWindowOpenWithOpener = this->m_processSwapsOnWindowOpenWithOpener;
    133133    copy->m_trackNetworkActivity = this->m_trackNetworkActivity;
     134#if ENABLE(WIFI_ASSERTIONS)
     135    copy->m_wirelessContextIdentifier = this->m_wirelessContextIdentifier;
     136#endif
    134137
    135138    return copy;

  • branches/safari-606.1.17-branch/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h

    r231282 r231906  
    147147    bool trackNetworkActivity() const { return m_trackNetworkActivity; }
    148148    void setTrackNetworkActivity(bool track) { m_trackNetworkActivity = track; }
     149
     150#if ENABLE(WIFI_ASSERTIONS)
     151    unsigned wirelessContextIdentifier() const { return m_wirelessContextIdentifier; }
     152    void setWirelessContextIdentifier(unsigned wirelessContextIdentifier) { m_wirelessContextIdentifier = wirelessContextIdentifier; }
     153#endif
    149154
    150155private:
    … …  
    187192    WTF::String m_ctDataConnectionServiceType;
    188193#endif
     194
     195#if ENABLE(WIFI_ASSERTIONS)
     196    unsigned m_wirelessContextIdentifier { 0 };
     197#endif
    189198};
    190199

  • branches/safari-606.1.17-branch/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h

    r231282 r231906  
    4141@property (nonatomic, copy) NSArray<NSURL *> *additionalReadAccessAllowedURLs WK_API_AVAILABLE(macosx(10.13), ios(11.0));
    4242
     43#if TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR
     44@property (nonatomic) NSUInteger wirelessContextIdentifier;
     45#endif
     46
    4347// Network Process properties
    4448// FIXME: These should be be per-session/data store when we support multiple non-persistent sessions/data stores.

  • branches/safari-606.1.17-branch/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm

    r231282 r231906  
    130130}
    131131
     132#if ENABLE(WIFI_ASSERTIONS)
     133- (NSUInteger)wirelessContextIdentifier
     134{
     135    return _processPoolConfiguration->wirelessContextIdentifier();
     136}
     137
     138- (void)setWirelessContextIdentifier:(NSUInteger)identifier
     139{
     140    _processPoolConfiguration->setWirelessContextIdentifier(identifier);
     141}
     142#endif
     143
    132144- (NSArray *)cachePartitionedURLSchemes
    133145{

  • branches/safari-606.1.17-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm

    r231790 r231906  
    329329        parameters.recordReplayCacheLocation = parameters.diskCacheDirectory;
    330330#endif
     331
     332#if ENABLE(WIFI_ASSERTIONS)
     333    parameters.wirelessContextIdentifier = m_configuration->wirelessContextIdentifier();
     334#endif
    331335}
    332336
Note: See TracChangeset for help on using the changeset viewer.