191076 2018-10-30 12:39:44 -0700 [PSON] WebPageProxy::receivedNavigationPolicyDecision() should not schedule the new load asynchronously when process-swapping 2018-11-01 13:54:22 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen commit-queue ggaren koivisto rniwa webkit-bug-importer youennf oldest_to_newest 1473358 0 cdumez 2018-10-30 12:39:44 -0700 WebPageProxy::receivedNavigationPolicyDecision() should not schedule the new load asynchronously when process-swapping. The client can request a new load synchronously after answering the policy decision, in which case we'd end up loading the wrong URL. 1473359 1 353397 cdumez 2018-10-30 12:41:06 -0700 Created attachment 353397 Patch 1474138 2 cdumez 2018-11-01 09:45:28 -0700 Ping review? 1474254 3 353397 ggaren 2018-11-01 13:44:23 -0700 Comment on attachment 353397 Patch r=me 1474261 4 353397 cdumez 2018-11-01 13:53:55 -0700 Comment on attachment 353397 Patch Clearing flags on attachment: 353397 Committed r237699: <https://trac.webkit.org/changeset/237699> 1474262 5 cdumez 2018-11-01 13:53:56 -0700 All reviewed patches have been landed. Closing bug. 1474263 6 webkit-bug-importer 2018-11-01 13:54:22 -0700 <rdar://problem/45740845> 353397 2018-10-30 12:41:06 -0700 2018-11-01 13:53:55 -0700 Patch bug-191076-20181030124105.patch text/plain 13848 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3NTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk2MDRkNDExMDc4ODk5N2Rl ZDhhNTQ0NTQ5ZDU2NDEzZWIwZGYzYjkuLjEyZTcxZWJkOTczNGE3ZGE5MDI5YzkxYjBkM2E0YjVj YzJkNjZkNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTgtMTAtMzAgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbUFNPTl0gV2ViUGFnZVByb3h5Ojpy ZWNlaXZlZE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbigpIHNob3VsZCBub3Qgc2NoZWR1bGUgdGhl IG5ldyBsb2FkIGFzeW5jaHJvbm91c2x5IHdoZW4gcHJvY2Vzcy1zd2FwcGluZworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxMDc2CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViUGFnZVByb3h5OjpyZWNl aXZlZE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbigpIHNob3VsZCBub3Qgc2NoZWR1bGUgdGhlIG5l dyBsb2FkIGFzeW5jaHJvbm91c2x5IHdoZW4gcHJvY2Vzcy1zd2FwcGluZy4KKyAgICAgICAgVGhl IGNsaWVudCBjYW4gcmVxdWVzdCBhIG5ldyBsb2FkIHN5bmNocm9ub3VzbHkgYWZ0ZXIgYW5zd2Vy aW5nIHRoZSBwb2xpY3kgZGVjaXNpb24sIGluIHdoaWNoIGNhc2Ugd2UnZCBlbmQgdXAgbG9hZGlu ZworICAgICAgICB0aGUgd3JvbmcgVVJMLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVjZWl2ZWROYXZpZ2F0 aW9uUG9saWN5RGVjaXNpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpwcm9jZXNzRm9yTmF2aWdhdGlv bik6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpwcm9jZXNzRm9yTmF2aWdhdGlv bkludGVybmFsKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaDoKKwogMjAx OC0xMC0zMCAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAg W0Nvb3JkR3JhcGhpY3NdIENvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdDo6Zmx1c2hMYXllcnNBbmRG b3JjZVJlcGFpbnQoKSBzaG91bGQgc2NoZWR1bGUgdGhlIGZsdXNoCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCA4ZWM0YmZkNWE1ZjlkOTJkMTE1ZDJkYTVkZGEx NzhmMjliNTNlYmY5Li45YzBkMDYzZWJlYTIwZTY5MDY1ZDYwNzM3OGU4NjMyMmU5YzQ4ZDk5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTI0OTUsMjUgKzI0 OTUsMjQgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlY2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lz aW9uKFBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24sIEEKICAgICAgICAgaWYgKHBvbGljaWVzLT53 ZWJzaXRlRGF0YVN0b3JlKCkpCiAgICAgICAgICAgICBjaGFuZ2VXZWJzaXRlRGF0YVN0b3JlKHBv bGljaWVzLT53ZWJzaXRlRGF0YVN0b3JlKCktPndlYnNpdGVEYXRhU3RvcmUoKSk7CiAgICAgfQot ICAgIAorCisgICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gcHJvY2Vzc0Zvck5hdmlnYXRpb24gPSBw cm9jZXNzKCk7CiAgICAgaWYgKHBvbGljeUFjdGlvbiA9PSBQb2xpY3lBY3Rpb246OlVzZSAmJiBm cmFtZS5pc01haW5GcmFtZSgpKSB7CiAgICAgICAgIFN0cmluZyByZWFzb247Ci0gICAgICAgIGF1 dG8gcHJvcG9zZWRQcm9jZXNzID0gcHJvY2VzcygpLnByb2Nlc3NQb29sKCkucHJvY2Vzc0Zvck5h dmlnYXRpb24oKnRoaXMsICpuYXZpZ2F0aW9uLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50 LCBwb2xpY3lBY3Rpb24sIHJlYXNvbik7CisgICAgICAgIHByb2Nlc3NGb3JOYXZpZ2F0aW9uID0g cHJvY2VzcygpLnByb2Nlc3NQb29sKCkucHJvY2Vzc0Zvck5hdmlnYXRpb24oKnRoaXMsICpuYXZp Z2F0aW9uLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCByZWFzb24pOwogICAgICAgICBB U1NFUlQoIXJlYXNvbi5pc051bGwoKSk7Ci0gICAgICAgIAotICAgICAgICBpZiAocHJvcG9zZWRQ cm9jZXNzLnB0cigpICE9ICZwcm9jZXNzKCkpIHsKLSAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lG X0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAiJXAgLSBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGlj eUZvck5hdmlnYXRpb25BY3Rpb24sIHN3YXBwaW5nIHByb2Nlc3MgJWkgd2l0aCBwcm9jZXNzICVp IGZvciBuYXZpZ2F0aW9uLCByZWFzb246ICV7cHVibGljfXMiLCB0aGlzLCBwcm9jZXNzSWRlbnRp ZmllcigpLCBwcm9wb3NlZFByb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIHJlYXNvbi51dGY4 KCkuZGF0YSgpKTsKLSAgICAgICAgICAgIExPRyhQcm9jZXNzU3dhcHBpbmcsICIoUHJvY2Vzc1N3 YXBwaW5nKSBTd2l0Y2hpbmcgZnJvbSBwcm9jZXNzICVpIHRvIG5ldyBwcm9jZXNzICglaSkgZm9y IG5hdmlnYXRpb24gJSIgUFJJdTY0ICIgJyVzJyIsIHByb2Nlc3NJZGVudGlmaWVyKCksIHByb3Bv c2VkUHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbmF2aWdhdGlvbi0+bmF2aWdhdGlvbklE KCksIG5hdmlnYXRpb24tPmxvZ2dpbmdTdHJpbmcoKSk7Ci0gICAgICAgICAgICAKLSAgICAgICAg ICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VS ZWYoKnRoaXMpLCBuYXZpZ2F0aW9uID0gbWFrZVJlZigqbmF2aWdhdGlvbiksIHByb3Bvc2VkUHJv Y2VzcyA9IFdURk1vdmUocHJvcG9zZWRQcm9jZXNzKV0oKSBtdXRhYmxlIHsKLSAgICAgICAgICAg ICAgICBjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MobmF2aWdhdGlvbiwgV1RGTW92ZShw cm9wb3NlZFByb2Nlc3MpKTsKLSAgICAgICAgICAgIH0pOworICAgICAgICBpZiAocHJvY2Vzc0Zv ck5hdmlnYXRpb24ucHRyKCkgIT0gJnByb2Nlc3MoKSkgeworICAgICAgICAgICAgcG9saWN5QWN0 aW9uID0gUG9saWN5QWN0aW9uOjpTdXNwZW5kOworICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZf QUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICIlcCAtIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5 Rm9yTmF2aWdhdGlvbkFjdGlvbiwgc3dhcHBpbmcgcHJvY2VzcyAlaSB3aXRoIHByb2Nlc3MgJWkg Zm9yIG5hdmlnYXRpb24sIHJlYXNvbjogJXtwdWJsaWN9cyIsIHRoaXMsIHByb2Nlc3NJZGVudGlm aWVyKCksIHByb2Nlc3NGb3JOYXZpZ2F0aW9uLT5wcm9jZXNzSWRlbnRpZmllcigpLCByZWFzb24u dXRmOCgpLmRhdGEoKSk7CisgICAgICAgICAgICBMT0coUHJvY2Vzc1N3YXBwaW5nLCAiKFByb2Nl c3NTd2FwcGluZykgU3dpdGNoaW5nIGZyb20gcHJvY2VzcyAlaSB0byBuZXcgcHJvY2VzcyAoJWkp IGZvciBuYXZpZ2F0aW9uICUiIFBSSXU2NCAiICclcyciLCBwcm9jZXNzSWRlbnRpZmllcigpLCBw cm9jZXNzRm9yTmF2aWdhdGlvbi0+cHJvY2Vzc0lkZW50aWZpZXIoKSwgbmF2aWdhdGlvbi0+bmF2 aWdhdGlvbklEKCksIG5hdmlnYXRpb24tPmxvZ2dpbmdTdHJpbmcoKSk7CiAgICAgICAgIH0gZWxz ZQogICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICIl cCAtIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbiwga2VlcCB1 c2luZyBwcm9jZXNzICVpIGZvciBuYXZpZ2F0aW9uLCByZWFzb246ICV7cHVibGljfXMiLCB0aGlz LCBwcm9jZXNzSWRlbnRpZmllcigpLCByZWFzb24udXRmOCgpLmRhdGEoKSk7CiAgICAgfQotICAg IAorCiAgICAgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihwb2xpY3lBY3Rpb24sIG5hdmlnYXRpb24s IFdURk1vdmUoZGF0YSksIFdURk1vdmUoc2VuZGVyKSk7CiAKKyAgICBpZiAocHJvY2Vzc0Zvck5h dmlnYXRpb24ucHRyKCkgIT0gJnByb2Nlc3MoKSkKKyAgICAgICAgY29udGludWVOYXZpZ2F0aW9u SW5OZXdQcm9jZXNzKCpuYXZpZ2F0aW9uLCBXVEZNb3ZlKHByb2Nlc3NGb3JOYXZpZ2F0aW9uKSk7 CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpyZWNlaXZlZFBvbGljeURlY2lzaW9uKFBvbGljeUFj dGlvbiBhY3Rpb24sIEFQSTo6TmF2aWdhdGlvbiogbmF2aWdhdGlvbiwgc3RkOjpvcHRpb25hbDxX ZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcywgUmVmPFBvbGljeURlY2lzaW9u U2VuZGVyPiYmIHNlbmRlcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlByb2Nlc3NQb29sLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29s LmNwcAppbmRleCAwNGYxZWFkZDM5MDRlOGVlNmVjNzY5ZmFjYTk3MDAyMzcwYzM3ZWRiLi44NjMz NWEyZjYxZTg2ZjgzNTQzMDBlNzEyM2Q0ZmMyMWM2ZDk3Y2ExIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCkBAIC0yMDcxLDkgKzIwNzEsOSBAQCB2b2lkIFdl YlByb2Nlc3NQb29sOjpyZW1vdmVQcm9jZXNzRnJvbU9yaWdpbkNhY2hlU2V0KFdlYlByb2Nlc3NQ cm94eSYgcHJvY2VzcykKICAgICAgICAgbV9zd2FwcGVkUHJvY2Vzc2VzUGVyUmVnaXN0cmFibGVE b21haW4ucmVtb3ZlKHJlZ2lzdHJhYmxlRG9tYWluKTsKIH0KIAotUmVmPFdlYlByb2Nlc3NQcm94 eT4gV2ViUHJvY2Vzc1Bvb2w6OnByb2Nlc3NGb3JOYXZpZ2F0aW9uKFdlYlBhZ2VQcm94eSYgcGFn ZSwgY29uc3QgQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBQcm9jZXNzU3dhcFJlcXVlc3Rl ZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIFBvbGljeUFjdGlvbiYgYWN0 aW9uLCBTdHJpbmcmIHJlYXNvbikKK1JlZjxXZWJQcm9jZXNzUHJveHk+IFdlYlByb2Nlc3NQb29s Ojpwcm9jZXNzRm9yTmF2aWdhdGlvbihXZWJQYWdlUHJveHkmIHBhZ2UsIGNvbnN0IEFQSTo6TmF2 aWdhdGlvbiYgbmF2aWdhdGlvbiwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNz U3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBTdHJpbmcmIHJlYXNvbikKIHsKLSAgICBhdXRvIHByb2Nl c3MgPSBwcm9jZXNzRm9yTmF2aWdhdGlvbkludGVybmFsKHBhZ2UsIG5hdmlnYXRpb24sIHByb2Nl c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIGFjdGlvbiwgcmVhc29uKTsKKyAgICBhdXRvIHByb2Nl c3MgPSBwcm9jZXNzRm9yTmF2aWdhdGlvbkludGVybmFsKHBhZ2UsIG5hdmlnYXRpb24sIHByb2Nl c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIHJlYXNvbik7CiAKICAgICBpZiAobV9jb25maWd1cmF0 aW9uLT5hbHdheXNLZWVwQW5kUmV1c2VTd2FwcGVkUHJvY2Vzc2VzKCkgJiYgcHJvY2Vzcy5wdHIo KSAhPSAmcGFnZS5wcm9jZXNzKCkpIHsKICAgICAgICAgc3RhdGljIHN0ZDo6b25jZV9mbGFnIG9u Y2VGbGFnOwpAQCAtMjA4OSw3ICsyMDg5LDcgQEAgUmVmPFdlYlByb2Nlc3NQcm94eT4gV2ViUHJv Y2Vzc1Bvb2w6OnByb2Nlc3NGb3JOYXZpZ2F0aW9uKFdlYlBhZ2VQcm94eSYgcGFnZSwgY28KICAg ICByZXR1cm4gcHJvY2VzczsKIH0KIAotUmVmPFdlYlByb2Nlc3NQcm94eT4gV2ViUHJvY2Vzc1Bv b2w6OnByb2Nlc3NGb3JOYXZpZ2F0aW9uSW50ZXJuYWwoV2ViUGFnZVByb3h5JiBwYWdlLCBjb25z dCBBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGll bnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgUG9saWN5QWN0aW9uJiBhY3Rpb24sIFN0 cmluZyYgcmVhc29uKQorUmVmPFdlYlByb2Nlc3NQcm94eT4gV2ViUHJvY2Vzc1Bvb2w6OnByb2Nl c3NGb3JOYXZpZ2F0aW9uSW50ZXJuYWwoV2ViUGFnZVByb3h5JiBwYWdlLCBjb25zdCBBUEk6Ok5h dmlnYXRpb24mIG5hdmlnYXRpb24sIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vz c1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgU3RyaW5nJiByZWFzb24pCiB7CiAgICAgYXV0byYgdGFy Z2V0VVJMID0gbmF2aWdhdGlvbi5jdXJyZW50UmVxdWVzdCgpLnVybCgpOwogCkBAIC0yMTM1LDcg KzIxMzUsNiBAQCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiBXZWJQcm9jZXNzUG9vbDo6cHJvY2Vzc0Zv ck5hdmlnYXRpb25JbnRlcm5hbChXZWJQYWdlUHJveHkmCiAKICAgICBpZiAoYXV0byogYmFja0Zv cndhcmRMaXN0SXRlbSA9IG5hdmlnYXRpb24udGFyZ2V0SXRlbSgpKSB7CiAgICAgICAgIGlmIChh dXRvKiBzdXNwZW5kZWRQYWdlID0gYmFja0ZvcndhcmRMaXN0SXRlbS0+c3VzcGVuZGVkUGFnZSgp KSB7Ci0gICAgICAgICAgICBhY3Rpb24gPSBQb2xpY3lBY3Rpb246OlN1c3BlbmQ7CiAgICAgICAg ICAgICByZWFzb24gPSAiVXNpbmcgdGFyZ2V0IGJhY2svZm9yd2FyZCBpdGVtJ3MgcHJvY2VzcyJf czsKICAgICAgICAgICAgIHJldHVybiBzdXNwZW5kZWRQYWdlLT5wcm9jZXNzKCk7CiAgICAgICAg IH0KQEAgLTIxOTgsOCArMjE5Nyw2IEBAIFJlZjxXZWJQcm9jZXNzUHJveHk+IFdlYlByb2Nlc3NQ b29sOjpwcm9jZXNzRm9yTmF2aWdhdGlvbkludGVybmFsKFdlYlBhZ2VQcm94eSYKICAgICAgICAg fQogICAgIH0KIAotICAgIGFjdGlvbiA9IFBvbGljeUFjdGlvbjo6U3VzcGVuZDsKLQogICAgIGlm IChSZWZQdHI8V2ViUHJvY2Vzc1Byb3h5PiBwcm9jZXNzID0gdHJ5VGFrZVByZXdhcm1lZFByb2Nl c3MocGFnZS53ZWJzaXRlRGF0YVN0b3JlKCkpKSB7CiAgICAgICAgIHRyeVByZXdhcm1XaXRoRG9t YWluSW5mb3JtYXRpb24oKnByb2Nlc3MsIHRhcmdldFVSTCk7CiAgICAgICAgIHJldHVybiBwcm9j ZXNzLnJlbGVhc2VOb25OdWxsKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQcm9jZXNzUG9vbC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bv b2wuaAppbmRleCA5ZDBmNWQ5NWJiYmU4NmY2MDk0MTI0YjQ0ZjZlZTYzZTI1ZTcxOWRlLi4xNDA3 MWYwNTFiMmUxZGFhY2FkYzg0ZTk2OGI3NDgxOGNjMTMwM2EyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlByb2Nlc3NQb29sLmgKQEAgLTQ0MCw3ICs0NDAsNyBAQCBwdWJsaWM6CiAgICAg QmFja2dyb3VuZFdlYlByb2Nlc3NUb2tlbiBiYWNrZ3JvdW5kV2ViUHJvY2Vzc1Rva2VuKCkgY29u c3QgeyByZXR1cm4gQmFja2dyb3VuZFdlYlByb2Nlc3NUb2tlbihtX2JhY2tncm91bmRXZWJQcm9j ZXNzQ291bnRlci5jb3VudCgpKTsgfQogI2VuZGlmCiAKLSAgICBSZWY8V2ViUHJvY2Vzc1Byb3h5 PiBwcm9jZXNzRm9yTmF2aWdhdGlvbihXZWJQYWdlUHJveHkmLCBjb25zdCBBUEk6Ok5hdmlnYXRp b24mLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBXZWJDb3JlOjpQb2xpY3lBY3Rpb24m LCBTdHJpbmcmIHJlYXNvbik7CisgICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gcHJvY2Vzc0Zvck5h dmlnYXRpb24oV2ViUGFnZVByb3h5JiwgY29uc3QgQVBJOjpOYXZpZ2F0aW9uJiwgUHJvY2Vzc1N3 YXBSZXF1ZXN0ZWRCeUNsaWVudCwgU3RyaW5nJiByZWFzb24pOwogCiAgICAgLy8gU3VzcGVuZGVk UGFnZVByb3h5IG1hbmFnZW1lbnQuCiAgICAgdm9pZCBhZGRTdXNwZW5kZWRQYWdlUHJveHkoc3Rk Ojp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJik7CkBAIC00NzIsNyArNDcyLDcgQEAg cHJpdmF0ZToKICAgICB2b2lkIHBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MoV2ViUHJvY2Vz c0NyZWF0aW9uUGFyYW1ldGVycyYpOwogICAgIHZvaWQgcGxhdGZvcm1JbnZhbGlkYXRlQ29udGV4 dCgpOwogCi0gICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gcHJvY2Vzc0Zvck5hdmlnYXRpb25JbnRl cm5hbChXZWJQYWdlUHJveHkmLCBjb25zdCBBUEk6Ok5hdmlnYXRpb24mLCBQcm9jZXNzU3dhcFJl cXVlc3RlZEJ5Q2xpZW50LCBXZWJDb3JlOjpQb2xpY3lBY3Rpb24mLCBTdHJpbmcmIHJlYXNvbik7 CisgICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gcHJvY2Vzc0Zvck5hdmlnYXRpb25JbnRlcm5hbChX ZWJQYWdlUHJveHkmLCBjb25zdCBBUEk6Ok5hdmlnYXRpb24mLCBQcm9jZXNzU3dhcFJlcXVlc3Rl ZEJ5Q2xpZW50LCBTdHJpbmcmIHJlYXNvbik7CiAKICAgICBSZWZQdHI8V2ViUHJvY2Vzc1Byb3h5 PiB0cnlUYWtlUHJld2FybWVkUHJvY2VzcyhXZWJzaXRlRGF0YVN0b3JlJik7CiAKZGlmZiAtLWdp dCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4ODkwYzc2MDQ2ZjM0 MGQ1ZmI1YzRlMWQ1NTI3ZThlNjJmZGY5ZjBhLi5lZDlmZWM3NDMyMmRhYWYzYTQzZGU5ZjYyNjNk OWYzYTg1ZTgxZWU2IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTgtMTAtMzAgIENocmlzIER1bWV6ICA8Y2R1bWV6 QGFwcGxlLmNvbT4KKworICAgICAgICBbUFNPTl0gV2ViUGFnZVByb3h5OjpyZWNlaXZlZE5hdmln YXRpb25Qb2xpY3lEZWNpc2lvbigpIHNob3VsZCBub3Qgc2NoZWR1bGUgdGhlIG5ldyBsb2FkIGFz eW5jaHJvbm91c2x5IHdoZW4gcHJvY2Vzcy1zd2FwcGluZworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxMDc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIEFQSSB0ZXN0IGNvdmVyYWdlLgorCisgICAg ICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdh dGlvbi5tbToKKyAgICAgICAgKC1bUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZSBpbml0XSk6CisgICAg ICAgICgtW1BTT05OYXZpZ2F0aW9uRGVsZWdhdGUgd2ViVmlldzpkZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uQWN0aW9uOmRlY2lzaW9uSGFuZGxlcjpdKToKKwogMjAxOC0xMC0zMCAgQ2xhdWRpbyBT YWF2ZWRyYSAgPGNzYWF2ZWRyYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdW1dQRV0gRml4 ZXMgdG8gdGhlIFB1YmxpY1N1ZmZpeCBpbXBsZW1lbnRhdGlvbgpkaWZmIC0tZ2l0IGEvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5t bSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5h dmlnYXRpb24ubW0KaW5kZXggMWY2MjQ1ODIyNTA3M2I5NjcwODIzM2MyZGM5YWM0NDRlMjQ4Nzk5 Ni4uZGVkY2E1NmNlMjhlYzRhZTA4MDFiOGNjMWVjMmFjYTM2NDhlYmVlNiAxMDA2NDQKLS0tIGEv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdh dGlvbi5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nl c3NTd2FwT25OYXZpZ2F0aW9uLm1tCkBAIC05MSw3ICs5MSw3IEBAIC0gKHZvaWQpdXNlckNvbnRl bnRDb250cm9sbGVyOihXS1VzZXJDb250ZW50Q29udHJvbGxlciAqKXVzZXJDb250ZW50Q29udHJv bGxlciBkCiBAZW5kCiAKIEBpbnRlcmZhY2UgUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZSA6IE5TT2Jq ZWN0IDxXS05hdmlnYXRpb25EZWxlZ2F0ZT4gewotICAgIEBwdWJsaWMgV0tOYXZpZ2F0aW9uQWN0 aW9uUG9saWN5IG5hdmlnYXRpb25BY3Rpb25Qb2xpY3lUb1VzZTsKKyAgICBAcHVibGljIHZvaWQg KF5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKShXS05hdmlnYXRpb25BY3Rpb24gKiwg dm9pZCAoXikoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5KSk7CiB9CiBAZW5kCiAKQEAgLTEwMCw3 ICsxMDAsNiBAQCBAaW1wbGVtZW50YXRpb24gUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZQogLSAoaW5z dGFuY2V0eXBlKSBpbml0CiB7CiAgICAgc2VsZiA9IFtzdXBlciBpbml0XTsKLSAgICBuYXZpZ2F0 aW9uQWN0aW9uUG9saWN5VG9Vc2UgPSBXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3lBbGxvdzsKICAg ICByZXR1cm4gc2VsZjsKIH0KIApAQCAtMTIwLDcgKzExOSwxMCBAQCAtICh2b2lkKXdlYlZpZXc6 KFdLV2ViVmlldyAqKXdlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbjooV0tO YXZpZ2F0aQogewogICAgICsrbnVtYmVyT2ZEZWNpZGVQb2xpY3lDYWxsczsKICAgICBzZWVuUElE cy5hZGQoW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXSk7Ci0gICAgZGVjaXNpb25IYW5k bGVyKG5hdmlnYXRpb25BY3Rpb25Qb2xpY3lUb1VzZSk7CisgICAgaWYgKGRlY2lkZVBvbGljeUZv ck5hdmlnYXRpb25BY3Rpb24pCisgICAgICAgIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rp b24obmF2aWdhdGlvbkFjdGlvbiwgZGVjaXNpb25IYW5kbGVyKTsKKyAgICBlbHNlCisgICAgICAg IGRlY2lzaW9uSGFuZGxlcihXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3lBbGxvdyk7CiB9CiAKIC0g KHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkaWRSZWNlaXZlU2VydmVyUmVkaXJl Y3RGb3JQcm92aXNpb25hbE5hdmlnYXRpb246KFdLTmF2aWdhdGlvbiAqKW5hdmlnYXRpb24KQEAg LTQ0Miw2ICs0NDQsNDcgQEAgVEVTVChQcm9jZXNzU3dhcCwgQmFzaWMpCiAgICAgRVhQRUNUX0VR KG51bWJlck9mRGVjaWRlUG9saWN5Q2FsbHMsIDMpOwogfQogCitURVNUKFByb2Nlc3NTd2FwLCBM b2FkQWZ0ZXJQb2xpY3lEZWNpc2lvbikKK3sKKyAgICBhdXRvIHByb2Nlc3NQb29sQ29uZmlndXJh dGlvbiA9IGFkb3B0TlMoW1tfV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRd KTsKKyAgICBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vzc1N3YXBzT25OYXZp Z2F0aW9uID0gWUVTOworICAgIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKS5wcmV3YXJt c1Byb2Nlc3Nlc0F1dG9tYXRpY2FsbHkgPSBZRVM7CisgICAgYXV0byBwcm9jZXNzUG9vbCA9IGFk b3B0TlMoW1tXS1Byb2Nlc3NQb29sIGFsbG9jXSBfaW5pdFdpdGhDb25maWd1cmF0aW9uOnByb2Nl c3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKV0pOworCisgICAgYXV0byB3ZWJWaWV3Q29uZmlndXJh dGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7Cisg ICAgW3dlYlZpZXdDb25maWd1cmF0aW9uIHNldFByb2Nlc3NQb29sOnByb2Nlc3NQb29sLmdldCgp XTsKKyAgICBhdXRvIGhhbmRsZXIgPSBhZG9wdE5TKFtbUFNPTlNjaGVtZSBhbGxvY10gaW5pdF0p OworICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOmhhbmRsZXIu Z2V0KCkgZm9yVVJMU2NoZW1lOkAiUFNPTiJdOworCisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHRO UyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwg NjAwKSBjb25maWd1cmF0aW9uOndlYlZpZXdDb25maWd1cmF0aW9uLmdldCgpXSk7CisgICAgYXV0 byBuYXZpZ2F0aW9uRGVsZWdhdGUgPSBhZG9wdE5TKFtbUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZSBh bGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpuYXZpZ2F0 aW9uRGVsZWdhdGUuZ2V0KCldOworCisgICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJM UmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAInBzb246Ly93d3cu d2Via2l0Lm9yZy9tYWluMS5odG1sIl1dOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVl c3RdOworCisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0g ZmFsc2U7CisKKyAgICBuYXZpZ2F0aW9uRGVsZWdhdGUtPmRlY2lkZVBvbGljeUZvck5hdmlnYXRp b25BY3Rpb24gPSBeKFdLTmF2aWdhdGlvbkFjdGlvbiAqLCB2b2lkICheZGVjaXNpb25IYW5kbGVy KShXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3kpKSB7CisgICAgICAgIGRlY2lzaW9uSGFuZGxlcihX S05hdmlnYXRpb25BY3Rpb25Qb2xpY3lBbGxvdyk7CisKKyAgICAgICAgLy8gU3luY2hyb25vdXNs eSBuYXZpZ2F0ZSBhZ2FpbiByaWdodCBhZnRlciBhbnN3ZXJpbmcgdGhlIHBvbGljeSBkZWxlZ2F0 ZSBmb3IgdGhlIHByZXZpb3VzIG5hdmlnYXRpb24uCisgICAgICAgIG5hdmlnYXRpb25EZWxlZ2F0 ZS0+ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbiA9IG5pbDsKKyAgICAgICAgTlNVUkxS ZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJM V2l0aFN0cmluZzpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluMi5odG1sIl1dOworICAgICAg ICBbd2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKKyAgICB9OworCisgICAgcmVxdWVzdCA9 IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJwc29u Oi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0bWwiXV07CisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6 cmVxdWVzdF07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRv bmUgPSBmYWxzZTsKKworICAgIC8vIFNob3VsZCBuYXZpZ2F0ZSB0byBwc29uOi8vd3d3LndlYmtp dC5vcmcvbWFpbjIuaHRtbCBhbmQgbm90IHBzb246Ly93d3cuYXBwbGUuY29tL21haW4uaHRtbC4K KyAgICBFWFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbjIuaHRtbCIs IFtbd2ViVmlldyBVUkxdIGFic29sdXRlU3RyaW5nXSk7Cit9CisKIFRFU1QoUHJvY2Vzc1N3YXAs IE5vU3dhcHBpbmdGb3JlVExEUGx1czIpCiB7CiAgICAgYXV0byBwcm9jZXNzUG9vbENvbmZpZ3Vy YXRpb24gPSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0 XSk7CkBAIC0yMzA0LDcgKzIzNDcsOSBAQCBURVNUKFByb2Nlc3NTd2FwLCBBUElDb250cm9sbGVk UHJvY2Vzc1N3YXBwaW5nKQogCiAgICAgLy8gTmF2aWdhdGluZyBmcm9tIHRoZSBhYm92ZSBVUkwg dG8gdGhpcyBVUkwgbm9ybWFsbHkgc2hvdWxkIG5vdCBwcm9jZXNzIHN3YXAsCiAgICAgLy8gYnV0 IHdlJ2xsIGV4cGxpY2l0bHkgYXNrIGZvciBhIHN3YXAuCi0gICAgbmF2aWdhdGlvbkRlbGVnYXRl LT5uYXZpZ2F0aW9uQWN0aW9uUG9saWN5VG9Vc2UgPSBfV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5 QWxsb3dJbk5ld1Byb2Nlc3M7CisgICAgbmF2aWdhdGlvbkRlbGVnYXRlLT5kZWNpZGVQb2xpY3lG b3JOYXZpZ2F0aW9uQWN0aW9uID0gXihXS05hdmlnYXRpb25BY3Rpb24gKiwgdm9pZCAoXmRlY2lz aW9uSGFuZGxlcikoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5KSkgeworICAgICAgICBkZWNpc2lv bkhhbmRsZXIoX1dLTmF2aWdhdGlvbkFjdGlvblBvbGljeUFsbG93SW5OZXdQcm9jZXNzKTsKKyAg ICB9OwogICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhV Ukw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJwc29uOi8vd3d3LndlYml0Lm9yZy8zIl1dXTsKICAg ICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOwogICAgIGRvbmUgPSBmYWxzZTsK