WebKit Bugzilla
Attachment 340513 Details for
Bug 185685
: [Wi-Fi Assertions] Adopt WiFiAssertionHolderAdditions
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-185685-20180516122101.patch (text/plain), 2.34 KB, created by
Andy Estes
on 2018-05-16 12:21:01 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Andy Estes
Created:
2018-05-16 12:21:01 PDT
Size:
2.34 KB
patch
obsolete
>Subversion Revision: 231770 >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index 2ef3654515e3df3c92b1872a91b4517875795f82..09f9ae1e10421c05ad5c0fa36308d44f2c5f1267 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,16 @@ >+2018-05-16 Andy Estes <aestes@apple.com> >+ >+ [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. >+ > 2018-05-14 Andy Estes <aestes@apple.com> > > [Wi-Fi Assertions] Allow clients to specify a context identifier >diff --git a/Source/WebKit/NetworkProcess/cocoa/WiFiAssertionHolder.cpp b/Source/WebKit/NetworkProcess/cocoa/WiFiAssertionHolder.cpp >index 423be70e608f4cd1127b7284be5de21a541a003f..ef4964c9d57778eea0c92ffb19a91b2b2646f964 100644 >--- a/Source/WebKit/NetworkProcess/cocoa/WiFiAssertionHolder.cpp >+++ b/Source/WebKit/NetworkProcess/cocoa/WiFiAssertionHolder.cpp >@@ -28,36 +28,28 @@ > > #if HAVE(MOBILE_WIFI) > >-#include "Logging.h" >-#include "MobileWiFiSPI.h" >- >-namespace WebKit { >+#if USE(APPLE_INTERNAL_SDK) >+#include <WebKitAdditions/WiFiAssertionHolderAdditions.cpp> >+#else >+static void holdWiFiAssertion() >+{ >+} > >-static WiFiManagerClientRef ensureWiFiManagerClient() >+static void releaseWiFiAssertion() > { >- static WiFiManagerClientRef wiFiManagerClient = WiFiManagerClientCreate(kCFAllocatorDefault, kWiFiClientTypeNormal); >- return wiFiManagerClient; > } >+#endif > >-static uint64_t wiFiAssertionCount; >+namespace WebKit { > > WiFiAssertionHolder::WiFiAssertionHolder() > { >- if (wiFiAssertionCount++) >- return; >- >- RELEASE_LOG(WiFiAssertions, "Acquiring Wi-Fi assertion."); >- WiFiManagerClientSetType(ensureWiFiManagerClient(), kWiFiClientTypeBackground); >+ holdWiFiAssertion(); > } > > WiFiAssertionHolder::~WiFiAssertionHolder() > { >- ASSERT(wiFiAssertionCount); >- if (--wiFiAssertionCount) >- return; >- >- RELEASE_LOG(WiFiAssertions, "Releasing Wi-Fi assertion."); >- WiFiManagerClientSetType(ensureWiFiManagerClient(), kWiFiClientTypeNormal); >+ releaseWiFiAssertion(); > } > > } // namespace WebKit
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 185685
:
340497
| 340513