Changeset 231942 in webkit


Ignore:
Timestamp:
May 17, 2018 10:38:54 PM (6 years ago)
Author:
bshafiei@apple.com
Message:

Cherry-pick r231863. rdar://problem/40136681

[Wi-Fi Assertions] Adopt WiFiAssertionHolderAdditions
​https://bugs.webkit.org/show_bug.cgi?id=185685
<rdar://problem/40136681>

Reviewed by Sam Weinig.

  • NetworkProcess/cocoa/WiFiAssertionHolder.cpp: (WebKit::WiFiAssertionHolder::WiFiAssertionHolder): (WebKit::WiFiAssertionHolder::~WiFiAssertionHolder): (WebKit::ensureWiFiManagerClient): Deleted.

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

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

Legend:

Unmodified
Added
Removed

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

    r231906 r231942  
     12018-05-17  Babak Shafiei  <bshafiei@apple.com>
     2
     3        Cherry-pick r231863. rdar://problem/40136681
     4
     5    [Wi-Fi Assertions] Adopt WiFiAssertionHolderAdditions
     6    https://bugs.webkit.org/show_bug.cgi?id=185685
     7    <rdar://problem/40136681>
     8   
     9    Reviewed by Sam Weinig.
     10   
     11    * NetworkProcess/cocoa/WiFiAssertionHolder.cpp:
     12    (WebKit::WiFiAssertionHolder::WiFiAssertionHolder):
     13    (WebKit::WiFiAssertionHolder::~WiFiAssertionHolder):
     14    (WebKit::ensureWiFiManagerClient): Deleted.
     15   
     16   
     17    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231863 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     18
     19    2018-05-16  Andy Estes  <aestes@apple.com>
     20
     21            [Wi-Fi Assertions] Adopt WiFiAssertionHolderAdditions
     22            https://bugs.webkit.org/show_bug.cgi?id=185685
     23            <rdar://problem/40136681>
     24
     25            Reviewed by Sam Weinig.
     26
     27            * NetworkProcess/cocoa/WiFiAssertionHolder.cpp:
     28            (WebKit::WiFiAssertionHolder::WiFiAssertionHolder):
     29            (WebKit::WiFiAssertionHolder::~WiFiAssertionHolder):
     30            (WebKit::ensureWiFiManagerClient): Deleted.
     31
    1322018-05-17  Kocsen Chung  <kocsen_chung@apple.com>
    233

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

    r230560 r231942  
    2929#if HAVE(MOBILE_WIFI)
    3030
    31 #include "Logging.h"
    32 #include "MobileWiFiSPI.h"
     31#if USE(APPLE_INTERNAL_SDK)
     32#include <WebKitAdditions/WiFiAssertionHolderAdditions.cpp>
     33#else
     34static void holdWiFiAssertion()
     35{
     36}
     37
     38static void releaseWiFiAssertion()
     39{
     40}
     41#endif
    3342
    3443namespace WebKit {
    3544
    36 static WiFiManagerClientRef ensureWiFiManagerClient()
    37 {
    38     static WiFiManagerClientRef wiFiManagerClient = WiFiManagerClientCreate(kCFAllocatorDefault, kWiFiClientTypeNormal);
    39     return wiFiManagerClient;
    40 }
    41 
    42 static uint64_t wiFiAssertionCount;
    43 
    4445WiFiAssertionHolder::WiFiAssertionHolder()
    4546{
    46     if (wiFiAssertionCount++)
    47         return;
    48 
    49     RELEASE_LOG(WiFiAssertions, "Acquiring Wi-Fi assertion.");
    50     WiFiManagerClientSetType(ensureWiFiManagerClient(), kWiFiClientTypeBackground);
     47    holdWiFiAssertion();
    5148}
    5249
    5350WiFiAssertionHolder::~WiFiAssertionHolder()
    5451{
    55     ASSERT(wiFiAssertionCount);
    56     if (--wiFiAssertionCount)
    57         return;
    58 
    59     RELEASE_LOG(WiFiAssertions, "Releasing Wi-Fi assertion.");
    60     WiFiManagerClientSetType(ensureWiFiManagerClient(), kWiFiClientTypeNormal);
     52    releaseWiFiAssertion();
    6153}
    6254
Note: See TracChangeset for help on using the changeset viewer.