Changeset 230596 in webkit


Ignore:
Timestamp:
Apr 12, 2018 2:37:26 PM (6 years ago)
Author:
Kocsen Chung
Message:

Cherry-pick r230560. rdar://problem/39025726

[iOS] Add a mechanism for holding Wi-Fi assertions
https://bugs.webkit.org/show_bug.cgi?id=184520
<rdar://problem/39025726>

Reviewed by Sam Weinig.

Add plumbing for holding a Wi-Fi assertion on iOS as long as there are active
network data tasks. This functionality is turned off by default right now.

  • Configurations/Network-iOS.entitlements:
  • NetworkProcess/cocoa/NetworkDataTaskCocoa.h:
  • NetworkProcess/cocoa/NetworkDataTaskCocoa.mm: (WebKit::NetworkDataTaskCocoa::NetworkDataTaskCocoa):
  • NetworkProcess/cocoa/WiFiAssertionHolder.cpp: Added. (WebKit::ensureWiFiManagerClient): Create a global WiFiManagerClient when needed. (WebKit::WiFiAssertionHolder::WiFiAssertionHolder): If this is the first active Wi-Fi assertion holder, set the client's type to kWiFiClientTypeBackground. (WebKit::WiFiAssertionHolder::~WiFiAssertionHolder): If the last active Wi-Fi assertion holder is being destroyed, set the client's type back to kWiFiClientTypeNormal.
  • NetworkProcess/cocoa/WiFiAssertionHolder.h: Added.
  • Platform/Logging.h: Added a logging channel for Wi-Fi assertions.
  • Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb:
  • WebKit.xcodeproj/project.pbxproj:

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

Location:
tags/Safari-606.1.13/Source/WebKit
Files:
8 edited
3 copied

Legend:

