209686 2020-03-27 15:34:04 -0700 [iOS] Delay process suspension for a while after loading an app link 2020-03-29 02:09:44 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez aestes darin david_quesada ddkilzer ggaren jond oldest_to_newest 1635031 0 cdumez 2020-03-27 15:34:04 -0700 Delay process suspension for a while after loading an app link. This will allow the page's script to pass information more reliably to the native app handling the navigation. 1635033 1 cdumez 2020-03-27 15:34:36 -0700 <rdar://problem/60888891> 1635036 2 394765 cdumez 2020-03-27 15:38:24 -0700 Created attachment 394765 Patch 1635041 3 394765 darin 2020-03-27 15:49:42 -0700 Comment on attachment 394765 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394765&action=review > Source/WebKit/ChangeLog:13 > + This patch adds a [WKWebView _willOpenAppLink] SPI that the client needs to call before opening the > + app link. Why SPI instead of API? > Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm:1550 > + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(25 * NSEC_PER_SEC)), dispatch_get_main_queue(), [weakThis = makeWeakPtr(*this)] { Seems like typecasting 25 seconds to int64_t *after* doing the multiplication is too late to avoid overflow. I understand know why a typecast is needed at all, but if one is needed, I’d think we’d need to cast before doing the math. The comment should explain where the 25 second duration comes from, its rationale, so someone doesn’t just change it randomly later without understanding how we chose 25 seconds. 1635042 4 cdumez 2020-03-27 15:52:39 -0700 (In reply to Darin Adler from comment #3) > Comment on attachment 394765 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=394765&action=review > > > Source/WebKit/ChangeLog:13 > > + This patch adds a [WKWebView _willOpenAppLink] SPI that the client needs to call before opening the > > + app link. > > Why SPI instead of API? For now, I am merely trying to address the issue in MobileSafari and SVC so an SPI is sufficient. I am not aware of this being requested by app developers. If it ever does, we can think about it harder and provide some kind of SPI. > > > Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm:1550 > > + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(25 * NSEC_PER_SEC)), dispatch_get_main_queue(), [weakThis = makeWeakPtr(*this)] { > > Seems like typecasting 25 seconds to int64_t *after* doing the > multiplication is too late to avoid overflow. I understand know why a > typecast is needed at all, but if one is needed, I’d think we’d need to cast > before doing the math. > > The comment should explain where the 25 second duration comes from, its > rationale, so someone doesn’t just change it randomly later without > understanding how we chose 25 seconds. I will check. I copy / pasted from existing code :) 1635045 5 394768 cdumez 2020-03-27 16:10:50 -0700 Created attachment 394768 Patch 1635050 6 ews-feeder 2020-03-27 16:44:52 -0700 Committed r259146: <https://trac.webkit.org/changeset/259146> All reviewed patches have been landed. Closing bug and clearing flags on attachment 394768. 1635059 7 394765 darin 2020-03-27 16:58:01 -0700 Comment on attachment 394765 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394765&action=review >>> Source/WebKit/ChangeLog:13 >>> + app link. >> >> Why SPI instead of API? > > For now, I am merely trying to address the issue in MobileSafari and SVC so an SPI is sufficient. I am not aware of this being requested by app developers. If it ever does, we can think about it harder and provide some kind of SPI. Not needed by other iOS browsers? 1635083 8 cdumez 2020-03-27 18:43:01 -0700 (In reply to Darin Adler from comment #7) > Comment on attachment 394765 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=394765&action=review > > >>> Source/WebKit/ChangeLog:13 > >>> + app link. > >> > >> Why SPI instead of API? > > > > For now, I am merely trying to address the issue in MobileSafari and SVC so an SPI is sufficient. I am not aware of this being requested by app developers. If it ever does, we can think about it harder and provide some kind of SPI. > > Not needed by other iOS browsers? Looks like in other apps than Safari, WebKit takes care of opening AppLinks in tryInterceptNavigation(), in NavigationState.mm. I will update that method in a follow-up. 1635095 9 cdumez 2020-03-27 19:31:50 -0700 Reopening for follow-up. 1635096 10 394783 cdumez 2020-03-27 19:34:44 -0700 Created attachment 394783 Follow-up 1635271 11 ews-feeder 2020-03-28 19:05:46 -0700 Committed r259166: <https://trac.webkit.org/changeset/259166> All reviewed patches have been landed. Closing bug and clearing flags on attachment 394783. 1635311 12 394783 darin 2020-03-28 22:55:33 -0700 Comment on attachment 394783 Follow-up View in context: https://bugs.webkit.org/attachment.cgi?id=394783&action=review > Source/WebKit/UIProcess/Cocoa/NavigationState.mm:511 > + if (success && weakPage) > + weakPage->willOpenAppLink(); This breaking the build on newer versions of Mac. Needs to be inside #if PLATFORM(IOS_FAMILY) because the code in WebPageProxy.h is inside that. 1635323 13 394783 ddkilzer 2020-03-29 02:09:44 -0700 Comment on attachment 394783 Follow-up View in context: https://bugs.webkit.org/attachment.cgi?id=394783&action=review >> Source/WebKit/UIProcess/Cocoa/NavigationState.mm:511 >> + weakPage->willOpenAppLink(); > > This breaking the build on newer versions of Mac. Needs to be inside #if PLATFORM(IOS_FAMILY) because the code in WebPageProxy.h is inside that. Fixed in commit r259177: <https://trac.webkit.org/changeset/259177/webkit> Fixed my missing ChangeLog entry in r259178: <https://trac.webkit.org/changeset/259178/webkit> 394765 2020-03-27 15:38:24 -0700 2020-03-27 16:10:49 -0700 Patch bug-209686-20200327153824.patch text/plain 5695 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDVlYzJhZTNmM2UyZGExYjM1 ZjY4NzliMTFlNzFiYzMyY2M1YTU1M2EuLjYwNGNmZmMyZTI0NGIxMTg0NDkyN2YyZmQzZGE1OGEz YzdjNGU4NGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjAtMDMtMjcgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBEZWxheSBwcm9jZXNzIHN1 c3BlbnNpb24gZm9yIGEgd2hpbGUgYWZ0ZXIgbG9hZGluZyBhbiBhcHAgbGluaworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5Njg2CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS82MDg4ODg5MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBEZWxheSBwcm9jZXNzIHN1c3BlbnNpb24gZm9yIGEgd2hpbGUgYWZ0 ZXIgbG9hZGluZyBhbiBhcHAgbGluay4gVGhpcyB3aWxsIGFsbG93IHRoZSBwYWdlJ3Mgc2NyaXB0 IHRvIHBhc3MKKyAgICAgICAgaW5mb3JtYXRpb24gbW9yZSByZWxpYWJseSB0byB0aGUgbmF0aXZl IGFwcCBoYW5kbGluZyB0aGUgbmF2aWdhdGlvbi4KKworICAgICAgICBUaGlzIHBhdGNoIGFkZHMg YSBbV0tXZWJWaWV3IF93aWxsT3BlbkFwcExpbmtdIFNQSSB0aGF0IHRoZSBjbGllbnQgbmVlZHMg dG8gY2FsbCBiZWZvcmUgb3BlbmluZyB0aGUKKyAgICAgICAgYXBwIGxpbmsuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaDoKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW06CisgICAgICAgICgtW1dLV2ViVmlldyBfd2ls bE9wZW5BcHBMaW5rXSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y2xvc2UpOgorICAgICAgICAqIFVJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlP Uy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp3aWxsT3BlbkFwcExpbmspOgor CiAyMDIwLTAzLTI3ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAg ICAgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OnJlZ2lzdGVyQmxvYlVSTE9wdGlvbmFs bHlGaWxlQmFja2VkIHNob3VsZCB2YWxpZGF0ZSBpdHMgcGFyYW1ldGVycwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmgKaW5kZXgg YjNjMGQxMjkxOTU4NTg0ODM4ZDQxY2E2ZTMyOWVhMDJhNDI3MGNmZS4uZjJhYzYwMTg2MTUwZGU2 MmZmYmU0OTcxYmY1YmYyYzIzZTU4NTE2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCkBAIC00NDgsNiArNDQ4LDggQEAg Zm9yIHRoaXMgcHJvcGVydHkuCiAtICh2b2lkKV9ncmFudEFjY2Vzc1RvQXNzZXRTZXJ2aWNlcyBX S19BUElfQVZBSUxBQkxFKGlvcyhXS19JT1NfVEJBKSk7CiAtICh2b2lkKV9yZXZva2VBY2Nlc3NU b0Fzc2V0U2VydmljZXMgV0tfQVBJX0FWQUlMQUJMRShpb3MoV0tfSU9TX1RCQSkpOwogCistICh2 b2lkKV93aWxsT3BlbkFwcExpbmsgV0tfQVBJX0FWQUlMQUJMRShpb3MoV0tfSU9TX1RCQSkpOwor CiBAZW5kCiAKIEBpbnRlcmZhY2UgV0tXZWJWaWV3ICgpIDxVSVJlc3BvbmRlclN0YW5kYXJkRWRp dEFjdGlvbnM+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dL V2ViVmlld0lPUy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3 SU9TLm1tCmluZGV4IDBlZDM4OGUwYjk0Yjg1NzAyYjA0NGY5ZjhmYTc0OTFhZTU4Mjg1NDEuLmQ5 ZjRhYzNiNmI1ZWY5NjU0YWU0NzRhZDY4MWQwZmYzNjgyMmFkNTcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tCkBAIC0zMTAwLDYgKzMxMDAs MTIgQEAgLSAodm9pZClfcmV2b2tlQWNjZXNzVG9Bc3NldFNlcnZpY2VzCiAjZW5kaWYKIH0KIAor LSAodm9pZClfd2lsbE9wZW5BcHBMaW5rCit7CisgICAgaWYgKF9wYWdlKQorICAgICAgICBfcGFn ZS0+d2lsbE9wZW5BcHBMaW5rKCk7Cit9CisKIEBlbmQgLy8gV0tXZWJWaWV3IChXS1ByaXZhdGVJ T1MpCiAKICNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcAppbmRleCAwMzhmY2YwOTgyNDQ4OGYzNTU5ZTRhOGU2YTczMTE2ZmRm OTQyZmEzLi41NWQ5ZDVkMzM1ZTUzMTM1MmUwMzczYzA5YTMzY2RlYTZiNDE5YTU3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTExMzgsNiArMTEzOCw3IEBA IHZvaWQgV2ViUGFnZVByb3h5OjpjbG9zZSgpCiAgICAgbV9pc1Zpc2libGVBY3Rpdml0eSA9IG51 bGxwdHI7CiAgICAgbV9pc0F1ZGlibGVBY3Rpdml0eSA9IG51bGxwdHI7CiAgICAgbV9pc0NhcHR1 cmluZ0FjdGl2aXR5ID0gbnVsbHB0cjsKKyAgICBtX29wZW5pbmdBcHBMaW5rQWN0aXZpdHkgPSBu dWxscHRyOwogICAgIG1fYWx3YXlzUnVuc0F0Rm9yZWdyb3VuZFByaW9yaXR5QWN0aXZpdHkgPSBu dWxscHRyOwogICAgIG1fYXVkaWJsZUFjdGl2aXR5VGltZXIuc3RvcCgpOwogI2VuZGlmCkBAIC03 NTcxLDYgKzc1NzIsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVzZXRTdGF0ZUFmdGVyUHJvY2Vz c0V4aXRlZChQcm9jZXNzVGVybWluYXRpb25SZWFzb24gdGVybWluYQogICAgIG1faXNWaXNpYmxl QWN0aXZpdHkgPSBudWxscHRyOwogICAgIG1faXNBdWRpYmxlQWN0aXZpdHkgPSBudWxscHRyOwog ICAgIG1faXNDYXB0dXJpbmdBY3Rpdml0eSA9IG51bGxwdHI7CisgICAgbV9vcGVuaW5nQXBwTGlu a0FjdGl2aXR5ID0gbnVsbHB0cjsKICAgICBtX2Fsd2F5c1J1bnNBdEZvcmVncm91bmRQcmlvcml0 eUFjdGl2aXR5ID0gbnVsbHB0cjsKICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5oCmluZGV4IDBhMTg3MzU5MzZhMDJjMjU0NjcyYzIyNjBjZDUyOGI3ZTVmYjJiNTcu LmM4Njc2YTk1M2Q3YzdiN2EwNWQwMWJiNjhkYjUyNWVkMTczMmJiNjEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC01MjMsNiArNTIzLDggQEAgcHVibGljOgogI2lm IFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgYm9vbCBhbGxvd3NNZWRpYURvY3VtZW50SW5saW5l UGxheWJhY2soKSBjb25zdDsKICAgICB2b2lkIHNldEFsbG93c01lZGlhRG9jdW1lbnRJbmxpbmVQ bGF5YmFjayhib29sKTsKKworICAgIHZvaWQgd2lsbE9wZW5BcHBMaW5rKCk7CiAjZW5kaWYKIAog I2lmIFVTRShTWVNURU1fUFJFVklFVykKQEAgLTI0MDAsNiArMjQwMiw3IEBAIHByaXZhdGU6CiAg ICAgc3RkOjp1bmlxdWVfcHRyPFByb2Nlc3NUaHJvdHRsZXI6OkZvcmVncm91bmRBY3Rpdml0eT4g bV9pc0NhcHR1cmluZ0FjdGl2aXR5OwogICAgIHN0ZDo6dW5pcXVlX3B0cjxQcm9jZXNzVGhyb3R0 bGVyOjpGb3JlZ3JvdW5kQWN0aXZpdHk+IG1fYWx3YXlzUnVuc0F0Rm9yZWdyb3VuZFByaW9yaXR5 QWN0aXZpdHk7CiAgICAgUnVuTG9vcDo6VGltZXI8V2ViUGFnZVByb3h5PiBtX2F1ZGlibGVBY3Rp dml0eVRpbWVyOworICAgIHN0ZDo6dW5pcXVlX3B0cjxQcm9jZXNzVGhyb3R0bGVyOjpCYWNrZ3Jv dW5kQWN0aXZpdHk+IG1fb3BlbmluZ0FwcExpbmtBY3Rpdml0eTsKICNlbmRpZgogICAgIGJvb2wg bV9pbml0aWFsQ2FwaXRhbGl6YXRpb25FbmFibGVkIHsgZmFsc2UgfTsKICAgICBPcHRpb25hbDxk b3VibGU+IG1fY3B1TGltaXQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV2ViUGFnZVByb3h5SU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dlYlBh Z2VQcm94eUlPUy5tbQppbmRleCBjNzI2N2E1ODdjOTcxY2YzZDMwZjIzZmU0NGE3MzNmZTBjYWEz MDM1Li4yNzdlYTZmNzU4ZGY4MmM5ZDUxMTQ0NmVjYTkyY2VmYmE5MDAyODAwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW0KQEAgLTE1MzksNiAr MTUzOSwxOSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0U2hvdWxkUmV2ZWFsQ3VycmVudFNlbGVj dGlvbkFmdGVySW5zZXJ0aW9uKGJvb2wgc2hvdWxkUmV2ZQogICAgICAgICBzZW5kKE1lc3NhZ2Vz OjpXZWJQYWdlOjpTZXRTaG91bGRSZXZlYWxDdXJyZW50U2VsZWN0aW9uQWZ0ZXJJbnNlcnRpb24o c2hvdWxkUmV2ZWFsQ3VycmVudFNlbGVjdGlvbkFmdGVySW5zZXJ0aW9uKSk7CiB9CiAKK3ZvaWQg V2ViUGFnZVByb3h5Ojp3aWxsT3BlbkFwcExpbmsoKQoreworICAgIGlmIChtX29wZW5pbmdBcHBM aW5rQWN0aXZpdHkgJiYgbV9vcGVuaW5nQXBwTGlua0FjdGl2aXR5LT5pc1ZhbGlkKCkpCisgICAg ICAgIHJldHVybjsKKworICAgIC8vIFdlIHRha2UgYSBiYWNrZ3JvdW5kIGFjdGl2aXR5IGZvciAy NSBzZWNvbmRzIHdoZW4gc3dpdGNoaW5nIHRvIGFub3RoZXIgYXBwIHZpYSBhbiBhcHAgbGluayBp biBjYXNlIHRoZSBXZWJQYWdlCisgICAgLy8gbmVlZHMgdG8gcnVuIHNjcmlwdCB0byBwYXNzIGlu Zm9ybWF0aW9uIHRvIHRoZSBuYXRpdmUgYXBwLgorICAgIG1fb3BlbmluZ0FwcExpbmtBY3Rpdml0 eSA9IHByb2Nlc3MoKS50aHJvdHRsZXIoKS5iYWNrZ3JvdW5kQWN0aXZpdHkoIk9wZW5pbmcgQXBw TGluayJfcykubW92ZVRvVW5pcXVlUHRyKCk7CisgICAgZGlzcGF0Y2hfYWZ0ZXIoZGlzcGF0Y2hf dGltZShESVNQQVRDSF9USU1FX05PVywgKGludDY0X3QpKDI1ICogTlNFQ19QRVJfU0VDKSksIGRp c3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIFt3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKV0g eworICAgICAgICBpZiAod2Vha1RoaXMpCisgICAgICAgICAgICB3ZWFrVGhpcy0+bV9vcGVuaW5n QXBwTGlua0FjdGl2aXR5ID0gbnVsbHB0cjsKKyAgICB9KTsKK30KIAogI2lmIFBMQVRGT1JNKElP UykKIHZvaWQgV2ViUGFnZVByb3h5OjpncmFudEFjY2Vzc1RvQXNzZXRTZXJ2aWNlcygpCg== 394768 2020-03-27 16:10:50 -0700 2020-03-27 19:35:05 -0700 Patch bug-209686-20200327161049.patch text/plain 5865 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDVlYzJhZTNmM2UyZGExYjM1 ZjY4NzliMTFlNzFiYzMyY2M1YTU1M2EuLjU0NzA0MGEyZWI5MjlhMjI0ZTBhOWM3MmMxNWE3M2Q2 YTQ0NjU5N2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjAtMDMtMjcgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBEZWxheSBwcm9jZXNzIHN1 c3BlbnNpb24gZm9yIGEgd2hpbGUgYWZ0ZXIgbG9hZGluZyBhbiBhcHAgbGluaworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5Njg2CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS82MDg4ODg5MT4KKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxl ci4KKworICAgICAgICBEZWxheSBwcm9jZXNzIHN1c3BlbnNpb24gZm9yIGEgd2hpbGUgYWZ0ZXIg bG9hZGluZyBhbiBhcHAgbGluay4gVGhpcyB3aWxsIGFsbG93IHRoZSBwYWdlJ3Mgc2NyaXB0IHRv IHBhc3MKKyAgICAgICAgaW5mb3JtYXRpb24gbW9yZSByZWxpYWJseSB0byB0aGUgbmF0aXZlIGFw cCBoYW5kbGluZyB0aGUgbmF2aWdhdGlvbi4KKworICAgICAgICBUaGlzIHBhdGNoIGFkZHMgYSBb V0tXZWJWaWV3IF93aWxsT3BlbkFwcExpbmtdIFNQSSB0aGF0IHRoZSBjbGllbnQgbmVlZHMgdG8g Y2FsbCBiZWZvcmUgb3BlbmluZyB0aGUKKyAgICAgICAgYXBwIGxpbmsuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW06CisgICAgICAgICgtW1dLV2ViVmlldyBfd2lsbE9w ZW5BcHBMaW5rXSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y2xvc2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5t bToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp3aWxsT3BlbkFwcExpbmspOgorCiAy MDIwLTAzLTI3ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAg TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OnJlZ2lzdGVyQmxvYlVSTE9wdGlvbmFsbHlG aWxlQmFja2VkIHNob3VsZCB2YWxpZGF0ZSBpdHMgcGFyYW1ldGVycwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmgKaW5kZXggYjNj MGQxMjkxOTU4NTg0ODM4ZDQxY2E2ZTMyOWVhMDJhNDI3MGNmZS4uZjJhYzYwMTg2MTUwZGU2MmZm YmU0OTcxYmY1YmYyYzIzZTU4NTE2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCkBAIC00NDgsNiArNDQ4LDggQEAgZm9y IHRoaXMgcHJvcGVydHkuCiAtICh2b2lkKV9ncmFudEFjY2Vzc1RvQXNzZXRTZXJ2aWNlcyBXS19B UElfQVZBSUxBQkxFKGlvcyhXS19JT1NfVEJBKSk7CiAtICh2b2lkKV9yZXZva2VBY2Nlc3NUb0Fz c2V0U2VydmljZXMgV0tfQVBJX0FWQUlMQUJMRShpb3MoV0tfSU9TX1RCQSkpOwogCistICh2b2lk KV93aWxsT3BlbkFwcExpbmsgV0tfQVBJX0FWQUlMQUJMRShpb3MoV0tfSU9TX1RCQSkpOworCiBA ZW5kCiAKIEBpbnRlcmZhY2UgV0tXZWJWaWV3ICgpIDxVSVJlc3BvbmRlclN0YW5kYXJkRWRpdEFj dGlvbnM+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2Vi Vmlld0lPUy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9T Lm1tCmluZGV4IDBlZDM4OGUwYjk0Yjg1NzAyYjA0NGY5ZjhmYTc0OTFhZTU4Mjg1NDEuLmQ5ZjRh YzNiNmI1ZWY5NjU0YWU0NzRhZDY4MWQwZmYzNjgyMmFkNTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tCkBAIC0zMTAwLDYgKzMxMDAsMTIg QEAgLSAodm9pZClfcmV2b2tlQWNjZXNzVG9Bc3NldFNlcnZpY2VzCiAjZW5kaWYKIH0KIAorLSAo dm9pZClfd2lsbE9wZW5BcHBMaW5rCit7CisgICAgaWYgKF9wYWdlKQorICAgICAgICBfcGFnZS0+ d2lsbE9wZW5BcHBMaW5rKCk7Cit9CisKIEBlbmQgLy8gV0tXZWJWaWV3IChXS1ByaXZhdGVJT1Mp CiAKICNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcAppbmRleCAwMzhmY2YwOTgyNDQ4OGYzNTU5ZTRhOGU2YTczMTE2ZmRmOTQy ZmEzLi41NWQ5ZDVkMzM1ZTUzMTM1MmUwMzczYzA5YTMzY2RlYTZiNDE5YTU3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTExMzgsNiArMTEzOCw3IEBAIHZv aWQgV2ViUGFnZVByb3h5OjpjbG9zZSgpCiAgICAgbV9pc1Zpc2libGVBY3Rpdml0eSA9IG51bGxw dHI7CiAgICAgbV9pc0F1ZGlibGVBY3Rpdml0eSA9IG51bGxwdHI7CiAgICAgbV9pc0NhcHR1cmlu Z0FjdGl2aXR5ID0gbnVsbHB0cjsKKyAgICBtX29wZW5pbmdBcHBMaW5rQWN0aXZpdHkgPSBudWxs cHRyOwogICAgIG1fYWx3YXlzUnVuc0F0Rm9yZWdyb3VuZFByaW9yaXR5QWN0aXZpdHkgPSBudWxs cHRyOwogICAgIG1fYXVkaWJsZUFjdGl2aXR5VGltZXIuc3RvcCgpOwogI2VuZGlmCkBAIC03NTcx LDYgKzc1NzIsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVzZXRTdGF0ZUFmdGVyUHJvY2Vzc0V4 aXRlZChQcm9jZXNzVGVybWluYXRpb25SZWFzb24gdGVybWluYQogICAgIG1faXNWaXNpYmxlQWN0 aXZpdHkgPSBudWxscHRyOwogICAgIG1faXNBdWRpYmxlQWN0aXZpdHkgPSBudWxscHRyOwogICAg IG1faXNDYXB0dXJpbmdBY3Rpdml0eSA9IG51bGxwdHI7CisgICAgbV9vcGVuaW5nQXBwTGlua0Fj dGl2aXR5ID0gbnVsbHB0cjsKICAgICBtX2Fsd2F5c1J1bnNBdEZvcmVncm91bmRQcmlvcml0eUFj dGl2aXR5ID0gbnVsbHB0cjsKICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5oCmluZGV4IDBhMTg3MzU5MzZhMDJjMjU0NjcyYzIyNjBjZDUyOGI3ZTVmYjJiNTcuLmM4 Njc2YTk1M2Q3YzdiN2EwNWQwMWJiNjhkYjUyNWVkMTczMmJiNjEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC01MjMsNiArNTIzLDggQEAgcHVibGljOgogI2lmIFBM QVRGT1JNKElPU19GQU1JTFkpCiAgICAgYm9vbCBhbGxvd3NNZWRpYURvY3VtZW50SW5saW5lUGxh eWJhY2soKSBjb25zdDsKICAgICB2b2lkIHNldEFsbG93c01lZGlhRG9jdW1lbnRJbmxpbmVQbGF5 YmFjayhib29sKTsKKworICAgIHZvaWQgd2lsbE9wZW5BcHBMaW5rKCk7CiAjZW5kaWYKIAogI2lm IFVTRShTWVNURU1fUFJFVklFVykKQEAgLTI0MDAsNiArMjQwMiw3IEBAIHByaXZhdGU6CiAgICAg c3RkOjp1bmlxdWVfcHRyPFByb2Nlc3NUaHJvdHRsZXI6OkZvcmVncm91bmRBY3Rpdml0eT4gbV9p c0NhcHR1cmluZ0FjdGl2aXR5OwogICAgIHN0ZDo6dW5pcXVlX3B0cjxQcm9jZXNzVGhyb3R0bGVy OjpGb3JlZ3JvdW5kQWN0aXZpdHk+IG1fYWx3YXlzUnVuc0F0Rm9yZWdyb3VuZFByaW9yaXR5QWN0 aXZpdHk7CiAgICAgUnVuTG9vcDo6VGltZXI8V2ViUGFnZVByb3h5PiBtX2F1ZGlibGVBY3Rpdml0 eVRpbWVyOworICAgIHN0ZDo6dW5pcXVlX3B0cjxQcm9jZXNzVGhyb3R0bGVyOjpCYWNrZ3JvdW5k QWN0aXZpdHk+IG1fb3BlbmluZ0FwcExpbmtBY3Rpdml0eTsKICNlbmRpZgogICAgIGJvb2wgbV9p bml0aWFsQ2FwaXRhbGl6YXRpb25FbmFibGVkIHsgZmFsc2UgfTsKICAgICBPcHRpb25hbDxkb3Vi bGU+IG1fY3B1TGltaXQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv V2ViUGFnZVByb3h5SU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQ cm94eUlPUy5tbQppbmRleCBjNzI2N2E1ODdjOTcxY2YzZDMwZjIzZmU0NGE3MzNmZTBjYWEzMDM1 Li5hOWQwMGI5NzQ3MzI1YjU3ZjRkOTlmYjhhZWNlYzBjMTc5MGM4MjE1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW0KQEAgLTE1MzksNiArMTUz OSwyMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0U2hvdWxkUmV2ZWFsQ3VycmVudFNlbGVjdGlv bkFmdGVySW5zZXJ0aW9uKGJvb2wgc2hvdWxkUmV2ZQogICAgICAgICBzZW5kKE1lc3NhZ2VzOjpX ZWJQYWdlOjpTZXRTaG91bGRSZXZlYWxDdXJyZW50U2VsZWN0aW9uQWZ0ZXJJbnNlcnRpb24oc2hv dWxkUmV2ZWFsQ3VycmVudFNlbGVjdGlvbkFmdGVySW5zZXJ0aW9uKSk7CiB9CiAKK3ZvaWQgV2Vi UGFnZVByb3h5Ojp3aWxsT3BlbkFwcExpbmsoKQoreworICAgIGlmIChtX29wZW5pbmdBcHBMaW5r QWN0aXZpdHkgJiYgbV9vcGVuaW5nQXBwTGlua0FjdGl2aXR5LT5pc1ZhbGlkKCkpCisgICAgICAg IHJldHVybjsKKworICAgIC8vIFdlIHRha2UgYSBiYWNrZ3JvdW5kIGFjdGl2aXR5IGZvciAyNSBz ZWNvbmRzIHdoZW4gc3dpdGNoaW5nIHRvIGFub3RoZXIgYXBwIHZpYSBhbiBhcHAgbGluayBpbiBj YXNlIHRoZSBXZWJQYWdlCisgICAgLy8gbmVlZHMgdG8gcnVuIHNjcmlwdCB0byBwYXNzIGluZm9y bWF0aW9uIHRvIHRoZSBuYXRpdmUgYXBwLgorICAgIC8vIFdlIGNob3NlIDI1IHNlY29uZHMgYmVj YXVzZSB0aGUgc3lzdGVtIG9ubHkgZ2l2ZXMgdXMgMzAgc2Vjb25kcyBhbmQgd2UgZG9uJ3Qgd2Fu dCB0byBnZXQgdG9vIGNsb3NlIHRvIHRoYXQgbGltaXQKKyAgICAvLyB0byBhdm9pZCBhc3NlcnRp b24gaW52YWxpZGF0aW9uIChvciBldmVuIHRlcm1pbmF0aW9uKS4KKyAgICBtX29wZW5pbmdBcHBM aW5rQWN0aXZpdHkgPSBwcm9jZXNzKCkudGhyb3R0bGVyKCkuYmFja2dyb3VuZEFjdGl2aXR5KCJP cGVuaW5nIEFwcExpbmsiX3MpLm1vdmVUb1VuaXF1ZVB0cigpOworICAgIGRpc3BhdGNoX2FmdGVy KGRpc3BhdGNoX3RpbWUoRElTUEFUQ0hfVElNRV9OT1csIDI1ICogTlNFQ19QRVJfU0VDKSwgZGlz cGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgW3dlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpXSB7 CisgICAgICAgIGlmICh3ZWFrVGhpcykKKyAgICAgICAgICAgIHdlYWtUaGlzLT5tX29wZW5pbmdB cHBMaW5rQWN0aXZpdHkgPSBudWxscHRyOworICAgIH0pOworfQogCiAjaWYgUExBVEZPUk0oSU9T KQogdm9pZCBXZWJQYWdlUHJveHk6OmdyYW50QWNjZXNzVG9Bc3NldFNlcnZpY2VzKCkK 394783 2020-03-27 19:34:44 -0700 2020-03-28 19:05:47 -0700 Follow-up bug-209686-20200327193443.patch text/plain 1823 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU0NzA0MGEyZWI5MjlhMjI0 ZTBhOWM3MmMxNWE3M2Q2YTQ0NjU5N2IuLjcxZTkzNjE4N2U5NzMzZGExNzYwMTNkNTJhMzY5NWZj NTBmOTBiYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjAtMDMtMjcgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBEZWxheSBwcm9jZXNzIHN1 c3BlbnNpb24gZm9yIGEgd2hpbGUgYWZ0ZXIgbG9hZGluZyBhbiBhcHAgbGluaworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5Njg2CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS82MDg4ODg5MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBDbGllbnQgYXBwcyB0aGF0IHJlbHkgb24gV2ViS2l0IHRvIG9wZW4g YXBwIGxpbmtzIGNhbm5vdCBjYWxsIHRoZSBbV0tXZWJWaWV3IF93aWxsT3BlbkFwcExpbmtdIFNQ SQorICAgICAgICB0aGF0IHdhcyBhZGRlZCBpbiByMjU5MTQ2LiBJbnN0ZWFkLCB3ZSBuZWVkIHRv IGNhbGwgV2ViUGFnZVByb3h5Ojp3aWxsT3BlbkFwcExpbmsoKSBpbgorICAgICAgICB0cnlJbnRl cmNlcHROYXZpZ2F0aW9uKCkgd2hlbiBXZWJLaXQgb3BlbnMgdGhlIEFwcExpbmsgaXRzZWxmLgor CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbToKKyAgICAgICAg KFdlYktpdDo6dHJ5SW50ZXJjZXB0TmF2aWdhdGlvbik6CisKIDIwMjAtMDMtMjcgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBEZWxheSBwcm9jZXNzIHN1 c3BlbnNpb24gZm9yIGEgd2hpbGUgYWZ0ZXIgbG9hZGluZyBhbiBhcHAgbGluawpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tCmluZGV4IDcwYWI0 MzA0MzA1M2UyMWIyYWNlYjI4MDIzMmRlZjA4OTBlNWY4OGMuLjE4NzI2NTU2MDQ0MjYzZjczYjQx ZDIwMzJhZjYyMGY3ZjJlODVmODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9D b2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0KQEAgLTUwNyw2ICs1MDcsOCBAQCBzdGF0aWMgdm9pZCB0 cnlJbnRlcmNlcHROYXZpZ2F0aW9uKFJlZjxBUEk6Ok5hdmlnYXRpb25BY3Rpb24+JiYgbmF2aWdh dGlvbkFjdGlvbgogICAgICAgICAgICAgICAgIHRyeVNPQXV0aG9yaXphdGlvbihXVEZNb3ZlKG5h dmlnYXRpb25BY3Rpb24pLCAqd2Vha1BhZ2UsIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsK ICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAo c3VjY2VzcyAmJiB3ZWFrUGFnZSkKKyAgICAgICAgICAgICAgICB3ZWFrUGFnZS0+d2lsbE9wZW5B cHBMaW5rKCk7CiAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihzdWNjZXNzKTsKICAgICAg ICAgfSk7CiAgICAgICAgIFtMU0FwcExpbmsgb3BlbldpdGhVUkw6dXJsIGNvbXBsZXRpb25IYW5k bGVyOltsb2NhbENvbXBsZXRpb25IYW5kbGVyXShCT09MIHN1Y2Nlc3MsIE5TRXJyb3IgKikgewo=