186963 2018-06-22 23:41:32 -0700 Creating and loading content in a WKWebView triggers Main Thread Checker warnings under ServicesController 2018-07-23 17:10:19 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca bdakin commit-queue simon.fraser timothy webkit-bug-importer wenson_hsieh oldest_to_newest 1435792 0 thorton 2018-06-22 23:41:32 -0700 Creating and loading content in a WKWebView triggers Main Thread Checker warnings under ServicesController 1435793 1 343424 thorton 2018-06-22 23:41:49 -0700 Created attachment 343424 Patch 1435794 2 webkit-bug-importer 2018-06-22 23:42:36 -0700 <rdar://problem/41393682> 1435795 3 343425 thorton 2018-06-22 23:44:29 -0700 Created attachment 343425 Patch 1439900 4 thorton 2018-07-06 13:20:59 -0700 review-bump 1444478 5 343425 commit-queue 2018-07-23 16:27:34 -0700 Comment on attachment 343425 Patch Clearing flags on attachment: 343425 Committed r234120: <https://trac.webkit.org/changeset/234120> 1444479 6 commit-queue 2018-07-23 16:27:35 -0700 All reviewed patches have been landed. Closing bug. 1444496 7 thorton 2018-07-23 17:10:19 -0700 And https://trac.webkit.org/changeset/234123/webkit 343424 2018-06-22 23:41:49 -0700 2018-06-22 23:44:28 -0700 Patch bug-186963-20180622234149.patch text/plain 6582 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM1ODE4ZjBkOGQzNDUxNWIz Y2ZiZTVkNmI4MGVlNTIwYzE5MjMzNmYuLjczNzE1YWQ0YzQ2OTU2NWRkOWYwZmFlOThlMzE3NzYz MGRhMTE4ZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTgtMDYtMjIgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgQ3JlYXRpbmcgYW5kIGxv YWRpbmcgY29udGVudCBpbiBhIFdLV2ViVmlldyB0cmlnZ2VycyBNYWluIFRocmVhZCBDaGVja2Vy IHdhcm5pbmdzIHVuZGVyIFNlcnZpY2VzQ29udHJvbGxlcgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg2OTYzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1NlcnZpY2VzQ29udHJv bGxlci5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvU2VydmljZXNDb250cm9sbGVyLm1tOgor ICAgICAgICAoV2ViS2l0OjpoYXNDb21wYXRpYmxlU2VydmljZXNGb3JJdGVtcyk6CisgICAgICAg IChXZWJLaXQ6OlNlcnZpY2VzQ29udHJvbGxlcjo6cmVmcmVzaEV4aXN0aW5nU2VydmljZXMpOgor ICAgICAgICBBZG9wdCBhc3luYyBTaGFyZUtpdCBTUEkgdGhhdCBpcyBhY3R1YWxseSB0aHJlYWQt c2FmZSBpbnN0ZWFkIG9mIHRoZSBub3QtcXVpdGUtc2FmZQorICAgICAgICBzeW5jaHJvbm91cyBB UEkuIFJlcXVlc3QgYWxsIHRocmVlIHNldHMgb2Ygc2VydmljZXMgaW1tZWRpYXRlbHksIGFuZCBk aXNwYXRjaAorICAgICAgICB0byB0aGUgV2ViIENvbnRlbnQgcHJvY2Vzc2VzIHdoZW4gYWxsIHRo cmVlIGhhdmUgcmV0dXJuZWQuCisKIDIwMTgtMDYtMjIgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBh cHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjIzMTg1MCk6IENvb2tpZSBmaWxlIGNh bm5vdCBiZSByZWFkIG9yIHdyaXR0ZW4gYnkgbmV0d29yayBwcm9jZXNzCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvU2VydmljZXNDb250cm9sbGVyLmggYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9tYWMvU2VydmljZXNDb250cm9sbGVyLmgKaW5kZXggNjdjNjBlZTlk ZGJiNzYzNDI3MzI1MTZiYjJjMTIyNmQ3YmY0NmEzMC4uZGY1ZmY5Yjk5YTJkYzc4MTBkY2MxMWEw NjVjMDU3YWJmN2UxZDQyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFj L1NlcnZpY2VzQ29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9T ZXJ2aWNlc0NvbnRyb2xsZXIuaApAQCAtNTIsOSArNTIsMTMgQEAgcHJpdmF0ZToKICAgICBkaXNw YXRjaF9xdWV1ZV90IG1fcmVmcmVzaFF1ZXVlOwogICAgIHN0ZDo6YXRvbWljX2Jvb2wgbV9oYXNQ ZW5kaW5nUmVmcmVzaDsKIAotICAgIGJvb2wgbV9oYXNJbWFnZVNlcnZpY2VzOwotICAgIGJvb2wg bV9oYXNTZWxlY3Rpb25TZXJ2aWNlczsKLSAgICBib29sIG1faGFzUmljaENvbnRlbnRTZXJ2aWNl czsKKyAgICBzdGQ6OmF0b21pYzxib29sPiBtX2hhc0ltYWdlU2VydmljZXM7CisgICAgc3RkOjph dG9taWM8Ym9vbD4gbV9oYXNTZWxlY3Rpb25TZXJ2aWNlczsKKyAgICBzdGQ6OmF0b21pYzxib29s PiBtX2hhc1JpY2hDb250ZW50U2VydmljZXM7CisKKyAgICBib29sIG1fbGFzdFNlbnRIYXNJbWFn ZVNlcnZpY2VzOworICAgIGJvb2wgbV9sYXN0U2VudEhhc1NlbGVjdGlvblNlcnZpY2VzOworICAg IGJvb2wgbV9sYXN0U2VudEhhc1JpY2hDb250ZW50U2VydmljZXM7CiAKICAgICBSZXRhaW5QdHI8 aWQ+IG1fZXh0ZW5zaW9uV2F0Y2hlcjsKICAgICBSZXRhaW5QdHI8aWQ+IG1fdWlFeHRlbnNpb25X YXRjaGVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1NlcnZpY2Vz Q29udHJvbGxlci5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9TZXJ2aWNlc0NvbnRy b2xsZXIubW0KaW5kZXggOTkyNjQyOWI0MjdhMTY5MGFjZjJkYmE2MmNlNWNjNTM1NmVhMmM1Mi4u ZGVkMWI0NTllMWRmZGJiN2ZhMjU1M2JjYTEzOWUzMGIwNTFmOGFjZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1NlcnZpY2VzQ29udHJvbGxlci5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvU2VydmljZXNDb250cm9sbGVyLm1tCkBAIC0zMyw2ICsz Myw3IEBACiAjaW1wb3J0IDxwYWwvc3BpL2NvY29hL05TRXh0ZW5zaW9uU1BJLmg+CiAjaW1wb3J0 IDxwYWwvc3BpL21hYy9OU1NoYXJpbmdTZXJ2aWNlUGlja2VyU1BJLmg+CiAjaW1wb3J0IDxwYWwv c3BpL21hYy9OU1NoYXJpbmdTZXJ2aWNlU1BJLmg+CisjaW1wb3J0IDx3dGYvQmxvY2tQdHIuaD4K ICNpbXBvcnQgPHd0Zi9OZXZlckRlc3Ryb3llZC5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAg LTY1LDkgKzY2LDIwIEBAIFNlcnZpY2VzQ29udHJvbGxlcjo6U2VydmljZXNDb250cm9sbGVyKCkK ICNlbmRpZiAvLyBfX0xQNjRfXwogfQogCi1zdGF0aWMgYm9vbCBoYXNDb21wYXRpYmxlU2Vydmlj ZXNGb3JJdGVtcyhOU0FycmF5ICppdGVtcykKK3N0YXRpYyB2b2lkIGhhc0NvbXBhdGlibGVTZXJ2 aWNlc0Zvckl0ZW1zKGRpc3BhdGNoX2dyb3VwX3QgZ3JvdXAsIE5TQXJyYXkgKml0ZW1zLCBXVEY6 OkZ1bmN0aW9uPHZvaWQoYm9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgcmV0dXJu IFtOU1NoYXJpbmdTZXJ2aWNlIHNoYXJpbmdTZXJ2aWNlc0Zvckl0ZW1zOml0ZW1zIG1hc2s6TlNT aGFyaW5nU2VydmljZU1hc2tWaWV3ZXIgfCBOU1NoYXJpbmdTZXJ2aWNlTWFza0VkaXRvcl0uY291 bnQ7CisgICAgTlNTaGFyaW5nU2VydmljZU1hc2sgc2VydmljZXNNYXNrID0gTlNTaGFyaW5nU2Vy dmljZU1hc2tWaWV3ZXIgfCBOU1NoYXJpbmdTZXJ2aWNlTWFza0VkaXRvcjsKKworI2lmIF9fTUFD X09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxNDAwCisgICAgZGlzcGF0Y2hfZ3JvdXBf ZW50ZXIoZ3JvdXApOworICAgIFtOU1NoYXJpbmdTZXJ2aWNlIHNoYXJpbmdTZXJ2aWNlc0Zvckl0 ZW1zOml0ZW1zIG1hc2s6c2VydmljZXNNYXNrIGNvbXBsZXRpb246QmxvY2tQdHI8dm9pZChOU0Fy cmF5ICopPjo6ZnJvbUNhbGxhYmxlKFtjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxl dGlvbkhhbmRsZXIpLCBncm91cF0oTlNBcnJheSAqc2VydmljZXMpIHsKKyAgICAgICAgY29tcGxl dGlvbkhhbmRsZXIoc2VydmljZXMuY291bnQpOworICAgICAgICBkaXNwYXRjaF9ncm91cF9sZWF2 ZShncm91cCk7CisgICAgfSkuZ2V0KCldOworI2Vsc2UKKyAgICBVTlVTRURfUEFSQU0oZ3JvdXAp OworICAgIGNvbXBsZXRpb25IYW5kbGVyKFtOU1NoYXJpbmdTZXJ2aWNlIHNoYXJpbmdTZXJ2aWNl c0Zvckl0ZW1zOml0ZW1zIG1hc2s6c2VydmljZXNNYXNrXS5jb3VudCk7CisjZW5kaWYKIH0KIAog dm9pZCBTZXJ2aWNlc0NvbnRyb2xsZXI6OnJlZnJlc2hFeGlzdGluZ1NlcnZpY2VzKGJvb2wgcmVm cmVzaEltbWVkaWF0ZWx5KQpAQCAtNzksMTEgKzkxLDE3IEBAIHZvaWQgU2VydmljZXNDb250cm9s bGVyOjpyZWZyZXNoRXhpc3RpbmdTZXJ2aWNlcyhib29sIHJlZnJlc2hJbW1lZGlhdGVseSkKIAog ICAgIGF1dG8gcmVmcmVzaFRpbWUgPSBkaXNwYXRjaF90aW1lKERJU1BBVENIX1RJTUVfTk9XLCBy ZWZyZXNoSW1tZWRpYXRlbHkgPyAwIDogKGludDY0X3QpKDEgKiBOU0VDX1BFUl9TRUMpKTsKICAg ICBkaXNwYXRjaF9hZnRlcihyZWZyZXNoVGltZSwgbV9yZWZyZXNoUXVldWUsIF57CisgICAgICAg IGF1dG8gc2VydmljZUxvb2t1cEdyb3VwID0gYWRvcHRPU09iamVjdChkaXNwYXRjaF9ncm91cF9j cmVhdGUoKSk7CisKICAgICAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPE5TSW1hZ2UgKj4gaW1h Z2UoW1tOU0ltYWdlIGFsbG9jXSBpbml0XSk7Ci0gICAgICAgIGJvb2wgaGFzSW1hZ2VTZXJ2aWNl cyA9IGhhc0NvbXBhdGlibGVTZXJ2aWNlc0Zvckl0ZW1zKEBbIGltYWdlIF0pOworICAgICAgICBo YXNDb21wYXRpYmxlU2VydmljZXNGb3JJdGVtcyhzZXJ2aWNlTG9va3VwR3JvdXAuZ2V0KCksIEBb IGltYWdlIF0sIFt0aGlzXSAoYm9vbCBoYXNTZXJ2aWNlcykgeworICAgICAgICAgICAgbV9oYXNJ bWFnZVNlcnZpY2VzID0gaGFzU2VydmljZXM7CisgICAgICAgIH0pOwogCiAgICAgICAgIHN0YXRp YyBOZXZlckRlc3Ryb3llZDxOU0F0dHJpYnV0ZWRTdHJpbmcgKj4gYXR0cmlidXRlZFN0cmluZyhb W05TQXR0cmlidXRlZFN0cmluZyBhbGxvY10gaW5pdFdpdGhTdHJpbmc6QCJhIl0pOwotICAgICAg ICBib29sIGhhc1NlbGVjdGlvblNlcnZpY2VzID0gaGFzQ29tcGF0aWJsZVNlcnZpY2VzRm9ySXRl bXMoQFsgYXR0cmlidXRlZFN0cmluZyBdKTsKKyAgICAgICAgaGFzQ29tcGF0aWJsZVNlcnZpY2Vz Rm9ySXRlbXMoc2VydmljZUxvb2t1cEdyb3VwLmdldCgpLCBAWyBhdHRyaWJ1dGVkU3RyaW5nIF0s IFt0aGlzXSAoYm9vbCBoYXNTZXJ2aWNlcykgeworICAgICAgICAgICAgbV9oYXNTZWxlY3Rpb25T ZXJ2aWNlcyA9IGhhc1NlcnZpY2VzOworICAgICAgICB9KTsKIAogICAgICAgICBzdGF0aWMgTlNB dHRyaWJ1dGVkU3RyaW5nICphdHRyaWJ1dGVkU3RyaW5nV2l0aFJpY2hDb250ZW50OwogICAgICAg ICBpZiAoIWF0dHJpYnV0ZWRTdHJpbmdXaXRoUmljaENvbnRlbnQpIHsKQEAgLTk3LDE0ICsxMTUs MTYgQEAgdm9pZCBTZXJ2aWNlc0NvbnRyb2xsZXI6OnJlZnJlc2hFeGlzdGluZ1NlcnZpY2VzKGJv b2wgcmVmcmVzaEltbWVkaWF0ZWx5KQogICAgICAgICAgICAgfSk7CiAgICAgICAgIH0KIAotICAg ICAgICBib29sIGhhc1JpY2hDb250ZW50U2VydmljZXMgPSBoYXNDb21wYXRpYmxlU2VydmljZXNG b3JJdGVtcyhAWyBhdHRyaWJ1dGVkU3RyaW5nV2l0aFJpY2hDb250ZW50IF0pOwotICAgICAgICAK LSAgICAgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKLSAg ICAgICAgICAgIGJvb2wgYXZhaWxhYmxlU2VydmljZXNDaGFuZ2VkID0gKGhhc0ltYWdlU2Vydmlj ZXMgIT0gbV9oYXNJbWFnZVNlcnZpY2VzKSB8fCAoaGFzU2VsZWN0aW9uU2VydmljZXMgIT0gbV9o YXNTZWxlY3Rpb25TZXJ2aWNlcykgfHwgKGhhc1JpY2hDb250ZW50U2VydmljZXMgIT0gbV9oYXNS aWNoQ29udGVudFNlcnZpY2VzKTsKKyAgICAgICAgaGFzQ29tcGF0aWJsZVNlcnZpY2VzRm9ySXRl bXMoc2VydmljZUxvb2t1cEdyb3VwLmdldCgpLCBAWyBhdHRyaWJ1dGVkU3RyaW5nV2l0aFJpY2hD b250ZW50IF0sIFt0aGlzXSAoYm9vbCBoYXNTZXJ2aWNlcykgeworICAgICAgICAgICAgbV9oYXNS aWNoQ29udGVudFNlcnZpY2VzID0gaGFzU2VydmljZXM7CisgICAgICAgIH0pOworCisgICAgICAg IGRpc3BhdGNoX2dyb3VwX25vdGlmeShzZXJ2aWNlTG9va3VwR3JvdXAuZ2V0KCksIGRpc3BhdGNo X2dldF9tYWluX3F1ZXVlKCksIEJsb2NrUHRyPHZvaWQodm9pZCk+Ojpmcm9tQ2FsbGFibGUoW3Ro aXNdIHsKKyAgICAgICAgICAgIGJvb2wgYXZhaWxhYmxlU2VydmljZXNDaGFuZ2VkID0gKG1fbGFz dFNlbnRIYXNJbWFnZVNlcnZpY2VzICE9IG1faGFzSW1hZ2VTZXJ2aWNlcykgfHwgKG1fbGFzdFNl bnRIYXNTZWxlY3Rpb25TZXJ2aWNlcyAhPSBtX2hhc1NlbGVjdGlvblNlcnZpY2VzKSB8fCAobV9s YXN0U2VudEhhc1JpY2hDb250ZW50U2VydmljZXMgIT0gbV9oYXNSaWNoQ29udGVudFNlcnZpY2Vz KTsKIAotICAgICAgICAgICAgbV9oYXNTZWxlY3Rpb25TZXJ2aWNlcyA9IGhhc1NlbGVjdGlvblNl cnZpY2VzOwotICAgICAgICAgICAgbV9oYXNJbWFnZVNlcnZpY2VzID0gaGFzSW1hZ2VTZXJ2aWNl czsKLSAgICAgICAgICAgIG1faGFzUmljaENvbnRlbnRTZXJ2aWNlcyA9IGhhc1JpY2hDb250ZW50 U2VydmljZXM7CisgICAgICAgICAgICBtX2xhc3RTZW50SGFzU2VsZWN0aW9uU2VydmljZXMgPSBt X2hhc1NlbGVjdGlvblNlcnZpY2VzOworICAgICAgICAgICAgbV9sYXN0U2VudEhhc0ltYWdlU2Vy dmljZXMgPSBtX2hhc0ltYWdlU2VydmljZXM7CisgICAgICAgICAgICBtX2xhc3RTZW50SGFzUmlj aENvbnRlbnRTZXJ2aWNlcyA9IG1faGFzUmljaENvbnRlbnRTZXJ2aWNlczsKIAogICAgICAgICAg ICAgaWYgKGF2YWlsYWJsZVNlcnZpY2VzQ2hhbmdlZCkgewogICAgICAgICAgICAgICAgIGZvciAo YXV0byYgcHJvY2Vzc1Bvb2wgOiBXZWJQcm9jZXNzUG9vbDo6YWxsUHJvY2Vzc1Bvb2xzKCkpCkBA IC0xMTIsNyArMTMyLDcgQEAgdm9pZCBTZXJ2aWNlc0NvbnRyb2xsZXI6OnJlZnJlc2hFeGlzdGlu Z1NlcnZpY2VzKGJvb2wgcmVmcmVzaEltbWVkaWF0ZWx5KQogICAgICAgICAgICAgfQogCiAgICAg ICAgICAgICBtX2hhc1BlbmRpbmdSZWZyZXNoID0gZmFsc2U7Ci0gICAgICAgIH0pOworICAgICAg ICB9KS5nZXQoKSk7CiAgICAgfSk7CiB9CiAK 343425 2018-06-22 23:44:29 -0700 2018-07-23 16:27:34 -0700 Patch bug-186963-20180622234428.patch text/plain 8254 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCA4NGI4NWE4 ZTk3OGQwMmFmZGQ2N2NlYjkzMTY2Mjg5NWEyYTU3MzYzLi4xN2Y1YWQ1ZDA4YTEyYzE5NGNhN2M4 ZTUzODE0NWEyZGQ2YzU1ZjQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAor MjAxOC0wNi0yMiAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAg ICAgICBDcmVhdGluZyBhbmQgbG9hZGluZyBjb250ZW50IGluIGEgV0tXZWJWaWV3IHRyaWdnZXJz IE1haW4gVGhyZWFkIENoZWNrZXIgd2FybmluZ3MgdW5kZXIgU2VydmljZXNDb250cm9sbGVyCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODY5NjMKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQxMzkzNjgyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGFsL3NwaS9tYWMvTlNTaGFyaW5nU2VydmljZVNQ SS5oOgorICAgICAgICBBZGQgdGhlIG5ldyBTUEkuCisKIDIwMTgtMDYtMjEgIFJ5YW4gSGFkZGFk ICA8cnlhbmhhZGRhZEBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBhdHRlbXB0IHRv IGZpeCB0aGUgYnVpbGQgYWZ0ZXIgcjIzMzA1Mi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMzU4MThmMGQ4ZDM0NTE1 YjNjZmJlNWQ2YjgwZWU1MjBjMTkyMzM2Zi4uMjZiM2QwOGJlZGI0MDRiNzI4MDBmMjVmOTM4MjRl Y2E1NTNlYjY2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxOC0wNi0yMiAgVGltIEhv cnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBDcmVhdGluZyBhbmQg bG9hZGluZyBjb250ZW50IGluIGEgV0tXZWJWaWV3IHRyaWdnZXJzIE1haW4gVGhyZWFkIENoZWNr ZXIgd2FybmluZ3MgdW5kZXIgU2VydmljZXNDb250cm9sbGVyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODY5NjMKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzQxMzkzNjgyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogVUlQcm9jZXNzL21hYy9TZXJ2aWNlc0NvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvbWFjL1NlcnZpY2VzQ29udHJvbGxlci5tbToKKyAgICAgICAgKFdlYktpdDo6aGFz Q29tcGF0aWJsZVNlcnZpY2VzRm9ySXRlbXMpOgorICAgICAgICAoV2ViS2l0OjpTZXJ2aWNlc0Nv bnRyb2xsZXI6OnJlZnJlc2hFeGlzdGluZ1NlcnZpY2VzKToKKyAgICAgICAgQWRvcHQgYXN5bmMg U2hhcmVLaXQgU1BJIHRoYXQgaXMgYWN0dWFsbHkgdGhyZWFkLXNhZmUgaW5zdGVhZCBvZiB0aGUg bm90LXF1aXRlLXNhZmUKKyAgICAgICAgc3luY2hyb25vdXMgQVBJLiBSZXF1ZXN0IGFsbCB0aHJl ZSBzZXRzIG9mIHNlcnZpY2VzIGltbWVkaWF0ZWx5LCBhbmQgZGlzcGF0Y2gKKyAgICAgICAgdG8g dGhlIFdlYiBDb250ZW50IHByb2Nlc3NlcyB3aGVuIGFsbCB0aHJlZSBoYXZlIHJldHVybmVkLgor CiAyMDE4LTA2LTIyICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgogCiAgICAgICAg IFJFR1JFU1NJT04gKHIyMzE4NTApOiBDb29raWUgZmlsZSBjYW5ub3QgYmUgcmVhZCBvciB3cml0 dGVuIGJ5IG5ldHdvcmsgcHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3Bh bC9zcGkvbWFjL05TU2hhcmluZ1NlcnZpY2VTUEkuaCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwv c3BpL21hYy9OU1NoYXJpbmdTZXJ2aWNlU1BJLmgKaW5kZXggNGExNzJkYWU4M2RkOWNlYTA3OGUw OWVmN2ViNDRlMjk3NWI5OWU4OC4uNGQzYmI1YzVmMWY3MTk4N2Y4NGM5MTE5MjgyMWFlMzUzYjA3 MWEyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvbWFjL05TU2hhcmlu Z1NlcnZpY2VTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9tYWMvTlNTaGFy aW5nU2VydmljZVNQSS5oCkBAIC00NSw4ICs0NSw5IEBAIHR5cGVkZWYgTlNfT1BUSU9OUyhOU1VJ bnRlZ2VyLCBOU1NoYXJpbmdTZXJ2aWNlTWFzaykgewogICAgIE5TU2hhcmluZ1NlcnZpY2VNYXNr QWxsVHlwZXMgPSAweEZGRkYKIH0gTlNfRU5VTV9BVkFJTEFCTEVfTUFDKDEwXzEwKTsKIAotQGlu dGVyZmFjZSBOU1NoYXJpbmdTZXJ2aWNlIChQcml2YXRlKQorQGludGVyZmFjZSBOU1NoYXJpbmdT ZXJ2aWNlICgpCiArIChOU0FycmF5ICopc2hhcmluZ1NlcnZpY2VzRm9ySXRlbXM6KE5TQXJyYXkg KilpdGVtcyBtYXNrOihOU1NoYXJpbmdTZXJ2aWNlTWFzayltYXNrRm9yRmlsdGVyaW5nOworKyAo dm9pZClzaGFyaW5nU2VydmljZXNGb3JJdGVtczooTlNBcnJheSAqKWl0ZW1zIG1hc2s6KE5TU2hh cmluZ1NlcnZpY2VNYXNrKW1hc2tGb3JGaWx0ZXJpbmcgY29tcGxldGlvbjoodm9pZCheKShOU0Fy cmF5ICopKWNvbXBsZXRpb247CiBAcHJvcGVydHkgKHJlYWRvbmx5KSBOU1NoYXJpbmdTZXJ2aWNl VHlwZSB0eXBlOwogQHByb3BlcnR5IChyZWFkd3JpdGUsIGNvcHkpIE5TU3RyaW5nICpuYW1lOwog QGVuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1NlcnZpY2VzQ29u dHJvbGxlci5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1NlcnZpY2VzQ29udHJvbGxl ci5oCmluZGV4IDY3YzYwZWU5ZGRiYjc2MzQyNzMyNTE2YmIyYzEyMjZkN2JmNDZhMzAuLmRmNWZm OWI5OWEyZGM3ODEwZGNjMTFhMDY1YzA1N2FiZjdlMWQ0MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL21hYy9TZXJ2aWNlc0NvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9tYWMvU2VydmljZXNDb250cm9sbGVyLmgKQEAgLTUyLDkgKzUyLDEzIEBA IHByaXZhdGU6CiAgICAgZGlzcGF0Y2hfcXVldWVfdCBtX3JlZnJlc2hRdWV1ZTsKICAgICBzdGQ6 OmF0b21pY19ib29sIG1faGFzUGVuZGluZ1JlZnJlc2g7CiAKLSAgICBib29sIG1faGFzSW1hZ2VT ZXJ2aWNlczsKLSAgICBib29sIG1faGFzU2VsZWN0aW9uU2VydmljZXM7Ci0gICAgYm9vbCBtX2hh c1JpY2hDb250ZW50U2VydmljZXM7CisgICAgc3RkOjphdG9taWM8Ym9vbD4gbV9oYXNJbWFnZVNl cnZpY2VzOworICAgIHN0ZDo6YXRvbWljPGJvb2w+IG1faGFzU2VsZWN0aW9uU2VydmljZXM7Cisg ICAgc3RkOjphdG9taWM8Ym9vbD4gbV9oYXNSaWNoQ29udGVudFNlcnZpY2VzOworCisgICAgYm9v bCBtX2xhc3RTZW50SGFzSW1hZ2VTZXJ2aWNlczsKKyAgICBib29sIG1fbGFzdFNlbnRIYXNTZWxl Y3Rpb25TZXJ2aWNlczsKKyAgICBib29sIG1fbGFzdFNlbnRIYXNSaWNoQ29udGVudFNlcnZpY2Vz OwogCiAgICAgUmV0YWluUHRyPGlkPiBtX2V4dGVuc2lvbldhdGNoZXI7CiAgICAgUmV0YWluUHRy PGlkPiBtX3VpRXh0ZW5zaW9uV2F0Y2hlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL21hYy9TZXJ2aWNlc0NvbnRyb2xsZXIubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9tYWMvU2VydmljZXNDb250cm9sbGVyLm1tCmluZGV4IDk5MjY0MjliNDI3YTE2OTBhY2YyZGJh NjJjZTVjYzUzNTZlYTJjNTIuLmRlZDFiNDU5ZTFkZmRiYjdmYTI1NTNiY2ExMzllMzBiMDUxZjhh Y2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9TZXJ2aWNlc0NvbnRy b2xsZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1NlcnZpY2VzQ29udHJv bGxlci5tbQpAQCAtMzMsNiArMzMsNyBAQAogI2ltcG9ydCA8cGFsL3NwaS9jb2NvYS9OU0V4dGVu c2lvblNQSS5oPgogI2ltcG9ydCA8cGFsL3NwaS9tYWMvTlNTaGFyaW5nU2VydmljZVBpY2tlclNQ SS5oPgogI2ltcG9ydCA8cGFsL3NwaS9tYWMvTlNTaGFyaW5nU2VydmljZVNQSS5oPgorI2ltcG9y dCA8d3RmL0Jsb2NrUHRyLmg+CiAjaW1wb3J0IDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KIAogbmFt ZXNwYWNlIFdlYktpdCB7CkBAIC02NSw5ICs2NiwyMCBAQCBTZXJ2aWNlc0NvbnRyb2xsZXI6OlNl cnZpY2VzQ29udHJvbGxlcigpCiAjZW5kaWYgLy8gX19MUDY0X18KIH0KIAotc3RhdGljIGJvb2wg aGFzQ29tcGF0aWJsZVNlcnZpY2VzRm9ySXRlbXMoTlNBcnJheSAqaXRlbXMpCitzdGF0aWMgdm9p ZCBoYXNDb21wYXRpYmxlU2VydmljZXNGb3JJdGVtcyhkaXNwYXRjaF9ncm91cF90IGdyb3VwLCBO U0FycmF5ICppdGVtcywgV1RGOjpGdW5jdGlvbjx2b2lkKGJvb2wpPiYmIGNvbXBsZXRpb25IYW5k bGVyKQogewotICAgIHJldHVybiBbTlNTaGFyaW5nU2VydmljZSBzaGFyaW5nU2VydmljZXNGb3JJ dGVtczppdGVtcyBtYXNrOk5TU2hhcmluZ1NlcnZpY2VNYXNrVmlld2VyIHwgTlNTaGFyaW5nU2Vy dmljZU1hc2tFZGl0b3JdLmNvdW50OworICAgIE5TU2hhcmluZ1NlcnZpY2VNYXNrIHNlcnZpY2Vz TWFzayA9IE5TU2hhcmluZ1NlcnZpY2VNYXNrVmlld2VyIHwgTlNTaGFyaW5nU2VydmljZU1hc2tF ZGl0b3I7CisKKyNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTQwMAor ICAgIGRpc3BhdGNoX2dyb3VwX2VudGVyKGdyb3VwKTsKKyAgICBbTlNTaGFyaW5nU2VydmljZSBz aGFyaW5nU2VydmljZXNGb3JJdGVtczppdGVtcyBtYXNrOnNlcnZpY2VzTWFzayBjb21wbGV0aW9u OkJsb2NrUHRyPHZvaWQoTlNBcnJheSAqKT46OmZyb21DYWxsYWJsZShbY29tcGxldGlvbkhhbmRs ZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSwgZ3JvdXBdKE5TQXJyYXkgKnNlcnZpY2Vz KSB7CisgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKHNlcnZpY2VzLmNvdW50KTsKKyAgICAgICAg ZGlzcGF0Y2hfZ3JvdXBfbGVhdmUoZ3JvdXApOworICAgIH0pLmdldCgpXTsKKyNlbHNlCisgICAg VU5VU0VEX1BBUkFNKGdyb3VwKTsKKyAgICBjb21wbGV0aW9uSGFuZGxlcihbTlNTaGFyaW5nU2Vy dmljZSBzaGFyaW5nU2VydmljZXNGb3JJdGVtczppdGVtcyBtYXNrOnNlcnZpY2VzTWFza10uY291 bnQpOworI2VuZGlmCiB9CiAKIHZvaWQgU2VydmljZXNDb250cm9sbGVyOjpyZWZyZXNoRXhpc3Rp bmdTZXJ2aWNlcyhib29sIHJlZnJlc2hJbW1lZGlhdGVseSkKQEAgLTc5LDExICs5MSwxNyBAQCB2 b2lkIFNlcnZpY2VzQ29udHJvbGxlcjo6cmVmcmVzaEV4aXN0aW5nU2VydmljZXMoYm9vbCByZWZy ZXNoSW1tZWRpYXRlbHkpCiAKICAgICBhdXRvIHJlZnJlc2hUaW1lID0gZGlzcGF0Y2hfdGltZShE SVNQQVRDSF9USU1FX05PVywgcmVmcmVzaEltbWVkaWF0ZWx5ID8gMCA6IChpbnQ2NF90KSgxICog TlNFQ19QRVJfU0VDKSk7CiAgICAgZGlzcGF0Y2hfYWZ0ZXIocmVmcmVzaFRpbWUsIG1fcmVmcmVz aFF1ZXVlLCBeeworICAgICAgICBhdXRvIHNlcnZpY2VMb29rdXBHcm91cCA9IGFkb3B0T1NPYmpl Y3QoZGlzcGF0Y2hfZ3JvdXBfY3JlYXRlKCkpOworCiAgICAgICAgIHN0YXRpYyBOZXZlckRlc3Ry b3llZDxOU0ltYWdlICo+IGltYWdlKFtbTlNJbWFnZSBhbGxvY10gaW5pdF0pOwotICAgICAgICBi b29sIGhhc0ltYWdlU2VydmljZXMgPSBoYXNDb21wYXRpYmxlU2VydmljZXNGb3JJdGVtcyhAWyBp bWFnZSBdKTsKKyAgICAgICAgaGFzQ29tcGF0aWJsZVNlcnZpY2VzRm9ySXRlbXMoc2VydmljZUxv b2t1cEdyb3VwLmdldCgpLCBAWyBpbWFnZSBdLCBbdGhpc10gKGJvb2wgaGFzU2VydmljZXMpIHsK KyAgICAgICAgICAgIG1faGFzSW1hZ2VTZXJ2aWNlcyA9IGhhc1NlcnZpY2VzOworICAgICAgICB9 KTsKIAogICAgICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8TlNBdHRyaWJ1dGVkU3RyaW5nICo+ IGF0dHJpYnV0ZWRTdHJpbmcoW1tOU0F0dHJpYnV0ZWRTdHJpbmcgYWxsb2NdIGluaXRXaXRoU3Ry aW5nOkAiYSJdKTsKLSAgICAgICAgYm9vbCBoYXNTZWxlY3Rpb25TZXJ2aWNlcyA9IGhhc0NvbXBh dGlibGVTZXJ2aWNlc0Zvckl0ZW1zKEBbIGF0dHJpYnV0ZWRTdHJpbmcgXSk7CisgICAgICAgIGhh c0NvbXBhdGlibGVTZXJ2aWNlc0Zvckl0ZW1zKHNlcnZpY2VMb29rdXBHcm91cC5nZXQoKSwgQFsg YXR0cmlidXRlZFN0cmluZyBdLCBbdGhpc10gKGJvb2wgaGFzU2VydmljZXMpIHsKKyAgICAgICAg ICAgIG1faGFzU2VsZWN0aW9uU2VydmljZXMgPSBoYXNTZXJ2aWNlczsKKyAgICAgICAgfSk7CiAK ICAgICAgICAgc3RhdGljIE5TQXR0cmlidXRlZFN0cmluZyAqYXR0cmlidXRlZFN0cmluZ1dpdGhS aWNoQ29udGVudDsKICAgICAgICAgaWYgKCFhdHRyaWJ1dGVkU3RyaW5nV2l0aFJpY2hDb250ZW50 KSB7CkBAIC05NywxNCArMTE1LDE2IEBAIHZvaWQgU2VydmljZXNDb250cm9sbGVyOjpyZWZyZXNo RXhpc3RpbmdTZXJ2aWNlcyhib29sIHJlZnJlc2hJbW1lZGlhdGVseSkKICAgICAgICAgICAgIH0p OwogICAgICAgICB9CiAKLSAgICAgICAgYm9vbCBoYXNSaWNoQ29udGVudFNlcnZpY2VzID0gaGFz Q29tcGF0aWJsZVNlcnZpY2VzRm9ySXRlbXMoQFsgYXR0cmlidXRlZFN0cmluZ1dpdGhSaWNoQ29u dGVudCBdKTsKLSAgICAgICAgCi0gICAgICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9t YWluX3F1ZXVlKCksIF57Ci0gICAgICAgICAgICBib29sIGF2YWlsYWJsZVNlcnZpY2VzQ2hhbmdl ZCA9IChoYXNJbWFnZVNlcnZpY2VzICE9IG1faGFzSW1hZ2VTZXJ2aWNlcykgfHwgKGhhc1NlbGVj dGlvblNlcnZpY2VzICE9IG1faGFzU2VsZWN0aW9uU2VydmljZXMpIHx8IChoYXNSaWNoQ29udGVu dFNlcnZpY2VzICE9IG1faGFzUmljaENvbnRlbnRTZXJ2aWNlcyk7CisgICAgICAgIGhhc0NvbXBh dGlibGVTZXJ2aWNlc0Zvckl0ZW1zKHNlcnZpY2VMb29rdXBHcm91cC5nZXQoKSwgQFsgYXR0cmli dXRlZFN0cmluZ1dpdGhSaWNoQ29udGVudCBdLCBbdGhpc10gKGJvb2wgaGFzU2VydmljZXMpIHsK KyAgICAgICAgICAgIG1faGFzUmljaENvbnRlbnRTZXJ2aWNlcyA9IGhhc1NlcnZpY2VzOworICAg ICAgICB9KTsKKworICAgICAgICBkaXNwYXRjaF9ncm91cF9ub3RpZnkoc2VydmljZUxvb2t1cEdy b3VwLmdldCgpLCBkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBCbG9ja1B0cjx2b2lkKHZvaWQp Pjo6ZnJvbUNhbGxhYmxlKFt0aGlzXSB7CisgICAgICAgICAgICBib29sIGF2YWlsYWJsZVNlcnZp Y2VzQ2hhbmdlZCA9IChtX2xhc3RTZW50SGFzSW1hZ2VTZXJ2aWNlcyAhPSBtX2hhc0ltYWdlU2Vy dmljZXMpIHx8IChtX2xhc3RTZW50SGFzU2VsZWN0aW9uU2VydmljZXMgIT0gbV9oYXNTZWxlY3Rp b25TZXJ2aWNlcykgfHwgKG1fbGFzdFNlbnRIYXNSaWNoQ29udGVudFNlcnZpY2VzICE9IG1faGFz UmljaENvbnRlbnRTZXJ2aWNlcyk7CiAKLSAgICAgICAgICAgIG1faGFzU2VsZWN0aW9uU2Vydmlj ZXMgPSBoYXNTZWxlY3Rpb25TZXJ2aWNlczsKLSAgICAgICAgICAgIG1faGFzSW1hZ2VTZXJ2aWNl cyA9IGhhc0ltYWdlU2VydmljZXM7Ci0gICAgICAgICAgICBtX2hhc1JpY2hDb250ZW50U2Vydmlj ZXMgPSBoYXNSaWNoQ29udGVudFNlcnZpY2VzOworICAgICAgICAgICAgbV9sYXN0U2VudEhhc1Nl bGVjdGlvblNlcnZpY2VzID0gbV9oYXNTZWxlY3Rpb25TZXJ2aWNlczsKKyAgICAgICAgICAgIG1f bGFzdFNlbnRIYXNJbWFnZVNlcnZpY2VzID0gbV9oYXNJbWFnZVNlcnZpY2VzOworICAgICAgICAg ICAgbV9sYXN0U2VudEhhc1JpY2hDb250ZW50U2VydmljZXMgPSBtX2hhc1JpY2hDb250ZW50U2Vy dmljZXM7CiAKICAgICAgICAgICAgIGlmIChhdmFpbGFibGVTZXJ2aWNlc0NoYW5nZWQpIHsKICAg ICAgICAgICAgICAgICBmb3IgKGF1dG8mIHByb2Nlc3NQb29sIDogV2ViUHJvY2Vzc1Bvb2w6OmFs bFByb2Nlc3NQb29scygpKQpAQCAtMTEyLDcgKzEzMiw3IEBAIHZvaWQgU2VydmljZXNDb250cm9s bGVyOjpyZWZyZXNoRXhpc3RpbmdTZXJ2aWNlcyhib29sIHJlZnJlc2hJbW1lZGlhdGVseSkKICAg ICAgICAgICAgIH0KIAogICAgICAgICAgICAgbV9oYXNQZW5kaW5nUmVmcmVzaCA9IGZhbHNlOwot ICAgICAgICB9KTsKKyAgICAgICAgfSkuZ2V0KCkpOwogICAgIH0pOwogfQogCg==