Unmodified
Added
Removed
  • tags/Safari-606.1.13/Source/WebKit/ChangeLog

    r230521 r230596  
     12018-04-12  Kocsen Chung  <kocsen_chung@apple.com>
     2
     3        Cherry-pick r230560. rdar://problem/39025726
     4
     5    [iOS] Add a mechanism for holding Wi-Fi assertions
     6    https://bugs.webkit.org/show_bug.cgi?id=184520
     7    <rdar://problem/39025726>
     8   
     9    Reviewed by Sam Weinig.
     10   
     11    Add plumbing for holding a Wi-Fi assertion on iOS as long as there are active
     12    network data tasks. This functionality is turned off by default right now.
     13   
     14    * Configurations/Network-iOS.entitlements:
     15    * NetworkProcess/cocoa/NetworkDataTaskCocoa.h:
     16    * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
     17    (WebKit::NetworkDataTaskCocoa::NetworkDataTaskCocoa):
     18    * NetworkProcess/cocoa/WiFiAssertionHolder.cpp: Added.
     19    (WebKit::ensureWiFiManagerClient): Create a global WiFiManagerClient when needed.
     20    (WebKit::WiFiAssertionHolder::WiFiAssertionHolder): If this is the first active
     21    Wi-Fi assertion holder, set the client's type to kWiFiClientTypeBackground.
     22    (WebKit::WiFiAssertionHolder::~WiFiAssertionHolder): If the last active Wi-Fi
     23    assertion holder is being destroyed, set the client's type back to
     24    kWiFiClientTypeNormal.
     25    * NetworkProcess/cocoa/WiFiAssertionHolder.h: Added.
     26    * Platform/Logging.h: Added a logging channel for Wi-Fi assertions.
     27    * Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb:
     28    * WebKit.xcodeproj/project.pbxproj:
     29   
     30    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230560 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     31
     32    2018-04-11  Andy Estes  <aestes@apple.com>
     33
     34            [iOS] Add a mechanism for holding Wi-Fi assertions
     35            https://bugs.webkit.org/show_bug.cgi?id=184520
     36            <rdar://problem/39025726>
     37
     38            Reviewed by Sam Weinig.
     39
     40            Add plumbing for holding a Wi-Fi assertion on iOS as long as there are active
     41            network data tasks. This functionality is turned off by default right now.
     42
     43            * Configurations/Network-iOS.entitlements:
     44            * NetworkProcess/cocoa/NetworkDataTaskCocoa.h:
     45            * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
     46            (WebKit::NetworkDataTaskCocoa::NetworkDataTaskCocoa):
     47            * NetworkProcess/cocoa/WiFiAssertionHolder.cpp: Added.
     48            (WebKit::ensureWiFiManagerClient): Create a global WiFiManagerClient when needed.
     49            (WebKit::WiFiAssertionHolder::WiFiAssertionHolder): If this is the first active
     50            Wi-Fi assertion holder, set the client's type to kWiFiClientTypeBackground.
     51            (WebKit::WiFiAssertionHolder::~WiFiAssertionHolder): If the last active Wi-Fi
     52            assertion holder is being destroyed, set the client's type back to
     53            kWiFiClientTypeNormal.
     54            * NetworkProcess/cocoa/WiFiAssertionHolder.h: Added.
     55            * Platform/Logging.h: Added a logging channel for Wi-Fi assertions.
     56            * Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb:
     57            * WebKit.xcodeproj/project.pbxproj:
     58
    1592018-04-11  Antoine Quint  <graouts@apple.com>
    260
  • tags/Safari-606.1.13/Source/WebKit/Configurations/Network-iOS.entitlements

    r171887 r230596  
    33<plist version="1.0">
    44<dict>
     5        <key>com.apple.wifi.manager-access</key>
     6        <true/>
    57        <key>com.apple.private.accounts.bundleidspoofing</key>
    68        <true/>
  • tags/Safari-606.1.13/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h

    r229343 r230596  
    2828#include "NetworkDataTask.h"
    2929#include "NetworkLoadParameters.h"
     30#include "WiFiAssertionHolder.h"
    3031#include <WebCore/NetworkLoadMetrics.h>
    3132#include <wtf/RetainPtr.h>
     
    7273    uint64_t pageID() const { return m_pageID; };
    7374
     75#if HAVE(MOBILE_WIFI)
     76    void acquireWiFiAssertion()
     77    {
     78        ASSERT(!m_wiFiAssertionHolder);
     79        m_wiFiAssertionHolder.emplace();
     80    }
     81#endif
     82
    7483private:
    7584    NetworkDataTaskCocoa(NetworkSession&, NetworkDataTaskClient&, const WebCore::ResourceRequest&, uint64_t frameID, uint64_t pageID, WebCore::StoredCredentialsPolicy, WebCore::ContentSniffingPolicy, WebCore::ContentEncodingSniffingPolicy, bool shouldClearReferrerOnHTTPSToHTTPRedirect, PreconnectOnly);
     
    95104    bool m_hasBeenSetToUseStatelessCookieStorage { false };
    96105#endif
     106
     107#if HAVE(MOBILE_WIFI)
     108    std::optional<WiFiAssertionHolder> m_wiFiAssertionHolder;
     109#endif
    97110};
    98111
  • tags/Safari-606.1.13/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm

    r229978 r230596  
    4545#import <wtf/text/Base64.h>
    4646
     47#if USE(APPLE_INTERNAL_SDK)
     48#import <WebKitAdditions/NetworkDataTaskCocoaAdditions.mm>
     49#endif
     50
    4751namespace WebKit {
    4852
     
    190194    NSURLRequest *nsRequest = request.nsURLRequest(WebCore::UpdateHTTPBody);
    191195    applySniffingPoliciesAndBindRequestToInferfaceIfNeeded(nsRequest, shouldContentSniff == WebCore::SniffContent && !url.isLocalFile(), shouldContentEncodingSniff == WebCore::ContentEncodingSniffingPolicy::Sniff);
     196#if USE(APPLE_INTERNAL_SDK)
     197    applyAdditionalProperties(request, *this, nsRequest);
     198#endif
    192199
    193200    auto& cocoaSession = static_cast<NetworkSessionCocoa&>(m_session.get());
  • tags/Safari-606.1.13/Source/WebKit/NetworkProcess/cocoa/WiFiAssertionHolder.cpp

    r230546 r230596  
    11/*
    2  * Copyright (C) 2010, 2013 Apple Inc. All rights reserved.
     2 * Copyright (C) 2018 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    2424 */
    2525
    26 #pragma once
     26#include "config.h"
     27#include "WiFiAssertionHolder.h"
    2728
    28 #include <pal/LogMacros.h>
    29 #include <wtf/Assertions.h>
    30 #include <wtf/text/WTFString.h>
     29#if HAVE(MOBILE_WIFI)
    3130
    32 #if !LOG_DISABLED || !RELEASE_LOG_DISABLED
     31#include "Logging.h"
     32#include "MobileWiFiSPI.h"
    3333
    34 #ifndef LOG_CHANNEL_PREFIX
    35 #define LOG_CHANNEL_PREFIX WebKit2Log
    36 #endif
     34namespace WebKit {
    3735
    38 #ifdef __cplusplus
    39 extern "C" {
    40 #endif
     36static WiFiManagerClientRef ensureWiFiManagerClient()
     37{
     38    static WiFiManagerClientRef wiFiManagerClient = WiFiManagerClientCreate(kCFAllocatorDefault, kWiFiClientTypeNormal);
     39    return wiFiManagerClient;
     40}
    4141
    42 #define WEBKIT2_LOG_CHANNELS(M) \
    43     M(CacheStorage) \
    44     M(ContextMenu) \
    45     M(DragAndDrop) \
    46     M(Fullscreen) \
    47     M(Gamepad) \
    48     M(IconDatabase) \
    49     M(IndexedDB) \
    50     M(IPC) \
    51     M(KeyHandling) \
    52     M(Layers) \
    53     M(Loading) \
    54     M(Network) \
    55     M(NetworkCache) \
    56     M(NetworkCacheSpeculativePreloading) \
    57     M(NetworkCacheStorage) \
    58     M(NetworkScheduling) \
    59     M(NetworkSession) \
    60     M(PerformanceLogging) \
    61     M(Plugins) \
    62     M(Printing) \
    63     M(Process) \
    64     M(ProcessSuspension) \
    65     M(RemoteLayerTree) \
    66     M(Resize) \
    67     M(ResourceLoadStatistics) \
    68     M(ResourceLoadStatisticsDebug) \
    69     M(Selection) \
    70     M(ServiceWorker) \
    71     M(SessionState) \
    72     M(StorageAPI) \
    73     M(TextInput) \
    74     M(ViewGestures) \
    75     M(ViewState) \
    76     M(VirtualMemory) \
    77     M(VisibleRects) \
    78     M(WebRTC) \
     42static uint64_t wiFiAssertionCount;
    7943
    80 WEBKIT2_LOG_CHANNELS(DECLARE_LOG_CHANNEL)
     44WiFiAssertionHolder::WiFiAssertionHolder()
     45{
     46    if (wiFiAssertionCount++)
     47        return;
    8148
    82 #undef DECLARE_LOG_CHANNEL
     49    RELEASE_LOG(WiFiAssertions, "Acquiring Wi-Fi assertion.");
     50    WiFiManagerClientSetType(ensureWiFiManagerClient(), kWiFiClientTypeBackground);
     51}
    8352
    84 #ifdef __cplusplus
     53WiFiAssertionHolder::~WiFiAssertionHolder()
     54{
     55    ASSERT(wiFiAssertionCount);
     56    if (--wiFiAssertionCount)
     57        return;
     58
     59    RELEASE_LOG(WiFiAssertions, "Releasing Wi-Fi assertion.");
     60    WiFiManagerClientSetType(ensureWiFiManagerClient(), kWiFiClientTypeNormal);
    8561}
    86 #endif
    8762
    88 #endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
     63} // namespace WebKit
    8964
     65#endif // HAVE(MOBILE_WIFI)
  • tags/Safari-606.1.13/Source/WebKit/NetworkProcess/cocoa/WiFiAssertionHolder.h

    r230546 r230596  
    11/*
    2  * Copyright (C) 2010, 2013 Apple Inc. All rights reserved.
     2 * Copyright (C) 2018 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    2626#pragma once
    2727
    28 #include <pal/LogMacros.h>
    29 #include <wtf/Assertions.h>
    30 #include <wtf/text/WTFString.h>
     28#if HAVE(MOBILE_WIFI)
    3129
    32 #if !LOG_DISABLED || !RELEASE_LOG_DISABLED
     30#include <wtf/Noncopyable.h>
    3331
    34 #ifndef LOG_CHANNEL_PREFIX
    35 #define LOG_CHANNEL_PREFIX WebKit2Log
    36 #endif
     32namespace WebKit {
    3733
    38 #ifdef __cplusplus
    39 extern "C" {
    40 #endif
     34class WiFiAssertionHolder {
     35    WTF_MAKE_NONCOPYABLE(WiFiAssertionHolder);
     36public:
     37    WiFiAssertionHolder();
     38    ~WiFiAssertionHolder();
     39};
    4140
    42 #define WEBKIT2_LOG_CHANNELS(M) \
    43     M(CacheStorage) \
    44     M(ContextMenu) \
    45     M(DragAndDrop) \
    46     M(Fullscreen) \
    47     M(Gamepad) \
    48     M(IconDatabase) \
    49     M(IndexedDB) \
    50     M(IPC) \
    51     M(KeyHandling) \
    52     M(Layers) \
    53     M(Loading) \
    54     M(Network) \
    55     M(NetworkCache) \
    56     M(NetworkCacheSpeculativePreloading) \
    57     M(NetworkCacheStorage) \
    58     M(NetworkScheduling) \
    59     M(NetworkSession) \
    60     M(PerformanceLogging) \
    61     M(Plugins) \
    62     M(Printing) \
    63     M(Process) \
    64     M(ProcessSuspension) \
    65     M(RemoteLayerTree) \
    66     M(Resize) \
    67     M(ResourceLoadStatistics) \
    68     M(ResourceLoadStatisticsDebug) \
    69     M(Selection) \
    70     M(ServiceWorker) \
    71     M(SessionState) \
    72     M(StorageAPI) \
    73     M(TextInput) \
    74     M(ViewGestures) \
    75     M(ViewState) \
    76     M(VirtualMemory) \
    77     M(VisibleRects) \
    78     M(WebRTC) \
     41} // namespace WebKit
    7942
    80 WEBKIT2_LOG_CHANNELS(DECLARE_LOG_CHANNEL)
    81 
    82 #undef DECLARE_LOG_CHANNEL
    83 
    84 #ifdef __cplusplus
    85 }
    86 #endif
    87 
    88 #endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
    89 
     43#endif // HAVE(MOBILE_WIFI)
  • tags/Safari-606.1.13/Source/WebKit/Platform/Logging.h

    r229778 r230596  
    7777    M(VisibleRects) \
    7878    M(WebRTC) \
     79    M(WiFiAssertions) \
    7980
    8081WEBKIT2_LOG_CHANNELS(DECLARE_LOG_CHANNEL)
  • tags/Safari-606.1.13/Source/WebKit/Platform/spi/ios/MobileWiFiSPI.h

    r230546 r230596  
    11/*
    2  * Copyright (C) 2010, 2013 Apple Inc. All rights reserved.
     2 * Copyright (C) 2018 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    2626#pragma once
    2727
    28 #include <pal/LogMacros.h>
    29 #include <wtf/Assertions.h>
    30 #include <wtf/text/WTFString.h>
     28#if USE(APPLE_INTERNAL_SDK)
    3129
    32 #if !LOG_DISABLED || !RELEASE_LOG_DISABLED
     30#include <MobileWiFi/WiFiManagerClient.h>
    3331
    34 #ifndef LOG_CHANNEL_PREFIX
    35 #define LOG_CHANNEL_PREFIX WebKit2Log
     32#else
     33
     34typedef enum {
     35    kWiFiClientTypeNormal,
     36    kWiFiClientTypeBackground,
     37} WiFiClientType;
     38
     39typedef void* WiFiManagerClientRef;
     40
    3641#endif
    3742
    38 #ifdef __cplusplus
    39 extern "C" {
    40 #endif
     43WTF_EXTERN_C_BEGIN
    4144
    42 #define WEBKIT2_LOG_CHANNELS(M) \
    43     M(CacheStorage) \
    44     M(ContextMenu) \
    45     M(DragAndDrop) \
    46     M(Fullscreen) \
    47     M(Gamepad) \
    48     M(IconDatabase) \
    49     M(IndexedDB) \
    50     M(IPC) \
    51     M(KeyHandling) \
    52     M(Layers) \
    53     M(Loading) \
    54     M(Network) \
    55     M(NetworkCache) \
    56     M(NetworkCacheSpeculativePreloading) \
    57     M(NetworkCacheStorage) \
    58     M(NetworkScheduling) \
    59     M(NetworkSession) \
    60     M(PerformanceLogging) \
    61     M(Plugins) \
    62     M(Printing) \
    63     M(Process) \
    64     M(ProcessSuspension) \
    65     M(RemoteLayerTree) \
    66     M(Resize) \
    67     M(ResourceLoadStatistics) \
    68     M(ResourceLoadStatisticsDebug) \
    69     M(Selection) \
    70     M(ServiceWorker) \
    71     M(SessionState) \
    72     M(StorageAPI) \
    73     M(TextInput) \
    74     M(ViewGestures) \
    75     M(ViewState) \
    76     M(VirtualMemory) \
    77     M(VisibleRects) \
    78     M(WebRTC) \
     45WiFiManagerClientRef WiFiManagerClientCreate(CFAllocatorRef, WiFiClientType);
     46void WiFiManagerClientSetType(WiFiManagerClientRef, WiFiClientType);
    7947
    80 WEBKIT2_LOG_CHANNELS(DECLARE_LOG_CHANNEL)
    81 
    82 #undef DECLARE_LOG_CHANNEL
    83 
    84 #ifdef __cplusplus
    85 }
    86 #endif
    87 
    88 #endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
    89 
     48WTF_EXTERN_C_END
  • tags/Safari-606.1.13/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb

    r228341 r230596  
    9090(allow mach-lookup
    9191    (global-name "com.apple.lsd.mapdb")
    92     (global-name "com.apple.analyticsd"))
     92    (global-name "com.apple.analyticsd")
     93    (global-name "com.apple.WirelessCoexManager"))
  • tags/Safari-606.1.13/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r230487 r230596  
    15601560                A118A9F21908B8EA00F7C92B /* _WKNSFileManagerExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = A118A9F01908B8EA00F7C92B /* _WKNSFileManagerExtras.mm */; };
    15611561                A118A9F31908B8EA00F7C92B /* _WKNSFileManagerExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = A118A9F11908B8EA00F7C92B /* _WKNSFileManagerExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1562                A13B3DA2207F39DE0090C58D /* MobileWiFiSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A13B3DA1207F39DE0090C58D /* MobileWiFiSPI.h */; };
    15621563                A13DC682207AA6B20066EF72 /* WKApplicationStateTrackingView.h in Headers */ = {isa = PBXBuildFile; fileRef = A13DC680207AA6B20066EF72 /* WKApplicationStateTrackingView.h */; };
    15631564                A13DC683207AA6B20066EF72 /* WKApplicationStateTrackingView.mm in Sources */ = {isa = PBXBuildFile; fileRef = A13DC681207AA6B20066EF72 /* WKApplicationStateTrackingView.mm */; };
     
    15741575                A1C512C9190656E500448914 /* WebPreviewLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = A1C512C7190656E500448914 /* WebPreviewLoaderClient.h */; };
    15751576                A1D420471DB5578500BB6B0D /* WKContextMenuListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1EA02351DABFF7E0096021F /* WKContextMenuListener.cpp */; };
     1577                A1DAFDDF207E9B16005E8A52 /* WiFiAssertionHolder.h in Headers */ = {isa = PBXBuildFile; fileRef = A1DAFDDD207E9B16005E8A52 /* WiFiAssertionHolder.h */; };
     1578                A1DAFDE0207E9B16005E8A52 /* WiFiAssertionHolder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1DAFDDE207E9B16005E8A52 /* WiFiAssertionHolder.cpp */; };
    15761579                A1DF631218E0B7C8003A3E2A /* DownloadClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1DF631018E0B7C8003A3E2A /* DownloadClient.mm */; };
    15771580                A1DF631318E0B7C8003A3E2A /* DownloadClient.h in Headers */ = {isa = PBXBuildFile; fileRef = A1DF631118E0B7C8003A3E2A /* DownloadClient.h */; };
     
    40504053                A118A9F01908B8EA00F7C92B /* _WKNSFileManagerExtras.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKNSFileManagerExtras.mm; sourceTree = "<group>"; };
    40514054                A118A9F11908B8EA00F7C92B /* _WKNSFileManagerExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKNSFileManagerExtras.h; sourceTree = "<group>"; };
     4055                A13B3DA1207F39DE0090C58D /* MobileWiFiSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MobileWiFiSPI.h; sourceTree = "<group>"; };
    40524056                A13DC680207AA6B20066EF72 /* WKApplicationStateTrackingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WKApplicationStateTrackingView.h; path = ios/WKApplicationStateTrackingView.h; sourceTree = "<group>"; };
    40534057                A13DC681207AA6B20066EF72 /* WKApplicationStateTrackingView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = WKApplicationStateTrackingView.mm; path = ios/WKApplicationStateTrackingView.mm; sourceTree = "<group>"; };
     
    40634067                A1C512C6190656E500448914 /* WebPreviewLoaderClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebPreviewLoaderClient.cpp; path = ios/WebPreviewLoaderClient.cpp; sourceTree = "<group>"; };
    40644068                A1C512C7190656E500448914 /* WebPreviewLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebPreviewLoaderClient.h; path = ios/WebPreviewLoaderClient.h; sourceTree = "<group>"; };
     4069                A1DAFDDD207E9B16005E8A52 /* WiFiAssertionHolder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WiFiAssertionHolder.h; path = NetworkProcess/cocoa/WiFiAssertionHolder.h; sourceTree = "<group>"; };
     4070                A1DAFDDE207E9B16005E8A52 /* WiFiAssertionHolder.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WiFiAssertionHolder.cpp; path = NetworkProcess/cocoa/WiFiAssertionHolder.cpp; sourceTree = "<group>"; };
    40654071                A1DF631018E0B7C8003A3E2A /* DownloadClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DownloadClient.mm; sourceTree = "<group>"; };
    40664072                A1DF631118E0B7C8003A3E2A /* DownloadClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DownloadClient.h; sourceTree = "<group>"; };
     
    69206926                                532159501DBAE6D70054AA3C /* NetworkSessionCocoa.h */,
    69216927                                5C20CB9B1BB0DCD200895BB1 /* NetworkSessionCocoa.mm */,
     6928                                A1DAFDDE207E9B16005E8A52 /* WiFiAssertionHolder.cpp */,
     6929                                A1DAFDDD207E9B16005E8A52 /* WiFiAssertionHolder.h */,
    69226930                        );
    69236931                        name = cocoa;
     
    85638571                                2D4AF0882044C3C4006C8817 /* FrontBoardServicesSPI.h */,
    85648572                                CE1A0BCF1A48E6C60054EF74 /* ManagedConfigurationSPI.h */,
     8573                                A13B3DA1207F39DE0090C58D /* MobileWiFiSPI.h */,
    85658574                                CE1A0BD01A48E6C60054EF74 /* TCCSPI.h */,
    85668575                                CE1A0BD11A48E6C60054EF74 /* TextInputSPI.h */,
     
    89898998                                1A3EED0F161A535400AEB4F5 /* MessageReceiverMap.h in Headers */,
    89908999                                1AAB037A185A7C6A00EDF501 /* MessageSender.h in Headers */,
     9000                                A13B3DA2207F39DE0090C58D /* MobileWiFiSPI.h in Headers */,
    89919001                                C0E3AA7C1209E83C00A49D01 /* Module.h in Headers */,
    89929002                                2D50366B1BCDE17900E20BB3 /* NativeWebGestureEvent.h in Headers */,
     
    94179427                                83EE575C1DB7D61100C74C50 /* WebValidationMessageClient.h in Headers */,
    94189428                                2DFC7DBB1BCCC19500C1548C /* WebViewImpl.h in Headers */,
     9429                                A1DAFDDF207E9B16005E8A52 /* WiFiAssertionHolder.h in Headers */,
    94199430                                29CD55AA128E294F00133C85 /* WKAccessibilityWebPageObjectBase.h in Headers */,
    94209431                                29232DF418B29D6800D0596F /* WKAccessibilityWebPageObjectMac.h in Headers */,
     
    1119711208                                2DFC7DBC1BCCC19500C1548C /* WebViewImpl.mm in Sources */,
    1119811209                                C0337DD1127A2980008FF4F4 /* WebWheelEvent.cpp in Sources */,
     11210                                A1DAFDE0207E9B16005E8A52 /* WiFiAssertionHolder.cpp in Sources */,
    1119911211                                868160D0187645570021E79D /* WindowServerConnection.mm in Sources */,
    1120011212                                29CD55AB128E294F00133C85 /* WKAccessibilityWebPageObjectBase.mm in Sources */,
  • tags/Safari-606.1.13/Source/WebKit/config.h

    r229429 r230596  
    125125#endif
    126126#endif
     127
     128#ifndef HAVE_MOBILE_WIFI
     129#if PLATFORM(IOS) && !TARGET_OS_SIMULATOR && USE(APPLE_INTERNAL_SDK)
     130#define HAVE_MOBILE_WIFI 1
     131#else
     132#define HAVE_MOBILE_WIFI 0
     133#endif
     134#endif
Note: See TracChangeset for help on using the changeset viewer.