Title: [231942] branches/safari-606.1.17-branch/Source/WebKit
- Revision
- 231942
- Author
- bshaf...@apple.com
- Date
- 2018-05-17 22:38:54 -0700 (Thu, 17 May 2018)
Log 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
Modified Paths
Diff
Modified: branches/safari-606.1.17-branch/Source/WebKit/ChangeLog (231941 => 231942)
--- branches/safari-606.1.17-branch/Source/WebKit/ChangeLog 2018-05-18 03:39:07 UTC (rev 231941)
+++ branches/safari-606.1.17-branch/Source/WebKit/ChangeLog 2018-05-18 05:38:54 UTC (rev 231942)
@@ -1,3 +1,34 @@
+2018-05-17 Babak Shafiei <bshaf...@apple.com>
+
+ 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
+
+ 2018-05-16 Andy Estes <aes...@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-17 Kocsen Chung <kocsen_ch...@apple.com>
Cherry-pick r231770. rdar://problem/39915196
Modified: branches/safari-606.1.17-branch/Source/WebKit/NetworkProcess/cocoa/WiFiAssertionHolder.cpp (231941 => 231942)
--- branches/safari-606.1.17-branch/Source/WebKit/NetworkProcess/cocoa/WiFiAssertionHolder.cpp 2018-05-18 03:39:07 UTC (rev 231941)
+++ branches/safari-606.1.17-branch/Source/WebKit/NetworkProcess/cocoa/WiFiAssertionHolder.cpp 2018-05-18 05:38:54 UTC (rev 231942)
@@ -28,36 +28,28 @@
#if HAVE(MOBILE_WIFI)
-#include "Logging.h"
-#include "MobileWiFiSPI.h"
+#if USE(APPLE_INTERNAL_SDK)
+#include <WebKitAdditions/WiFiAssertionHolderAdditions.cpp>
+#else
+static void holdWiFiAssertion()
+{
+}
-namespace WebKit {
-
-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
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
