198359 2019-05-29 19:19:00 -0700 [iOS] Third-party extensions using WKWebView are unable to render anything 2019-05-30 11:39:26 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez beidson bfulgham commit-queue ggaren jiewen_tan webkit-bug-importer yongjun_zhang oldest_to_newest 1540209 0 cdumez 2019-05-29 19:19:00 -0700 Third-party extensions using WKWebView are unable to render anything because we do not get notified when the extension's visibility changes. Because we do not recognize the extension showing the WebView to be foreground, we do not take a process assertion on behalf of the child processes and they get suspended before they get a chance to render anything. 1540210 1 cdumez 2019-05-29 19:19:16 -0700 <rdar://problem/51105015> 1540213 2 370908 cdumez 2019-05-29 19:26:08 -0700 Created attachment 370908 Patch 1540362 3 370908 bfulgham 2019-05-30 10:41:27 -0700 Comment on attachment 370908 Patch r=me 1540364 4 ggaren 2019-05-30 10:44:42 -0700 r=me 1540366 5 370954 cdumez 2019-05-30 10:46:32 -0700 Created attachment 370954 Patch 1540394 6 commit-queue 2019-05-30 11:38:37 -0700 The commit-queue encountered the following flaky tests while processing attachment 370954: fetch/fetch-worker-crash.html bug 187257 (author: youennf@gmail.com) The commit-queue is continuing to process your patch. 1540395 7 370954 commit-queue 2019-05-30 11:39:25 -0700 Comment on attachment 370954 Patch Clearing flags on attachment: 370954 Committed r245896: <https://trac.webkit.org/changeset/245896> 1540396 8 commit-queue 2019-05-30 11:39:26 -0700 All reviewed patches have been landed. Closing bug. 370908 2019-05-29 19:26:08 -0700 2019-05-30 10:46:31 -0700 Patch bug-198359-20190529192607.patch text/plain 5780 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1ODI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVmMzNiZmUxYWI0OWY0ODI4 MmQzOTJhY2VhZjYxNGM1Y2RjOWUzMWMuLmEzNmRjYjBhYWZlOTFkMWE5ODEzNDc2OWRhZmJlZTRh MmRhYzA2NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTktMDUtMjkgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBUaGlyZC1wYXJ0eSBleHRl bnNpb25zIHVzaW5nIFdLV2ViVmlldyBhcmUgdW5hYmxlIHRvIHJlbmRlciBhbnl0aGluZworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4MzU5CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS81MTEwNTAxNT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGlyZC1wYXJ0eSBleHRlbnNpb25zIHVzaW5nIFdLV2Vi VmlldyBhcmUgdW5hYmxlIHRvIHJlbmRlciBhbnl0aGluZyBiZWNhdXNlIHdlIGRvIG5vdCBnZXQg bm90aWZpZWQKKyAgICAgICAgd2hlbiB0aGUgZXh0ZW5zaW9uJ3MgdmlzaWJpbGl0eSBjaGFuZ2Vz LiBCZWNhdXNlIHdlIGRvIG5vdCByZWNvZ25pemUgdGhlIGV4dGVuc2lvbiBzaG93aW5nIHRoZQor ICAgICAgICBXZWJWaWV3IHRvIGJlIGZvcmVncm91bmQsIHdlIGRvIG5vdCB0YWtlIGEgcHJvY2Vz cyBhc3NlcnRpb24gb24gYmVoYWxmIG9mIHRoZSBjaGlsZCBwcm9jZXNzZXMgYW5kCisgICAgICAg IHRoZXkgZ2V0IHN1c3BlbmRlZCBiZWZvcmUgdGhleSBnZXQgYSBjaGFuY2UgdG8gcmVuZGVyIGFu eXRoaW5nLgorCisgICAgICAgIFRoZSByb290IG9mIHRoZSBpc3N1ZSBpcyB0aGF0IFdlYktpdCB3 YXMgcmVseWluZyBvbiBCS1NBcHBsaWNhdGlvblN0YXRlTW9uaXRvci5oYW5kbGVyIHRvIGdldAor ICAgICAgICBub3RpZmllZCB3aGVuIHRoZSBleHRlbnNpb24ncyBzdGF0ZSBzd2l0Y2hlcyBiZXR3 ZWVuIGZvcmVncm91bmQgYW5kIGJhY2tncm91bmQuIEhvd2V2ZXIsIHRoZSBoYW5kbGVyCisgICAg ICAgIG5ldmVyIGdldHMgY2FsbGVkIHVubGVzcyB0aGUgZXh0ZW5zaW9uIGhhcyBhbiBhcHByb3By aWF0ZSBlbnRpdGxlbWVudC4KKworICAgICAgICBUbyBhZGRyZXNzIHRoZSBpc3N1ZSwgd2Ugbm93 IHVzZSB0aGUgc2FtZSBsb2dpYyBmb3IgZXh0ZW5zaW9ucyBhbmQgd2UgZG8gZm9yIHZpZXcgc2Vy dmljZXMuCisgICAgICAgIEkgaGF2ZSB2ZXJpZmllZCB0aGF0IHRoZSBfVUlWaWV3U2VydmljZUhv c3REaWRFbnRlckJhY2tncm91bmROb3RpZmljYXRpb24gLyBfVUlWaWV3U2VydmljZUhvc3RXaWxs RW50ZXJGb3JlZ3JvdW5kTm90aWZpY2F0aW9uCisgICAgICAgIG5vdGlmaWNhdGlvbnMgZ2V0IHNl bnQgdG8gdGhlIGV4dGVuc2lvbnMgKGV2ZW4gdGhpcmQtcGFydHkpLiBXZSBhbHNvIHByb3Blcmx5 IGRldGVjdCBNb2JpbGVTYWZhcmkgYXMKKyAgICAgICAgaG9zdCBhcHBsaWNhdGlvbiBhbmQgYXJl IGFibGUgdG8gZ2V0IE1vYmlsZVNhZmFyaSdzIGZvcmVncm91bmQgc3RhdGUgYWNjdXJhdGVseS4K KworICAgICAgICAqIFVJUHJvY2Vzcy9BcHBsaWNhdGlvblN0YXRlVHJhY2tlci5tbToKKwogMjAx OS0wNS0yOCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZW1vdmUgZGVhZCBjb2RlIGZyb20gc2FuZGJveGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BcHBsaWNhdGlvblN0YXRlVHJhY2tlci5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FwcGxpY2F0aW9uU3RhdGVUcmFja2VyLm1tCmluZGV4IGEyM2Q0YmY4YmYxNGVjZDdj MjVlMDM0NWEyN2YwNjQzOWU1ZWNmZGUuLjUwNzkyMmZhYWY4ODBiNWJhMmFlY2FhZDgyN2ZlOTEx MjA4ZDI5ZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FwcGxpY2F0aW9u U3RhdGVUcmFja2VyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FwcGxpY2F0aW9u U3RhdGVUcmFja2VyLm1tCkBAIC0yOSw2ICsyOSw3IEBACiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlM WSkKIAogI2ltcG9ydCAiQXNzZXJ0aW9uU2VydmljZXNTUEkuaCIKKyNpbXBvcnQgIkxvZ2dpbmcu aCIKICNpbXBvcnQgIlNhbmRib3hVdGlsaXRpZXMuaCIKICNpbXBvcnQgIlVJS2l0U1BJLmgiCiAj aW1wb3J0IDx3dGYvT2JqQ1J1bnRpbWVFeHRyYXMuaD4KQEAgLTEyMyw2ICsxMjQsNyBAQCBBcHBs aWNhdGlvblN0YXRlVHJhY2tlcjo6QXBwbGljYXRpb25TdGF0ZVRyYWNrZXIoVUlWaWV3ICp2aWV3 LCBTRUwgZGlkRW50ZXJCYWNrZwogICAgICAgICBicmVhazsKICAgICB9CiAKKyAgICBjYXNlIEFw cGxpY2F0aW9uVHlwZTo6RXh0ZW5zaW9uOgogICAgIGNhc2UgQXBwbGljYXRpb25UeXBlOjpWaWV3 U2VydmljZTogewogICAgICAgICBVSVZpZXdDb250cm9sbGVyICpzZXJ2aWNlVmlld0NvbnRyb2xs ZXIgPSBuaWw7CiAKQEAgLTE1MCw0MSArMTUyLDE5IEBAIEFwcGxpY2F0aW9uU3RhdGVUcmFja2Vy OjpBcHBsaWNhdGlvblN0YXRlVHJhY2tlcihVSVZpZXcgKnZpZXcsIFNFTCBkaWRFbnRlckJhY2tn CiAgICAgICAgIGlmIChbc2VydmljZVZpZXdDb250cm9sbGVyLl9ob3N0QXBwbGljYXRpb25CdW5k bGVJZGVudGlmaWVyIGlzRXF1YWxUb1N0cmluZzpAImNvbS5hcHBsZS5pb3MuU3RvcmVLaXRVSVNl cnZpY2UiXSkKICAgICAgICAgICAgIG1faXNJbkJhY2tncm91bmQgPSBmYWxzZTsKIAotICAgICAg ICBtX2RpZEVudGVyQmFja2dyb3VuZE9ic2VydmVyID0gW25vdGlmaWNhdGlvbkNlbnRlciBhZGRP YnNlcnZlckZvck5hbWU6QCJfVUlWaWV3U2VydmljZUhvc3REaWRFbnRlckJhY2tncm91bmROb3Rp ZmljYXRpb24iIG9iamVjdDpzZXJ2aWNlVmlld0NvbnRyb2xsZXIgcXVldWU6bmlsIHVzaW5nQmxv Y2s6W3RoaXNdKE5TTm90aWZpY2F0aW9uICopIHsKKyAgICAgICAgUkVMRUFTRV9MT0coUHJvY2Vz c1N1c3BlbnNpb24sICIle3B1YmxpY31zIGhhcyBQSUQgJWQsIGhvc3QgYXBwbGljYXRpb24gUElE OiAlZCwgaXNJbkJhY2tncm91bmQ6ICVkIiwgX1VJQXBwbGljYXRpb25Jc0V4dGVuc2lvbigpID8g IkV4dGVuc2lvbiIgOiAiVmlld1NlcnZpY2UiLCBnZXRwaWQoKSwgYXBwbGljYXRpb25QSUQsIG1f aXNJbkJhY2tncm91bmQpOworCisgICAgICAgIG1fZGlkRW50ZXJCYWNrZ3JvdW5kT2JzZXJ2ZXIg PSBbbm90aWZpY2F0aW9uQ2VudGVyIGFkZE9ic2VydmVyRm9yTmFtZTpAIl9VSVZpZXdTZXJ2aWNl SG9zdERpZEVudGVyQmFja2dyb3VuZE5vdGlmaWNhdGlvbiIgb2JqZWN0OnNlcnZpY2VWaWV3Q29u dHJvbGxlciBxdWV1ZTpuaWwgdXNpbmdCbG9jazpbdGhpcywgYXBwbGljYXRpb25QSURdKE5TTm90 aWZpY2F0aW9uICopIHsKKyAgICAgICAgICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9u LCAiJXtwdWJsaWN9cyBoYXMgUElEICVkLCBob3N0IGFwcGxpY2F0aW9uIFBJRDogJWQsIGRpZEVu dGVyQmFja2dyb3VuZCIsIF9VSUFwcGxpY2F0aW9uSXNFeHRlbnNpb24oKSA/ICJFeHRlbnNpb24i IDogIlZpZXdTZXJ2aWNlIiwgZ2V0cGlkKCksIGFwcGxpY2F0aW9uUElEKTsKICAgICAgICAgICAg IGFwcGxpY2F0aW9uRGlkRW50ZXJCYWNrZ3JvdW5kKCk7CiAgICAgICAgIH1dOwotICAgICAgICBt X3dpbGxFbnRlckZvcmVncm91bmRPYnNlcnZlciA9IFtub3RpZmljYXRpb25DZW50ZXIgYWRkT2Jz ZXJ2ZXJGb3JOYW1lOkAiX1VJVmlld1NlcnZpY2VIb3N0V2lsbEVudGVyRm9yZWdyb3VuZE5vdGlm aWNhdGlvbiIgb2JqZWN0OnNlcnZpY2VWaWV3Q29udHJvbGxlciBxdWV1ZTpuaWwgdXNpbmdCbG9j azpbdGhpc10oTlNOb3RpZmljYXRpb24gKikgeworICAgICAgICBtX3dpbGxFbnRlckZvcmVncm91 bmRPYnNlcnZlciA9IFtub3RpZmljYXRpb25DZW50ZXIgYWRkT2JzZXJ2ZXJGb3JOYW1lOkAiX1VJ Vmlld1NlcnZpY2VIb3N0V2lsbEVudGVyRm9yZWdyb3VuZE5vdGlmaWNhdGlvbiIgb2JqZWN0OnNl cnZpY2VWaWV3Q29udHJvbGxlciBxdWV1ZTpuaWwgdXNpbmdCbG9jazpbdGhpcywgYXBwbGljYXRp b25QSURdKE5TTm90aWZpY2F0aW9uICopIHsKKyAgICAgICAgICAgIFJFTEVBU0VfTE9HKFByb2Nl c3NTdXNwZW5zaW9uLCAiJXtwdWJsaWN9cyBoYXMgUElEICVkLCBob3N0IGFwcGxpY2F0aW9uIFBJ RDogJWQsIHdpbGxFbnRlckZvcmVncm91bmQiLCBfVUlBcHBsaWNhdGlvbklzRXh0ZW5zaW9uKCkg PyAiRXh0ZW5zaW9uIiA6ICJWaWV3U2VydmljZSIsIGdldHBpZCgpLCBhcHBsaWNhdGlvblBJRCk7 CiAgICAgICAgICAgICBhcHBsaWNhdGlvbldpbGxFbnRlckZvcmVncm91bmQoKTsKICAgICAgICAg fV07CiAKICAgICAgICAgYnJlYWs7CiAgICAgfQotCi0gICAgY2FzZSBBcHBsaWNhdGlvblR5cGU6 OkV4dGVuc2lvbjogewotICAgICAgICBtX2FwcGxpY2F0aW9uU3RhdGVNb25pdG9yID0gYWRvcHRO UyhbW0JLU0FwcGxpY2F0aW9uU3RhdGVNb25pdG9yIGFsbG9jXSBpbml0XSk7Ci0KLSAgICAgICAg bV9pc0luQmFja2dyb3VuZCA9IGlzQmFja2dyb3VuZFN0YXRlKFttX2FwcGxpY2F0aW9uU3RhdGVN b25pdG9yIG1vc3RFbGV2YXRlZEFwcGxpY2F0aW9uU3RhdGVGb3JQSUQ6Z2V0cGlkKCldKTsKLQot ICAgICAgICBbbV9hcHBsaWNhdGlvblN0YXRlTW9uaXRvciBzZXRIYW5kbGVyOlt3ZWFrVGhpc10o TlNEaWN0aW9uYXJ5ICp1c2VySW5mbykgewotICAgICAgICAgICAgcGlkX3QgcGlkID0gW3VzZXJJ bmZvW0JLU0FwcGxpY2F0aW9uU3RhdGVQcm9jZXNzSURLZXldIGludGVnZXJWYWx1ZV07Ci0gICAg ICAgICAgICBpZiAocGlkICE9IGdldHBpZCgpKQotICAgICAgICAgICAgICAgIHJldHVybjsKLQot ICAgICAgICAgICAgQktTQXBwbGljYXRpb25TdGF0ZSBuZXdTdGF0ZSA9IChCS1NBcHBsaWNhdGlv blN0YXRlKVt1c2VySW5mb1tCS1NBcHBsaWNhdGlvblN0YXRlTW9zdEVsZXZhdGVkU3RhdGVGb3JQ cm9jZXNzSURLZXldIHVuc2lnbmVkSW50VmFsdWVdOwotICAgICAgICAgICAgYm9vbCBuZXdJbkJh Y2tncm91bmQgPSBpc0JhY2tncm91bmRTdGF0ZShuZXdTdGF0ZSk7Ci0KLSAgICAgICAgICAgIGRp c3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIFt3ZWFrVGhpcywgbmV3SW5C YWNrZ3JvdW5kXSB7Ci0gICAgICAgICAgICAgICAgYXV0byBhcHBsaWNhdGlvblN0YXRlVHJhY2tl ciA9IHdlYWtUaGlzLmdldCgpOwotICAgICAgICAgICAgICAgIGlmICghYXBwbGljYXRpb25TdGF0 ZVRyYWNrZXIpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICAgICAgICAg IGlmICghYXBwbGljYXRpb25TdGF0ZVRyYWNrZXItPm1faXNJbkJhY2tncm91bmQgJiYgbmV3SW5C YWNrZ3JvdW5kKQotICAgICAgICAgICAgICAgICAgICBhcHBsaWNhdGlvblN0YXRlVHJhY2tlci0+ YXBwbGljYXRpb25EaWRFbnRlckJhY2tncm91bmQoKTsKLSAgICAgICAgICAgICAgICBlbHNlIGlm IChhcHBsaWNhdGlvblN0YXRlVHJhY2tlci0+bV9pc0luQmFja2dyb3VuZCAmJiAhbmV3SW5CYWNr Z3JvdW5kKQotICAgICAgICAgICAgICAgICAgICBhcHBsaWNhdGlvblN0YXRlVHJhY2tlci0+YXBw bGljYXRpb25XaWxsRW50ZXJGb3JlZ3JvdW5kKCk7Ci0gICAgICAgICAgICB9KTsKLSAgICAgICAg fV07Ci0gICAgfQogICAgIH0KIH0KIAo= 370954 2019-05-30 10:46:32 -0700 2019-05-30 11:39:25 -0700 Patch bug-198359-20190530104631.patch text/plain 5795 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1ODkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDllYjI5OWJiMmU0MGNjNzhj ZjAyOGRmN2ExNDI2OTU1Mzg4NWIzMTcuLmMzOTMzYTJlZWMzYTc5OTdkMjI4NmFjY2RmZjNiNTRh ODY4M2ZiNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTktMDUtMzAgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBUaGlyZC1wYXJ0eSBleHRl bnNpb25zIHVzaW5nIFdLV2ViVmlldyBhcmUgdW5hYmxlIHRvIHJlbmRlciBhbnl0aGluZworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4MzU5CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS81MTEwNTAxNT4KKworICAgICAgICBSZXZpZXdlZCBieSBCcmVu dCBGdWxnaGFtIGFuZCBHZW9mZiBHYXJlbi4KKworICAgICAgICBUaGlyZC1wYXJ0eSBleHRlbnNp b25zIHVzaW5nIFdLV2ViVmlldyBhcmUgdW5hYmxlIHRvIHJlbmRlciBhbnl0aGluZyBiZWNhdXNl IHdlIGRvIG5vdCBnZXQgbm90aWZpZWQKKyAgICAgICAgd2hlbiB0aGUgZXh0ZW5zaW9uJ3Mgdmlz aWJpbGl0eSBjaGFuZ2VzLiBCZWNhdXNlIHdlIGRvIG5vdCByZWNvZ25pemUgdGhlIGV4dGVuc2lv biBzaG93aW5nIHRoZQorICAgICAgICBXZWJWaWV3IHRvIGJlIGZvcmVncm91bmQsIHdlIGRvIG5v dCB0YWtlIGEgcHJvY2VzcyBhc3NlcnRpb24gb24gYmVoYWxmIG9mIHRoZSBjaGlsZCBwcm9jZXNz ZXMgYW5kCisgICAgICAgIHRoZXkgZ2V0IHN1c3BlbmRlZCBiZWZvcmUgdGhleSBnZXQgYSBjaGFu Y2UgdG8gcmVuZGVyIGFueXRoaW5nLgorCisgICAgICAgIFRoZSByb290IG9mIHRoZSBpc3N1ZSBp cyB0aGF0IFdlYktpdCB3YXMgcmVseWluZyBvbiBCS1NBcHBsaWNhdGlvblN0YXRlTW9uaXRvci5o YW5kbGVyIHRvIGdldAorICAgICAgICBub3RpZmllZCB3aGVuIHRoZSBleHRlbnNpb24ncyBzdGF0 ZSBzd2l0Y2hlcyBiZXR3ZWVuIGZvcmVncm91bmQgYW5kIGJhY2tncm91bmQuIEhvd2V2ZXIsIHRo ZSBoYW5kbGVyCisgICAgICAgIG5ldmVyIGdldHMgY2FsbGVkIHVubGVzcyB0aGUgZXh0ZW5zaW9u IGhhcyBhbiBhcHByb3ByaWF0ZSBlbnRpdGxlbWVudC4KKworICAgICAgICBUbyBhZGRyZXNzIHRo ZSBpc3N1ZSwgd2Ugbm93IHVzZSB0aGUgc2FtZSBsb2dpYyBmb3IgZXh0ZW5zaW9ucyBhbmQgd2Ug ZG8gZm9yIHZpZXcgc2VydmljZXMuCisgICAgICAgIEkgaGF2ZSB2ZXJpZmllZCB0aGF0IHRoZSBf VUlWaWV3U2VydmljZUhvc3REaWRFbnRlckJhY2tncm91bmROb3RpZmljYXRpb24gLyBfVUlWaWV3 U2VydmljZUhvc3RXaWxsRW50ZXJGb3JlZ3JvdW5kTm90aWZpY2F0aW9uCisgICAgICAgIG5vdGlm aWNhdGlvbnMgZ2V0IHNlbnQgdG8gdGhlIGV4dGVuc2lvbnMgKGV2ZW4gdGhpcmQtcGFydHkpLiBX ZSBhbHNvIHByb3Blcmx5IGRldGVjdCBNb2JpbGVTYWZhcmkgYXMKKyAgICAgICAgaG9zdCBhcHBs aWNhdGlvbiBhbmQgYXJlIGFibGUgdG8gZ2V0IE1vYmlsZVNhZmFyaSdzIGZvcmVncm91bmQgc3Rh dGUgYWNjdXJhdGVseS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BcHBsaWNhdGlvblN0YXRlVHJh Y2tlci5tbToKKwogMjAxOS0wNS0zMCAgVHJ1aXR0IFNhdmVsbCAgPHRzYXZlbGxAYXBwbGUuY29t PgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyNDU4ODEuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BcHBsaWNhdGlvblN0YXRlVHJhY2tlci5tbSBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FwcGxpY2F0aW9uU3RhdGVUcmFja2VyLm1tCmluZGV4IGEy M2Q0YmY4YmYxNGVjZDdjMjVlMDM0NWEyN2YwNjQzOWU1ZWNmZGUuLjUwNzkyMmZhYWY4ODBiNWJh MmFlY2FhZDgyN2ZlOTExMjA4ZDI5ZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FwcGxpY2F0aW9uU3RhdGVUcmFja2VyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FwcGxpY2F0aW9uU3RhdGVUcmFja2VyLm1tCkBAIC0yOSw2ICsyOSw3IEBACiAjaWYgUExB VEZPUk0oSU9TX0ZBTUlMWSkKIAogI2ltcG9ydCAiQXNzZXJ0aW9uU2VydmljZXNTUEkuaCIKKyNp bXBvcnQgIkxvZ2dpbmcuaCIKICNpbXBvcnQgIlNhbmRib3hVdGlsaXRpZXMuaCIKICNpbXBvcnQg IlVJS2l0U1BJLmgiCiAjaW1wb3J0IDx3dGYvT2JqQ1J1bnRpbWVFeHRyYXMuaD4KQEAgLTEyMyw2 ICsxMjQsNyBAQCBBcHBsaWNhdGlvblN0YXRlVHJhY2tlcjo6QXBwbGljYXRpb25TdGF0ZVRyYWNr ZXIoVUlWaWV3ICp2aWV3LCBTRUwgZGlkRW50ZXJCYWNrZwogICAgICAgICBicmVhazsKICAgICB9 CiAKKyAgICBjYXNlIEFwcGxpY2F0aW9uVHlwZTo6RXh0ZW5zaW9uOgogICAgIGNhc2UgQXBwbGlj YXRpb25UeXBlOjpWaWV3U2VydmljZTogewogICAgICAgICBVSVZpZXdDb250cm9sbGVyICpzZXJ2 aWNlVmlld0NvbnRyb2xsZXIgPSBuaWw7CiAKQEAgLTE1MCw0MSArMTUyLDE5IEBAIEFwcGxpY2F0 aW9uU3RhdGVUcmFja2VyOjpBcHBsaWNhdGlvblN0YXRlVHJhY2tlcihVSVZpZXcgKnZpZXcsIFNF TCBkaWRFbnRlckJhY2tnCiAgICAgICAgIGlmIChbc2VydmljZVZpZXdDb250cm9sbGVyLl9ob3N0 QXBwbGljYXRpb25CdW5kbGVJZGVudGlmaWVyIGlzRXF1YWxUb1N0cmluZzpAImNvbS5hcHBsZS5p b3MuU3RvcmVLaXRVSVNlcnZpY2UiXSkKICAgICAgICAgICAgIG1faXNJbkJhY2tncm91bmQgPSBm YWxzZTsKIAotICAgICAgICBtX2RpZEVudGVyQmFja2dyb3VuZE9ic2VydmVyID0gW25vdGlmaWNh dGlvbkNlbnRlciBhZGRPYnNlcnZlckZvck5hbWU6QCJfVUlWaWV3U2VydmljZUhvc3REaWRFbnRl ckJhY2tncm91bmROb3RpZmljYXRpb24iIG9iamVjdDpzZXJ2aWNlVmlld0NvbnRyb2xsZXIgcXVl dWU6bmlsIHVzaW5nQmxvY2s6W3RoaXNdKE5TTm90aWZpY2F0aW9uICopIHsKKyAgICAgICAgUkVM RUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICIle3B1YmxpY31zIGhhcyBQSUQgJWQsIGhvc3Qg YXBwbGljYXRpb24gUElEOiAlZCwgaXNJbkJhY2tncm91bmQ6ICVkIiwgX1VJQXBwbGljYXRpb25J c0V4dGVuc2lvbigpID8gIkV4dGVuc2lvbiIgOiAiVmlld1NlcnZpY2UiLCBnZXRwaWQoKSwgYXBw bGljYXRpb25QSUQsIG1faXNJbkJhY2tncm91bmQpOworCisgICAgICAgIG1fZGlkRW50ZXJCYWNr Z3JvdW5kT2JzZXJ2ZXIgPSBbbm90aWZpY2F0aW9uQ2VudGVyIGFkZE9ic2VydmVyRm9yTmFtZTpA Il9VSVZpZXdTZXJ2aWNlSG9zdERpZEVudGVyQmFja2dyb3VuZE5vdGlmaWNhdGlvbiIgb2JqZWN0 OnNlcnZpY2VWaWV3Q29udHJvbGxlciBxdWV1ZTpuaWwgdXNpbmdCbG9jazpbdGhpcywgYXBwbGlj YXRpb25QSURdKE5TTm90aWZpY2F0aW9uICopIHsKKyAgICAgICAgICAgIFJFTEVBU0VfTE9HKFBy b2Nlc3NTdXNwZW5zaW9uLCAiJXtwdWJsaWN9cyBoYXMgUElEICVkLCBob3N0IGFwcGxpY2F0aW9u IFBJRDogJWQsIGRpZEVudGVyQmFja2dyb3VuZCIsIF9VSUFwcGxpY2F0aW9uSXNFeHRlbnNpb24o KSA/ICJFeHRlbnNpb24iIDogIlZpZXdTZXJ2aWNlIiwgZ2V0cGlkKCksIGFwcGxpY2F0aW9uUElE KTsKICAgICAgICAgICAgIGFwcGxpY2F0aW9uRGlkRW50ZXJCYWNrZ3JvdW5kKCk7CiAgICAgICAg IH1dOwotICAgICAgICBtX3dpbGxFbnRlckZvcmVncm91bmRPYnNlcnZlciA9IFtub3RpZmljYXRp b25DZW50ZXIgYWRkT2JzZXJ2ZXJGb3JOYW1lOkAiX1VJVmlld1NlcnZpY2VIb3N0V2lsbEVudGVy Rm9yZWdyb3VuZE5vdGlmaWNhdGlvbiIgb2JqZWN0OnNlcnZpY2VWaWV3Q29udHJvbGxlciBxdWV1 ZTpuaWwgdXNpbmdCbG9jazpbdGhpc10oTlNOb3RpZmljYXRpb24gKikgeworICAgICAgICBtX3dp bGxFbnRlckZvcmVncm91bmRPYnNlcnZlciA9IFtub3RpZmljYXRpb25DZW50ZXIgYWRkT2JzZXJ2 ZXJGb3JOYW1lOkAiX1VJVmlld1NlcnZpY2VIb3N0V2lsbEVudGVyRm9yZWdyb3VuZE5vdGlmaWNh dGlvbiIgb2JqZWN0OnNlcnZpY2VWaWV3Q29udHJvbGxlciBxdWV1ZTpuaWwgdXNpbmdCbG9jazpb dGhpcywgYXBwbGljYXRpb25QSURdKE5TTm90aWZpY2F0aW9uICopIHsKKyAgICAgICAgICAgIFJF TEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXtwdWJsaWN9cyBoYXMgUElEICVkLCBob3N0 IGFwcGxpY2F0aW9uIFBJRDogJWQsIHdpbGxFbnRlckZvcmVncm91bmQiLCBfVUlBcHBsaWNhdGlv bklzRXh0ZW5zaW9uKCkgPyAiRXh0ZW5zaW9uIiA6ICJWaWV3U2VydmljZSIsIGdldHBpZCgpLCBh cHBsaWNhdGlvblBJRCk7CiAgICAgICAgICAgICBhcHBsaWNhdGlvbldpbGxFbnRlckZvcmVncm91 bmQoKTsKICAgICAgICAgfV07CiAKICAgICAgICAgYnJlYWs7CiAgICAgfQotCi0gICAgY2FzZSBB cHBsaWNhdGlvblR5cGU6OkV4dGVuc2lvbjogewotICAgICAgICBtX2FwcGxpY2F0aW9uU3RhdGVN b25pdG9yID0gYWRvcHROUyhbW0JLU0FwcGxpY2F0aW9uU3RhdGVNb25pdG9yIGFsbG9jXSBpbml0 XSk7Ci0KLSAgICAgICAgbV9pc0luQmFja2dyb3VuZCA9IGlzQmFja2dyb3VuZFN0YXRlKFttX2Fw cGxpY2F0aW9uU3RhdGVNb25pdG9yIG1vc3RFbGV2YXRlZEFwcGxpY2F0aW9uU3RhdGVGb3JQSUQ6 Z2V0cGlkKCldKTsKLQotICAgICAgICBbbV9hcHBsaWNhdGlvblN0YXRlTW9uaXRvciBzZXRIYW5k bGVyOlt3ZWFrVGhpc10oTlNEaWN0aW9uYXJ5ICp1c2VySW5mbykgewotICAgICAgICAgICAgcGlk X3QgcGlkID0gW3VzZXJJbmZvW0JLU0FwcGxpY2F0aW9uU3RhdGVQcm9jZXNzSURLZXldIGludGVn ZXJWYWx1ZV07Ci0gICAgICAgICAgICBpZiAocGlkICE9IGdldHBpZCgpKQotICAgICAgICAgICAg ICAgIHJldHVybjsKLQotICAgICAgICAgICAgQktTQXBwbGljYXRpb25TdGF0ZSBuZXdTdGF0ZSA9 IChCS1NBcHBsaWNhdGlvblN0YXRlKVt1c2VySW5mb1tCS1NBcHBsaWNhdGlvblN0YXRlTW9zdEVs ZXZhdGVkU3RhdGVGb3JQcm9jZXNzSURLZXldIHVuc2lnbmVkSW50VmFsdWVdOwotICAgICAgICAg ICAgYm9vbCBuZXdJbkJhY2tncm91bmQgPSBpc0JhY2tncm91bmRTdGF0ZShuZXdTdGF0ZSk7Ci0K LSAgICAgICAgICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIFt3 ZWFrVGhpcywgbmV3SW5CYWNrZ3JvdW5kXSB7Ci0gICAgICAgICAgICAgICAgYXV0byBhcHBsaWNh dGlvblN0YXRlVHJhY2tlciA9IHdlYWtUaGlzLmdldCgpOwotICAgICAgICAgICAgICAgIGlmICgh YXBwbGljYXRpb25TdGF0ZVRyYWNrZXIpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybjsKLQot ICAgICAgICAgICAgICAgIGlmICghYXBwbGljYXRpb25TdGF0ZVRyYWNrZXItPm1faXNJbkJhY2tn cm91bmQgJiYgbmV3SW5CYWNrZ3JvdW5kKQotICAgICAgICAgICAgICAgICAgICBhcHBsaWNhdGlv blN0YXRlVHJhY2tlci0+YXBwbGljYXRpb25EaWRFbnRlckJhY2tncm91bmQoKTsKLSAgICAgICAg ICAgICAgICBlbHNlIGlmIChhcHBsaWNhdGlvblN0YXRlVHJhY2tlci0+bV9pc0luQmFja2dyb3Vu ZCAmJiAhbmV3SW5CYWNrZ3JvdW5kKQotICAgICAgICAgICAgICAgICAgICBhcHBsaWNhdGlvblN0 YXRlVHJhY2tlci0+YXBwbGljYXRpb25XaWxsRW50ZXJGb3JlZ3JvdW5kKCk7Ci0gICAgICAgICAg ICB9KTsKLSAgICAgICAgfV07Ci0gICAgfQogICAgIH0KIH0KIAo=