Changeset 231863 in webkit


Ignore:
Timestamp:
May 16, 2018 12:39:30 PM (6 years ago)
Author:
aestes@apple.com
Message:

[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.

Location:
trunk/Source/WebKit
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r231853 r231863  
     12018-05-16  Andy Estes  <aestes@apple.com>
     2
     3        [Wi-Fi Assertions] Adopt WiFiAssertionHolderAdditions
     4        https://bugs.webkit.org/show_bug.cgi?id=185685
     5        <rdar://problem/40136681>
     6
     7        Reviewed by Sam Weinig.
     8
     9        * NetworkProcess/cocoa/WiFiAssertionHolder.cpp:
     10        (WebKit::WiFiAssertionHolder::WiFiAssertionHolder):
     11        (WebKit::WiFiAssertionHolder::~WiFiAssertionHolder):
     12        (WebKit::ensureWiFiManagerClient): Deleted.
     13
    1142018-05-16  Fujii Hironori  <Hironori.Fujii@sony.com>
    215

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

    r230560 r231863  
    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.