185685 2018-05-16 10:03:49 -0700 [Wi-Fi Assertions] Adopt WiFiAssertionHolderAdditions 2018-05-16 12:39:37 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aestes aestes bdakin beidson commit-queue sam thorton timothy webkit-bug-importer wenson_hsieh oldest_to_newest 1424363 0 aestes 2018-05-16 10:03:49 -0700 [Wi-Fi Assertions] Adopt WiFiAssertionHolderAdditions 1424364 1 340497 aestes 2018-05-16 10:04:19 -0700 Created attachment 340497 Patch 1424365 2 aestes 2018-05-16 10:04:32 -0700 rdar://problem/40136681 1424368 3 340497 sam 2018-05-16 10:18:20 -0700 Comment on attachment 340497 Patch I might use less generic names than holdAssertion()/releaseAssertion(), but otherwise, looks good. 1424380 4 340497 timothy 2018-05-16 10:33:29 -0700 Comment on attachment 340497 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=340497&action=review > Source/WebKit/NetworkProcess/cocoa/WiFiAssertionHolder.cpp:39 > + holdAssertion(); You will either need to add #if USE(APPLE_INTERNAL_SDK) around the call here or define empty stub functions above. > Source/WebKit/NetworkProcess/cocoa/WiFiAssertionHolder.cpp:44 > + releaseAssertion(); Ditto. 1424427 5 aestes 2018-05-16 12:07:12 -0700 (In reply to Timothy Hatcher from comment #4) > Comment on attachment 340497 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=340497&action=review > > > Source/WebKit/NetworkProcess/cocoa/WiFiAssertionHolder.cpp:39 > > + holdAssertion(); > > You will either need to add #if USE(APPLE_INTERNAL_SDK) around the call here > or define empty stub functions above. > > > Source/WebKit/NetworkProcess/cocoa/WiFiAssertionHolder.cpp:44 > > + releaseAssertion(); > > Ditto. Technically I don't need to due to how HAVE_MOBILE_WIFI is defined, but I agree this is the right way to do it, so I'll do it! 1424435 6 340513 aestes 2018-05-16 12:21:01 -0700 Created attachment 340513 Patch 1424443 7 340513 commit-queue 2018-05-16 12:39:36 -0700 Comment on attachment 340513 Patch Clearing flags on attachment: 340513 Committed r231863: <https://trac.webkit.org/changeset/231863> 1424444 8 commit-queue 2018-05-16 12:39:37 -0700 All reviewed patches have been landed. Closing bug. 340497 2018-05-16 10:04:19 -0700 2018-05-16 12:21:00 -0700 Patch bug-185685-20180516100418.patch text/plain 2295 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxNzcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJlZjM2NTQ1MTVlM2RmM2M5 MmIxODcyYTkxYjQ1MTc4NzU3OTVmODIuLjljNjFiMmQ3Yjk4NTZkMDAyZjRiOWFiNDJkYTQ0ODE1 NDMyZjA0ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTgtMDUtMTYgIEFuZHkgRXN0 ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFtXaS1GaSBBc3NlcnRpb25zXSBBZG9w dCBXaUZpQXNzZXJ0aW9uSG9sZGVyQWRkaXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODU2ODUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQw MTM2NjgxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogTmV0d29ya1Byb2Nlc3MvY29jb2EvV2lGaUFzc2VydGlvbkhvbGRlci5jcHA6CisgICAgICAg IChXZWJLaXQ6OldpRmlBc3NlcnRpb25Ib2xkZXI6OldpRmlBc3NlcnRpb25Ib2xkZXIpOgorICAg ICAgICAoV2ViS2l0OjpXaUZpQXNzZXJ0aW9uSG9sZGVyOjp+V2lGaUFzc2VydGlvbkhvbGRlcik6 CisgICAgICAgIChXZWJLaXQ6OmVuc3VyZVdpRmlNYW5hZ2VyQ2xpZW50KTogRGVsZXRlZC4KKwog MjAxOC0wNS0xNCAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAgICAgICAgW1dp LUZpIEFzc2VydGlvbnNdIEFsbG93IGNsaWVudHMgdG8gc3BlY2lmeSBhIGNvbnRleHQgaWRlbnRp ZmllcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9XaUZp QXNzZXJ0aW9uSG9sZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2Ev V2lGaUFzc2VydGlvbkhvbGRlci5jcHAKaW5kZXggNDIzYmU3MGU2MDhmNGNkMTEyN2I3Mjg0YmU1 ZGUyMWE1NDFhMDAzZi4uOWRlZjAxOGJhN2ExMGI4MjkwZGZjNDkxZTk4NmFjMWQ5ZDliNGE2NSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9XaUZpQXNzZXJ0 aW9uSG9sZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL1dp RmlBc3NlcnRpb25Ib2xkZXIuY3BwCkBAIC0yOCwzNiArMjgsMjAgQEAKIAogI2lmIEhBVkUoTU9C SUxFX1dJRkkpCiAKLSNpbmNsdWRlICJMb2dnaW5nLmgiCi0jaW5jbHVkZSAiTW9iaWxlV2lGaVNQ SS5oIgorI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCisjaW5jbHVkZSA8V2ViS2l0QWRkaXRp b25zL1dpRmlBc3NlcnRpb25Ib2xkZXJBZGRpdGlvbnMuY3BwPgorI2VuZGlmCiAKIG5hbWVzcGFj ZSBXZWJLaXQgewogCi1zdGF0aWMgV2lGaU1hbmFnZXJDbGllbnRSZWYgZW5zdXJlV2lGaU1hbmFn ZXJDbGllbnQoKQotewotICAgIHN0YXRpYyBXaUZpTWFuYWdlckNsaWVudFJlZiB3aUZpTWFuYWdl ckNsaWVudCA9IFdpRmlNYW5hZ2VyQ2xpZW50Q3JlYXRlKGtDRkFsbG9jYXRvckRlZmF1bHQsIGtX aUZpQ2xpZW50VHlwZU5vcm1hbCk7Ci0gICAgcmV0dXJuIHdpRmlNYW5hZ2VyQ2xpZW50OwotfQot Ci1zdGF0aWMgdWludDY0X3Qgd2lGaUFzc2VydGlvbkNvdW50OwotCiBXaUZpQXNzZXJ0aW9uSG9s ZGVyOjpXaUZpQXNzZXJ0aW9uSG9sZGVyKCkKIHsKLSAgICBpZiAod2lGaUFzc2VydGlvbkNvdW50 KyspCi0gICAgICAgIHJldHVybjsKLQotICAgIFJFTEVBU0VfTE9HKFdpRmlBc3NlcnRpb25zLCAi QWNxdWlyaW5nIFdpLUZpIGFzc2VydGlvbi4iKTsKLSAgICBXaUZpTWFuYWdlckNsaWVudFNldFR5 cGUoZW5zdXJlV2lGaU1hbmFnZXJDbGllbnQoKSwga1dpRmlDbGllbnRUeXBlQmFja2dyb3VuZCk7 CisgICAgaG9sZEFzc2VydGlvbigpOwogfQogCiBXaUZpQXNzZXJ0aW9uSG9sZGVyOjp+V2lGaUFz c2VydGlvbkhvbGRlcigpCiB7Ci0gICAgQVNTRVJUKHdpRmlBc3NlcnRpb25Db3VudCk7Ci0gICAg aWYgKC0td2lGaUFzc2VydGlvbkNvdW50KQotICAgICAgICByZXR1cm47Ci0KLSAgICBSRUxFQVNF X0xPRyhXaUZpQXNzZXJ0aW9ucywgIlJlbGVhc2luZyBXaS1GaSBhc3NlcnRpb24uIik7Ci0gICAg V2lGaU1hbmFnZXJDbGllbnRTZXRUeXBlKGVuc3VyZVdpRmlNYW5hZ2VyQ2xpZW50KCksIGtXaUZp Q2xpZW50VHlwZU5vcm1hbCk7CisgICAgcmVsZWFzZUFzc2VydGlvbigpOwogfQogCiB9IC8vIG5h bWVzcGFjZSBXZWJLaXQK 340513 2018-05-16 12:21:01 -0700 2018-05-16 12:39:36 -0700 Patch bug-185685-20180516122101.patch text/plain 2401 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxNzcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJlZjM2NTQ1MTVlM2RmM2M5 MmIxODcyYTkxYjQ1MTc4NzU3OTVmODIuLjA5ZjlhZTFlMTA0MjFjMDVhZDVjMGZhMzYzMDhkNDRm MmM1ZjEyNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTgtMDUtMTYgIEFuZHkgRXN0 ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFtXaS1GaSBBc3NlcnRpb25zXSBBZG9w dCBXaUZpQXNzZXJ0aW9uSG9sZGVyQWRkaXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODU2ODUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQw MTM2NjgxPgorCisgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCisKKyAgICAgICAgKiBO ZXR3b3JrUHJvY2Vzcy9jb2NvYS9XaUZpQXNzZXJ0aW9uSG9sZGVyLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2lGaUFzc2VydGlvbkhvbGRlcjo6V2lGaUFzc2VydGlvbkhvbGRlcik6CisgICAgICAg IChXZWJLaXQ6OldpRmlBc3NlcnRpb25Ib2xkZXI6On5XaUZpQXNzZXJ0aW9uSG9sZGVyKToKKyAg ICAgICAgKFdlYktpdDo6ZW5zdXJlV2lGaU1hbmFnZXJDbGllbnQpOiBEZWxldGVkLgorCiAyMDE4 LTA1LTE0ICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ktRmkg QXNzZXJ0aW9uc10gQWxsb3cgY2xpZW50cyB0byBzcGVjaWZ5IGEgY29udGV4dCBpZGVudGlmaWVy CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL1dpRmlBc3Nl cnRpb25Ib2xkZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9XaUZp QXNzZXJ0aW9uSG9sZGVyLmNwcAppbmRleCA0MjNiZTcwZTYwOGY0Y2QxMTI3YjcyODRiZTVkZTIx YTU0MWEwMDNmLi5lZjQ5NjRjOWQ1Nzc3OGVlYTBjOTJmZmIxOWE5MWIyYjI2NDZmOTY0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL1dpRmlBc3NlcnRpb25I b2xkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvV2lGaUFz c2VydGlvbkhvbGRlci5jcHAKQEAgLTI4LDM2ICsyOCwyOCBAQAogCiAjaWYgSEFWRShNT0JJTEVf V0lGSSkKIAotI2luY2x1ZGUgIkxvZ2dpbmcuaCIKLSNpbmNsdWRlICJNb2JpbGVXaUZpU1BJLmgi Ci0KLW5hbWVzcGFjZSBXZWJLaXQgeworI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCisjaW5j bHVkZSA8V2ViS2l0QWRkaXRpb25zL1dpRmlBc3NlcnRpb25Ib2xkZXJBZGRpdGlvbnMuY3BwPgor I2Vsc2UKK3N0YXRpYyB2b2lkIGhvbGRXaUZpQXNzZXJ0aW9uKCkKK3sKK30KIAotc3RhdGljIFdp RmlNYW5hZ2VyQ2xpZW50UmVmIGVuc3VyZVdpRmlNYW5hZ2VyQ2xpZW50KCkKK3N0YXRpYyB2b2lk IHJlbGVhc2VXaUZpQXNzZXJ0aW9uKCkKIHsKLSAgICBzdGF0aWMgV2lGaU1hbmFnZXJDbGllbnRS ZWYgd2lGaU1hbmFnZXJDbGllbnQgPSBXaUZpTWFuYWdlckNsaWVudENyZWF0ZShrQ0ZBbGxvY2F0 b3JEZWZhdWx0LCBrV2lGaUNsaWVudFR5cGVOb3JtYWwpOwotICAgIHJldHVybiB3aUZpTWFuYWdl ckNsaWVudDsKIH0KKyNlbmRpZgogCi1zdGF0aWMgdWludDY0X3Qgd2lGaUFzc2VydGlvbkNvdW50 OworbmFtZXNwYWNlIFdlYktpdCB7CiAKIFdpRmlBc3NlcnRpb25Ib2xkZXI6OldpRmlBc3NlcnRp b25Ib2xkZXIoKQogewotICAgIGlmICh3aUZpQXNzZXJ0aW9uQ291bnQrKykKLSAgICAgICAgcmV0 dXJuOwotCi0gICAgUkVMRUFTRV9MT0coV2lGaUFzc2VydGlvbnMsICJBY3F1aXJpbmcgV2ktRmkg YXNzZXJ0aW9uLiIpOwotICAgIFdpRmlNYW5hZ2VyQ2xpZW50U2V0VHlwZShlbnN1cmVXaUZpTWFu YWdlckNsaWVudCgpLCBrV2lGaUNsaWVudFR5cGVCYWNrZ3JvdW5kKTsKKyAgICBob2xkV2lGaUFz c2VydGlvbigpOwogfQogCiBXaUZpQXNzZXJ0aW9uSG9sZGVyOjp+V2lGaUFzc2VydGlvbkhvbGRl cigpCiB7Ci0gICAgQVNTRVJUKHdpRmlBc3NlcnRpb25Db3VudCk7Ci0gICAgaWYgKC0td2lGaUFz c2VydGlvbkNvdW50KQotICAgICAgICByZXR1cm47Ci0KLSAgICBSRUxFQVNFX0xPRyhXaUZpQXNz ZXJ0aW9ucywgIlJlbGVhc2luZyBXaS1GaSBhc3NlcnRpb24uIik7Ci0gICAgV2lGaU1hbmFnZXJD bGllbnRTZXRUeXBlKGVuc3VyZVdpRmlNYW5hZ2VyQ2xpZW50KCksIGtXaUZpQ2xpZW50VHlwZU5v cm1hbCk7CisgICAgcmVsZWFzZVdpRmlBc3NlcnRpb24oKTsKIH0KIAogfSAvLyBuYW1lc3BhY2Ug V2ViS2l0Cg==