177966 2017-10-05 13:53:35 -0700 Add ObjC equivalent of WKPageNavigationClient.didChangeBackForwardList 2017-10-05 16:19:58 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen thorton webkit-bug-importer oldest_to_newest 1357233 0 achristensen 2017-10-05 13:53:35 -0700 Add ObjC equivalent of WKPageNavigationClient.didChangeBackForwardList 1357234 1 322913 achristensen 2017-10-05 13:54:44 -0700 Created attachment 322913 Patch 1357319 2 achristensen 2017-10-05 16:18:51 -0700 http://trac.webkit.org/r222944 1357320 3 webkit-bug-importer 2017-10-05 16:19:58 -0700 <rdar://problem/34846138> 322913 2017-10-05 13:54:44 -0700 2017-10-05 16:05:07 -0700 Patch bug-177966-20171005135443.patch text/plain 20638 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjI4OTgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDE3LTEwLTA1ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIE9iakMgZXF1 aXZhbGVudCBvZiBXS1BhZ2VOYXZpZ2F0aW9uQ2xpZW50LmRpZENoYW5nZUJhY2tGb3J3YXJkTGlz dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc3OTY2 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMjM4NzEzNT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJTmF2aWdhdGlv bkNsaWVudC5oOgorICAgICAgICAoQVBJOjpOYXZpZ2F0aW9uQ2xpZW50OjpkaWRDaGFuZ2VCYWNr Rm9yd2FyZExpc3QpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9u RGVsZWdhdGVQcml2YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25T dGF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW06Cisg ICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRpb25TdGF0ZTo6c2V0TmF2aWdhdGlvbkRlbGVnYXRlKToK KyAgICAgICAgKFdlYktpdDo6TmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpkaWRG YWlsVG9Jbml0aWFsaXplUGx1Z0luKToKKyAgICAgICAgKFdlYktpdDo6TmF2aWdhdGlvblN0YXRl OjpOYXZpZ2F0aW9uQ2xpZW50OjpkaWRDaGFuZ2VCYWNrRm9yd2FyZExpc3QpOgorICAgICAgICAo V2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25DbGllbnQ6OndpbGxQZXJmb3JtQ2xp ZW50UmVkaXJlY3QpOgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRp b25DbGllbnQ6OmRpZENhbmNlbENsaWVudFJlZGlyZWN0KToKKyAgICAgICAgKFdlYktpdDo6TmF2 aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpyZW5kZXJpbmdQcm9ncmVzc0RpZENoYW5n ZSk6CisgICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6 Y2FuQXV0aGVudGljYXRlQWdhaW5zdFByb3RlY3Rpb25TcGFjZSk6CisgICAgICAgIChXZWJLaXQ6 Ok5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6cHJvY2Vzc0RpZFRlcm1pbmF0ZSk6 CisgICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6cHJv Y2Vzc0RpZEJlY29tZVJlc3BvbnNpdmUpOgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3Rh dGU6Ok5hdmlnYXRpb25DbGllbnQ6OnByb2Nlc3NEaWRCZWNvbWVVbnJlc3BvbnNpdmUpOgorICAg ICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25DbGllbnQ6OndlYkNyeXB0 b01hc3RlcktleSk6CisgICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlv bkNsaWVudDo6ZGlkRmluaXNoTG9hZEZvclF1aWNrTG9va0RvY3VtZW50SW5NYWluRnJhbWUpOgor ICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6Okhpc3RvcnlDbGllbnQ6OmRpZE5hdmln YXRlV2l0aE5hdmlnYXRpb25EYXRhKToKKyAgICAgICAgKFdlYktpdDo6TmF2aWdhdGlvblN0YXRl OjpIaXN0b3J5Q2xpZW50OjpkaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3QpOgorICAgICAgICAoV2Vi S2l0OjpOYXZpZ2F0aW9uU3RhdGU6Okhpc3RvcnlDbGllbnQ6OmRpZFBlcmZvcm1TZXJ2ZXJSZWRp cmVjdCk6CisgICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRpb25TdGF0ZTo6SGlzdG9yeUNsaWVudDo6 ZGlkVXBkYXRlSGlzdG9yeVRpdGxlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRDaGFuZ2VCYWNrRm9yd2Fy ZExpc3QpOgorCiAyMDE3LTEwLTA0ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CiAKICAgICAgICAgU3RvcCBsaW5raW5nIHdpdGggV2ViS2l0U3lzdGVtSW50ZXJm YWNlCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlz aW9uIDIyMjg5OCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTExOTYsNyArMTE5Niw4IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpk aWRDaGFuZ2VCYWNrRm9yd2FyZEwKIHsKICAgICBQYWdlQ2xpZW50UHJvdGVjdG9yIHByb3RlY3Rv cihtX3BhZ2VDbGllbnQpOwogCi0gICAgbV9sb2FkZXJDbGllbnQtPmRpZENoYW5nZUJhY2tGb3J3 YXJkTGlzdCgqdGhpcywgYWRkZWQsIFdURk1vdmUocmVtb3ZlZCkpOworICAgIGlmICghbV9uYXZp Z2F0aW9uQ2xpZW50IHx8ICFtX25hdmlnYXRpb25DbGllbnQtPmRpZENoYW5nZUJhY2tGb3J3YXJk TGlzdCgqdGhpcywgYWRkZWQsIHJlbW92ZWQpKQorICAgICAgICBtX2xvYWRlckNsaWVudC0+ZGlk Q2hhbmdlQmFja0ZvcndhcmRMaXN0KCp0aGlzLCBhZGRlZCwgV1RGTW92ZShyZW1vdmVkKSk7CiAK ICAgICBhdXRvIHRyYW5zYWN0aW9uID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9uKCk7CiAK SW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElOYXZpZ2F0aW9uQ2xpZW50LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSU5hdmlnYXRpb25D bGllbnQuaAkocmV2aXNpb24gMjIyODk4KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0FQSU5hdmlnYXRpb25DbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMTI3LDYgKzEyNyw3IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgd2lsbEVuZE5hdmlnYXRpb25HZXN0dXJlKFdlYktp dDo6V2ViUGFnZVByb3h5JiwgYm9vbCB3aWxsTmF2aWdhdGUsIFdlYktpdDo6V2ViQmFja0Zvcndh cmRMaXN0SXRlbSYpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBkaWRFbmROYXZpZ2F0aW9uR2VzdHVy ZShXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIGJvb2wgd2lsbE5hdmlnYXRlLCBXZWJLaXQ6OldlYkJh Y2tGb3J3YXJkTGlzdEl0ZW0mKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgZGlkUmVtb3ZlTmF2aWdh dGlvbkdlc3R1cmVTbmFwc2hvdChXZWJLaXQ6OldlYlBhZ2VQcm94eSYpIHsgfQorICAgIHZpcnR1 YWwgYm9vbCBkaWRDaGFuZ2VCYWNrRm9yd2FyZExpc3QoV2ViS2l0OjpXZWJQYWdlUHJveHkmLCBX ZWJLaXQ6OldlYkJhY2tGb3J3YXJkTGlzdEl0ZW0qLCBjb25zdCBWZWN0b3I8UmVmPFdlYktpdDo6 V2ViQmFja0ZvcndhcmRMaXN0SXRlbT4+JikgeyByZXR1cm4gZmFsc2U7IH0KIH07CiAKIH0gLy8g bmFtZXNwYWNlIEFQSQpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dL TmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25EZWxlZ2F0ZVByaXZhdGUuaAkocmV2aXNp b24gMjIyODk4KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdh dGlvbkRlbGVnYXRlUHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC04OSw2ICs4OSw3IEBAIHN0 YXRpYyBjb25zdCBXS05hdmlnYXRpb25SZXNwb25zZVBvbGljeSAKIC0gKHZvaWQpX3dlYlZpZXc6 KFdLV2ViVmlldyAqKXdlYlZpZXcgcmVzb2x2ZVdlYkdMTG9hZFBvbGljeUZvclVSTDooTlNVUkwg Kil1cmwgZGVjaXNpb25IYW5kbGVyOih2b2lkICheKShfV0tXZWJHTExvYWRQb2xpY3kpKWRlY2lz aW9uSGFuZGxlciBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSk7CiAtICh2b2lk KV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHdpbGxHb1RvQmFja0ZvcndhcmRMaXN0SXRl bTooV0tCYWNrRm9yd2FyZExpc3RJdGVtICopaXRlbSBpblBhZ2VDYWNoZTooQk9PTClpblBhZ2VD YWNoZSBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSk7CiAtICh2b2lkKV93ZWJW aWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGRpZEZhaWxUb0luaXRpYWxpemVQbHVnSW5XaXRoSW5m bzooTlNEaWN0aW9uYXJ5ICopaW5mbyBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJB KSk7CistICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGJhY2tGb3J3YXJkTGlz dEl0ZW1BZGRlZDooV0tCYWNrRm9yd2FyZExpc3RJdGVtICopaXRlbUFkZGVkIHJlbW92ZWQ6KE5T QXJyYXk8V0tCYWNrRm9yd2FyZExpc3RJdGVtICo+ICopaXRlbXNSZW1vdmVkIFdLX0FQSV9BVkFJ TEFCTEUobWFjb3N4KFdLX01BQ19UQkEpKTsKICNlbmRpZgogCiBAZW5kCkluZGV4OiBTb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaAkocmV2aXNpb24g MjIyODk4KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRl LmgJKHdvcmtpbmcgY29weSkKQEAgLTEyMCw3ICsxMjAsOCBAQCBwcml2YXRlOgogICAgICAgICB2 b2lkIHdlYkdMTG9hZFBvbGljeShXZWJQYWdlUHJveHkmLCBjb25zdCBXZWJDb3JlOjpVUkwmLCBX VEY6OkZ1bmN0aW9uPHZvaWQoV2ViQ29yZTo6V2ViR0xMb2FkUG9saWN5KT4mJiBjb21wbGV0aW9u SGFuZGxlcikgY29uc3QgZmluYWw7CiAgICAgICAgIHZvaWQgcmVzb2x2ZVdlYkdMTG9hZFBvbGlj eShXZWJQYWdlUHJveHkmLCBjb25zdCBXZWJDb3JlOjpVUkwmLCBXVEY6OkZ1bmN0aW9uPHZvaWQo V2ViQ29yZTo6V2ViR0xMb2FkUG9saWN5KT4mJiBjb21wbGV0aW9uSGFuZGxlcikgY29uc3QgZmlu YWw7CiAgICAgICAgIGJvb2wgd2lsbEdvVG9CYWNrRm9yd2FyZExpc3RJdGVtKFdlYlBhZ2VQcm94 eSYsIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mLCBib29sIGluUGFnZUNhY2hlLCBBUEk6Ok9iamVj dCopIGZpbmFsOwotICAgICAgICBib29sIGRpZEZhaWxUb0luaXRpYWxpemVQbHVnSW4oV2ViS2l0 OjpXZWJQYWdlUHJveHkmLCBBUEk6OkRpY3Rpb25hcnkmKSBmaW5hbDsKKyAgICAgICAgYm9vbCBk aWRGYWlsVG9Jbml0aWFsaXplUGx1Z0luKFdlYlBhZ2VQcm94eSYsIEFQSTo6RGljdGlvbmFyeSYp IGZpbmFsOworICAgICAgICBib29sIGRpZENoYW5nZUJhY2tGb3J3YXJkTGlzdChXZWJQYWdlUHJv eHkmLCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiwgY29uc3QgVmVjdG9yPFJlZjxXZWJCYWNrRm9y d2FyZExpc3RJdGVtPj4mKSBmaW5hbDsKICNlbmRpZgogCiAgICAgICAgIHZvaWQgY29udGVudFJ1 bGVMaXN0Tm90aWZpY2F0aW9uKFdlYlBhZ2VQcm94eSYsIFdlYkNvcmU6OlVSTCYmLCBWZWN0b3I8 U3RyaW5nPiYmLCBWZWN0b3I8U3RyaW5nPiYmKSBmaW5hbDsKQEAgLTIxNCw2ICsyMTUsNyBAQCBw cml2YXRlOgogI2lmIFBMQVRGT1JNKE1BQykKICAgICAgICAgYm9vbCB3ZWJWaWV3V2ViR0xMb2Fk UG9saWN5Rm9yVVJMIDogMTsKICAgICAgICAgYm9vbCB3ZWJWaWV3UmVzb2x2ZVdlYkdMTG9hZFBv bGljeUZvclVSTCA6IDE7CisgICAgICAgIGJvb2wgd2ViVmlld0JhY2tGb3J3YXJkTGlzdEl0ZW1B ZGRlZFJlbW92ZWQgOiAxOwogICAgICAgICBib29sIHdlYlZpZXdEaWRGYWlsVG9Jbml0aWFsaXpl UGx1Z0luV2l0aEluZm8gOiAxOwogICAgICAgICBib29sIHdlYlZpZXdXaWxsR29Ub0JhY2tGb3J3 YXJkTGlzdEl0ZW1JblBhZ2VDYWNoZSA6IDE7CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0JKHJldmlzaW9uIDIyMjg5 OCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQko d29ya2luZyBjb3B5KQpAQCAtMTgwLDYgKzE4MCw3IEBAIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpz ZXROYXZpZ2F0aW9uRGVsZWcKICAgICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmll d1Jlc29sdmVXZWJHTExvYWRQb2xpY3lGb3JVUkwgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVj dG9yOkBzZWxlY3Rvcihfd2ViVmlldzpyZXNvbHZlV2ViR0xMb2FkUG9saWN5Rm9yVVJMOmRlY2lz aW9uSGFuZGxlcjopXTsKICAgICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1dp bGxHb1RvQmFja0ZvcndhcmRMaXN0SXRlbUluUGFnZUNhY2hlID0gW2RlbGVnYXRlIHJlc3BvbmRz VG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6d2lsbEdvVG9CYWNrRm9yd2FyZExpc3RJdGVt OmluUGFnZUNhY2hlOildOwogICAgIG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3 RGlkRmFpbFRvSW5pdGlhbGl6ZVBsdWdJbldpdGhJbmZvID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9T ZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6ZGlkRmFpbFRvSW5pdGlhbGl6ZVBsdWdJbldpdGhJ bmZvOildOworICAgIG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3QmFja0Zvcndh cmRMaXN0SXRlbUFkZGVkUmVtb3ZlZCA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNl bGVjdG9yKF93ZWJWaWV3OmJhY2tGb3J3YXJkTGlzdEl0ZW1BZGRlZDpyZW1vdmVkOildOwogI2Vu ZGlmCiB9CiAKQEAgLTI5NCw3ICsyOTUsNyBAQCBOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25D bGllbnQ6On5OYXZpCiB9CiAKICNpZiBQTEFURk9STShNQUMpCi1ib29sIE5hdmlnYXRpb25TdGF0 ZTo6TmF2aWdhdGlvbkNsaWVudDo6ZGlkRmFpbFRvSW5pdGlhbGl6ZVBsdWdJbihXZWJLaXQ6Oldl YlBhZ2VQcm94eSYsIEFQSTo6RGljdGlvbmFyeSYgaW5mbykKK2Jvb2wgTmF2aWdhdGlvblN0YXRl OjpOYXZpZ2F0aW9uQ2xpZW50OjpkaWRGYWlsVG9Jbml0aWFsaXplUGx1Z0luKFdlYlBhZ2VQcm94 eSYsIEFQSTo6RGljdGlvbmFyeSYgaW5mbykKIHsKICAgICBpZiAoIW1fbmF2aWdhdGlvblN0YXRl Lm1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGlkRmFpbFRvSW5pdGlhbGl6ZVBs dWdJbldpdGhJbmZvKQogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC0zNTYsNiArMzU3LDI1IEBA IHZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjoKICAgICB9KS5nZXQoKV07 CiB9CiAKK2Jvb2wgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpkaWRDaGFuZ2VC YWNrRm9yd2FyZExpc3QoV2ViUGFnZVByb3h5JiwgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSogYWRk ZWQsIGNvbnN0IFZlY3RvcjxSZWY8V2ViQmFja0ZvcndhcmRMaXN0SXRlbT4+JiByZW1vdmVkKQor eworICAgIGlmICghbV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2Rz LndlYlZpZXdCYWNrRm9yd2FyZExpc3RJdGVtQWRkZWRSZW1vdmVkKQorICAgICAgICByZXR1cm4g ZmFsc2U7CisKKyAgICBhdXRvIG5hdmlnYXRpb25EZWxlZ2F0ZSA9IG1fbmF2aWdhdGlvblN0YXRl Lm1fbmF2aWdhdGlvbkRlbGVnYXRlLmdldCgpOworICAgIGlmICghbmF2aWdhdGlvbkRlbGVnYXRl KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBOU011dGFibGVBcnJheTxXS0JhY2tGb3J3 YXJkTGlzdEl0ZW0gKj4gKnJlbW92ZWRJdGVtcyA9IG5pbDsKKyAgICBpZiAocmVtb3ZlZC5zaXpl KCkpIHsKKyAgICAgICAgcmVtb3ZlZEl0ZW1zID0gW1tbTlNNdXRhYmxlQXJyYXkgYWxsb2NdIGlu aXRXaXRoQ2FwYWNpdHk6cmVtb3ZlZC5zaXplKCldIGF1dG9yZWxlYXNlXTsKKyAgICAgICAgZm9y IChhdXRvJiByZW1vdmVkSXRlbSA6IHJlbW92ZWQpCisgICAgICAgICAgICBbcmVtb3ZlZEl0ZW1z IGFkZE9iamVjdDp3cmFwcGVyKHJlbW92ZWRJdGVtLmdldCgpKV07CisgICAgfQorICAgIFsoaWQg PFdLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZT4pbmF2aWdhdGlvbkRlbGVnYXRlIF93ZWJWaWV3 Om1fbmF2aWdhdGlvblN0YXRlLm1fd2ViVmlldyBiYWNrRm9yd2FyZExpc3RJdGVtQWRkZWQ6YWRk ZWQgPyB3cmFwcGVyKCphZGRlZCkgOiBuaWwgcmVtb3ZlZDpyZW1vdmVkSXRlbXNdOworICAgIHJl dHVybiB0cnVlOworfQorCiBib29sIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6 d2lsbEdvVG9CYWNrRm9yd2FyZExpc3RJdGVtKFdlYlBhZ2VQcm94eSYsIFdlYkJhY2tGb3J3YXJk TGlzdEl0ZW0mIGl0ZW0sIGJvb2wgaW5QYWdlQ2FjaGUsIEFQSTo6T2JqZWN0KikKIHsKICAgICBp ZiAoIW1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3 V2lsbEdvVG9CYWNrRm9yd2FyZExpc3RJdGVtSW5QYWdlQ2FjaGUpCkBAIC01OTcsNyArNjE3LDcg QEAgdm9pZCBOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25DbGllbnQ6OgogICAgIFtuYXZpZ2F0 aW9uRGVsZWdhdGUgd2ViVmlldzptX25hdmlnYXRpb25TdGF0ZS5tX3dlYlZpZXcgZGlkUmVjZWl2 ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxOYXZpZ2F0aW9uOndrTmF2aWdhdGlvbl07CiB9 CiAKLXZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50Ojp3aWxsUGVyZm9ybUNs aWVudFJlZGlyZWN0KFdlYktpdDo6V2ViUGFnZVByb3h5JiBwYWdlLCBjb25zdCBXVEY6OlN0cmlu ZyYgdXJsU3RyaW5nLCBkb3VibGUgZGVsYXkpCit2b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdh dGlvbkNsaWVudDo6d2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdChXZWJQYWdlUHJveHkmIHBhZ2Us IGNvbnN0IFdURjo6U3RyaW5nJiB1cmxTdHJpbmcsIGRvdWJsZSBkZWxheSkKIHsKICAgICBpZiAo IW1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3V2ls bFBlcmZvcm1DbGllbnRSZWRpcmVjdCkKICAgICAgICAgcmV0dXJuOwpAQCAtNjExLDcgKzYzMSw3 IEBAIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjoKICAgICBbc3RhdGlj X2Nhc3Q8aWQgPFdLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZT4+KG5hdmlnYXRpb25EZWxlZ2F0 ZSkgX3dlYlZpZXc6bV9uYXZpZ2F0aW9uU3RhdGUubV93ZWJWaWV3IHdpbGxQZXJmb3JtQ2xpZW50 UmVkaXJlY3RUb1VSTDp1cmwgZGVsYXk6ZGVsYXldOwogfQogCi12b2lkIE5hdmlnYXRpb25TdGF0 ZTo6TmF2aWdhdGlvbkNsaWVudDo6ZGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3QoV2ViS2l0OjpXZWJQ YWdlUHJveHkmIHBhZ2UpCit2b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6 ZGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3QoV2ViUGFnZVByb3h5JiBwYWdlKQogewogICAgIGlmICgh bV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdEaWRD YW5jZWxDbGllbnRSZWRpcmVjdCkKICAgICAgICAgcmV0dXJuOwpAQCAtNzYyLDcgKzc4Miw3IEBA IHZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjoKICAgICBbc3RhdGljX2Nh c3Q8aWQgPFdLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZT4+KG5hdmlnYXRpb25EZWxlZ2F0ZS5n ZXQoKSkgX3dlYlZpZXc6bV9uYXZpZ2F0aW9uU3RhdGUubV93ZWJWaWV3IG5hdmlnYXRpb246d2tO YXZpZ2F0aW9uIGRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb246dG9XS1NhbWVEb2N1bWVudE5hdmln YXRpb25UeXBlKG5hdmlnYXRpb25UeXBlKV07CiB9CiAKLXZvaWQgTmF2aWdhdGlvblN0YXRlOjpO YXZpZ2F0aW9uQ2xpZW50OjpyZW5kZXJpbmdQcm9ncmVzc0RpZENoYW5nZShXZWJLaXQ6OldlYlBh Z2VQcm94eSYsIFdlYkNvcmU6OkxheW91dE1pbGVzdG9uZXMgbGF5b3V0TWlsZXN0b25lcykKK3Zv aWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpyZW5kZXJpbmdQcm9ncmVzc0Rp ZENoYW5nZShXZWJQYWdlUHJveHkmLCBXZWJDb3JlOjpMYXlvdXRNaWxlc3RvbmVzIGxheW91dE1p bGVzdG9uZXMpCiB7CiAgICAgaWYgKCFtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxl Z2F0ZU1ldGhvZHMud2ViVmlld1JlbmRlcmluZ1Byb2dyZXNzRGlkQ2hhbmdlKQogICAgICAgICBy ZXR1cm47CkBAIC03NzQsNyArNzk0LDcgQEAgdm9pZCBOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRp b25DbGllbnQ6OgogICAgIFtzdGF0aWNfY2FzdDxpZCA8V0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2 YXRlPj4obmF2aWdhdGlvbkRlbGVnYXRlLmdldCgpKSBfd2ViVmlldzptX25hdmlnYXRpb25TdGF0 ZS5tX3dlYlZpZXcgcmVuZGVyaW5nUHJvZ3Jlc3NEaWRDaGFuZ2U6cmVuZGVyaW5nUHJvZ3Jlc3NF dmVudHMobGF5b3V0TWlsZXN0b25lcyldOwogfQogCi1ib29sIE5hdmlnYXRpb25TdGF0ZTo6TmF2 aWdhdGlvbkNsaWVudDo6Y2FuQXV0aGVudGljYXRlQWdhaW5zdFByb3RlY3Rpb25TcGFjZShXZWJL aXQ6OldlYlBhZ2VQcm94eSYsIFdlYktpdDo6V2ViUHJvdGVjdGlvblNwYWNlKiBwcm90ZWN0aW9u U3BhY2UpCitib29sIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6Y2FuQXV0aGVu dGljYXRlQWdhaW5zdFByb3RlY3Rpb25TcGFjZShXZWJQYWdlUHJveHkmLCBXZWJQcm90ZWN0aW9u U3BhY2UqIHByb3RlY3Rpb25TcGFjZSkKIHsKICAgICBpZiAobV9uYXZpZ2F0aW9uU3RhdGUubV9u YXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdEaWRSZWNlaXZlQXV0aGVudGljYXRpb25D aGFsbGVuZ2VDb21wbGV0aW9uSGFuZGxlcikKICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC04NDYs NyArODY2LDcgQEAgdm9pZCBOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25DbGllbnQ6OgogICAg IFtzdGF0aWNfY2FzdDxpZCA8V0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlPj4obmF2aWdhdGlv bkRlbGVnYXRlLmdldCgpKSBfd2ViVmlldzptX25hdmlnYXRpb25TdGF0ZS5tX3dlYlZpZXcgZGlk UmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOndyYXBwZXIoKmF1dGhlbnRpY2F0aW9uQ2hh bGxlbmdlKV07CiB9CiAKLXZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50Ojpw cm9jZXNzRGlkVGVybWluYXRlKFdlYktpdDo6V2ViUGFnZVByb3h5JiBwYWdlLCBXZWJLaXQ6OlBy b2Nlc3NUZXJtaW5hdGlvblJlYXNvbikKK3ZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9u Q2xpZW50Ojpwcm9jZXNzRGlkVGVybWluYXRlKFdlYlBhZ2VQcm94eSYgcGFnZSwgUHJvY2Vzc1Rl cm1pbmF0aW9uUmVhc29uKQogewogICAgIGlmICghbV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0 aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdXZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0ZSAm JiAhbV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdX ZWJQcm9jZXNzRGlkQ3Jhc2gpCiAgICAgICAgIHJldHVybjsKQEAgLTg2NSw3ICs4ODUsNyBAQCB2 b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6CiAgICAgICAgIFtzdGF0aWNf Y2FzdDxpZCA8V0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlPj4obmF2aWdhdGlvbkRlbGVnYXRl LmdldCgpKSBfd2ViVmlld1dlYlByb2Nlc3NEaWRDcmFzaDptX25hdmlnYXRpb25TdGF0ZS5tX3dl YlZpZXddOwogfQogCi12b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6cHJv Y2Vzc0RpZEJlY29tZVJlc3BvbnNpdmUoV2ViS2l0OjpXZWJQYWdlUHJveHkmIHBhZ2UpCit2b2lk IE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6cHJvY2Vzc0RpZEJlY29tZVJlc3Bv bnNpdmUoV2ViUGFnZVByb3h5JiBwYWdlKQogewogICAgIGlmICghbV9uYXZpZ2F0aW9uU3RhdGUu bV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdXZWJQcm9jZXNzRGlkQmVjb21lUmVz cG9uc2l2ZSkKICAgICAgICAgcmV0dXJuOwpAQCAtODc3LDcgKzg5Nyw3IEBAIHZvaWQgTmF2aWdh dGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjoKICAgICBbc3RhdGljX2Nhc3Q8aWQgPFdLTmF2 aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZT4+KG5hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKSkgX3dlYlZp ZXdXZWJQcm9jZXNzRGlkQmVjb21lUmVzcG9uc2l2ZTptX25hdmlnYXRpb25TdGF0ZS5tX3dlYlZp ZXddOwogfQogCi12b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6cHJvY2Vz c0RpZEJlY29tZVVucmVzcG9uc2l2ZShXZWJLaXQ6OldlYlBhZ2VQcm94eSYgcGFnZSkKK3ZvaWQg TmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50Ojpwcm9jZXNzRGlkQmVjb21lVW5yZXNw b25zaXZlKFdlYlBhZ2VQcm94eSYgcGFnZSkKIHsKICAgICBpZiAoIW1fbmF2aWdhdGlvblN0YXRl Lm1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3V2ViUHJvY2Vzc0RpZEJlY29tZVVu cmVzcG9uc2l2ZSkKICAgICAgICAgcmV0dXJuOwpAQCAtODg5LDcgKzkwOSw3IEBAIHZvaWQgTmF2 aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjoKICAgICBbc3RhdGljX2Nhc3Q8aWQgPFdL TmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZT4+KG5hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKSkgX3dl YlZpZXdXZWJQcm9jZXNzRGlkQmVjb21lVW5yZXNwb25zaXZlOm1fbmF2aWdhdGlvblN0YXRlLm1f d2ViVmlld107CiB9CiAKLVJlZlB0cjxBUEk6OkRhdGE+IE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdh dGlvbkNsaWVudDo6d2ViQ3J5cHRvTWFzdGVyS2V5KFdlYktpdDo6V2ViUGFnZVByb3h5JikKK1Jl ZlB0cjxBUEk6OkRhdGE+IE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6d2ViQ3J5 cHRvTWFzdGVyS2V5KFdlYlBhZ2VQcm94eSYpCiB7CiAgICAgaWYgKCFtX25hdmlnYXRpb25TdGF0 ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViQ3J5cHRvTWFzdGVyS2V5Rm9yV2ViVmll dykgewogICAgICAgICBWZWN0b3I8dWludDhfdD4gbWFzdGVyS2V5OwpAQCAtOTIzLDcgKzk0Myw3 IEBAIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjoKICAgICBbc3RhdGlj X2Nhc3Q8aWQgPFdLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZT4+KG5hdmlnYXRpb25EZWxlZ2F0 ZS5nZXQoKSkgX3dlYlZpZXc6bV9uYXZpZ2F0aW9uU3RhdGUubV93ZWJWaWV3IGRpZFN0YXJ0TG9h ZEZvclF1aWNrTG9va0RvY3VtZW50SW5NYWluRnJhbWVXaXRoRmlsZU5hbWU6ZmlsZU5hbWUgdXRp OnV0aV07CiB9CiAKLXZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpkaWRG aW5pc2hMb2FkRm9yUXVpY2tMb29rRG9jdW1lbnRJbk1haW5GcmFtZShjb25zdCBXZWJLaXQ6OlF1 aWNrTG9va0RvY3VtZW50RGF0YSYgZGF0YSkKK3ZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0 aW9uQ2xpZW50OjpkaWRGaW5pc2hMb2FkRm9yUXVpY2tMb29rRG9jdW1lbnRJbk1haW5GcmFtZShj b25zdCBRdWlja0xvb2tEb2N1bWVudERhdGEmIGRhdGEpCiB7CiAgICAgaWYgKCFtX25hdmlnYXRp b25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RpZEZpbmlzaExvYWRG b3JRdWlja0xvb2tEb2N1bWVudEluTWFpbkZyYW1lKQogICAgICAgICByZXR1cm47CkBAIC05NDcs NyArOTY3LDcgQEAgTmF2aWdhdGlvblN0YXRlOjpIaXN0b3J5Q2xpZW50Ojp+SGlzdG9yeQogewog fQogCi12b2lkIE5hdmlnYXRpb25TdGF0ZTo6SGlzdG9yeUNsaWVudDo6ZGlkTmF2aWdhdGVXaXRo TmF2aWdhdGlvbkRhdGEoV2ViS2l0OjpXZWJQYWdlUHJveHkmLCBjb25zdCBXZWJLaXQ6OldlYk5h dmlnYXRpb25EYXRhU3RvcmUmIG5hdmlnYXRpb25EYXRhU3RvcmUpCit2b2lkIE5hdmlnYXRpb25T dGF0ZTo6SGlzdG9yeUNsaWVudDo6ZGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGEoV2ViUGFn ZVByb3h5JiwgY29uc3QgV2ViTmF2aWdhdGlvbkRhdGFTdG9yZSYgbmF2aWdhdGlvbkRhdGFTdG9y ZSkKIHsKICAgICBpZiAoIW1fbmF2aWdhdGlvblN0YXRlLm1faGlzdG9yeURlbGVnYXRlTWV0aG9k cy53ZWJWaWV3RGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGEpCiAgICAgICAgIHJldHVybjsK QEAgLTk1OSw3ICs5NzksNyBAQCB2b2lkIE5hdmlnYXRpb25TdGF0ZTo6SGlzdG9yeUNsaWVudDo6 ZGlkCiAgICAgW2hpc3RvcnlEZWxlZ2F0ZSBfd2ViVmlldzptX25hdmlnYXRpb25TdGF0ZS5tX3dl YlZpZXcgZGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGE6d3JhcHBlcihBUEk6Ok5hdmlnYXRp b25EYXRhOjpjcmVhdGUobmF2aWdhdGlvbkRhdGFTdG9yZSkpXTsKIH0KIAotdm9pZCBOYXZpZ2F0 aW9uU3RhdGU6Okhpc3RvcnlDbGllbnQ6OmRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdChXZWJLaXQ6 OldlYlBhZ2VQcm94eSYsIGNvbnN0IFdURjo6U3RyaW5nJiBzb3VyY2VVUkwsIGNvbnN0IFdURjo6 U3RyaW5nJiBkZXN0aW5hdGlvblVSTCkKK3ZvaWQgTmF2aWdhdGlvblN0YXRlOjpIaXN0b3J5Q2xp ZW50OjpkaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3QoV2ViUGFnZVByb3h5JiwgY29uc3QgV1RGOjpT dHJpbmcmIHNvdXJjZVVSTCwgY29uc3QgV1RGOjpTdHJpbmcmIGRlc3RpbmF0aW9uVVJMKQogewog ICAgIGlmICghbV9uYXZpZ2F0aW9uU3RhdGUubV9oaXN0b3J5RGVsZWdhdGVNZXRob2RzLndlYlZp ZXdEaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3RGcm9tVVJMVG9VUkwpCiAgICAgICAgIHJldHVybjsK QEAgLTk3MSw3ICs5OTEsNyBAQCB2b2lkIE5hdmlnYXRpb25TdGF0ZTo6SGlzdG9yeUNsaWVudDo6 ZGlkCiAgICAgW2hpc3RvcnlEZWxlZ2F0ZSBfd2ViVmlldzptX25hdmlnYXRpb25TdGF0ZS5tX3dl YlZpZXcgZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0RnJvbVVSTDpbTlNVUkwgX3dlYl9VUkxXaXRo V1RGU3RyaW5nOnNvdXJjZVVSTF0gdG9VUkw6W05TVVJMIF93ZWJfVVJMV2l0aFdURlN0cmluZzpk ZXN0aW5hdGlvblVSTF1dOwogfQogCi12b2lkIE5hdmlnYXRpb25TdGF0ZTo6SGlzdG9yeUNsaWVu dDo6ZGlkUGVyZm9ybVNlcnZlclJlZGlyZWN0KFdlYktpdDo6V2ViUGFnZVByb3h5JiwgY29uc3Qg V1RGOjpTdHJpbmcmIHNvdXJjZVVSTCwgY29uc3QgV1RGOjpTdHJpbmcmIGRlc3RpbmF0aW9uVVJM KQordm9pZCBOYXZpZ2F0aW9uU3RhdGU6Okhpc3RvcnlDbGllbnQ6OmRpZFBlcmZvcm1TZXJ2ZXJS ZWRpcmVjdChXZWJQYWdlUHJveHkmLCBjb25zdCBXVEY6OlN0cmluZyYgc291cmNlVVJMLCBjb25z dCBXVEY6OlN0cmluZyYgZGVzdGluYXRpb25VUkwpCiB7CiAgICAgaWYgKCFtX25hdmlnYXRpb25T dGF0ZS5tX2hpc3RvcnlEZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RpZFBlcmZvcm1TZXJ2ZXJSZWRp cmVjdEZyb21VUkxUb1VSTCkKICAgICAgICAgcmV0dXJuOwpAQCAtOTgzLDcgKzEwMDMsNyBAQCB2 b2lkIE5hdmlnYXRpb25TdGF0ZTo6SGlzdG9yeUNsaWVudDo6ZGlkCiAgICAgW2hpc3RvcnlEZWxl Z2F0ZSBfd2ViVmlldzptX25hdmlnYXRpb25TdGF0ZS5tX3dlYlZpZXcgZGlkUGVyZm9ybVNlcnZl clJlZGlyZWN0RnJvbVVSTDpbTlNVUkwgX3dlYl9VUkxXaXRoV1RGU3RyaW5nOnNvdXJjZVVSTF0g dG9VUkw6W05TVVJMIF93ZWJfVVJMV2l0aFdURlN0cmluZzpkZXN0aW5hdGlvblVSTF1dOwogfQog Ci12b2lkIE5hdmlnYXRpb25TdGF0ZTo6SGlzdG9yeUNsaWVudDo6ZGlkVXBkYXRlSGlzdG9yeVRp dGxlKFdlYktpdDo6V2ViUGFnZVByb3h5JiwgY29uc3QgV1RGOjpTdHJpbmcmIHRpdGxlLCBjb25z dCBXVEY6OlN0cmluZyYgdXJsKQordm9pZCBOYXZpZ2F0aW9uU3RhdGU6Okhpc3RvcnlDbGllbnQ6 OmRpZFVwZGF0ZUhpc3RvcnlUaXRsZShXZWJQYWdlUHJveHkmLCBjb25zdCBXVEY6OlN0cmluZyYg dGl0bGUsIGNvbnN0IFdURjo6U3RyaW5nJiB1cmwpCiB7CiAgICAgaWYgKCFtX25hdmlnYXRpb25T dGF0ZS5tX2hpc3RvcnlEZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RpZFVwZGF0ZUhpc3RvcnlUaXRs ZUZvclVSTCkKICAgICAgICAgcmV0dXJuOwpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMjIyOTMwKQorKysgVG9vbHMvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTctMTAtMDUgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBBZGQgT2JqQyBl cXVpdmFsZW50IG9mIFdLUGFnZU5hdmlnYXRpb25DbGllbnQuZGlkQ2hhbmdlQmFja0ZvcndhcmRM aXN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzc5 NjYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIyMzg3MTM1PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9OYXZpZ2F0aW9uLm1tOgorICAgICAgICAoLVtMaXN0SXRlbURlbGVnYXRlIF93ZWJW aWV3OmJhY2tGb3J3YXJkTGlzdEl0ZW1BZGRlZDpyZW1vdmVkOl0pOgorICAgICAgICAoLVtMaXN0 SXRlbURlbGVnYXRlIHdlYlZpZXc6ZGlkRmluaXNoTmF2aWdhdGlvbjpdKToKKyAgICAgICAgKFRF U1QpOgorCiAyMDE3LTEwLTA1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBSdW4gV2ViS2l0MiBDIEFQSSB0ZXN0cyBpbiBH VEsrIGJvdHMgYWdhaW4gYWZ0ZXIgdGhlIGxhc3QgV2ViS2l0MiAtPiBXZWJLaXQgcmVuYW1lLgpJ bmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9OYXZpZ2F0aW9uLm1t Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTmF2 aWdhdGlvbi5tbQkocmV2aXNpb24gMjIyODk4KQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXRDb2NvYS9OYXZpZ2F0aW9uLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yNSw2ICsyNSw3 IEBACiAKICNpbmNsdWRlICJjb25maWcuaCIKIAorI2ltcG9ydCA8V2ViS2l0L1dLQmFja0Zvcndh cmRMaXN0UHJpdmF0ZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dLTmF2aWdhdGlvbkRlbGVnYXRlUHJp dmF0ZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dLTmF2aWdhdGlvblByaXZhdGUuaD4KICNpbXBvcnQg PFdlYktpdC9XS1dlYlZpZXcuaD4KQEAgLTMyOCw2ICszMjksNjEgQEAgVEVTVChXS05hdmlnYXRp b24sIFdpbGxHb1RvQmFja0ZvcndhcmRMaQogICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigm aXNEb25lKTsKIH0KIAorUmV0YWluUHRyPFdLQmFja0ZvcndhcmRMaXN0SXRlbT4gZmlyc3RJdGVt OworUmV0YWluUHRyPFdLQmFja0ZvcndhcmRMaXN0SXRlbT4gc2Vjb25kSXRlbTsKKworQGludGVy ZmFjZSBMaXN0SXRlbURlbGVnYXRlIDogTlNPYmplY3Q8V0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2 YXRlPgorQGVuZAorQGltcGxlbWVudGF0aW9uIExpc3RJdGVtRGVsZWdhdGUKKy0gKHZvaWQpX3dl YlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgYmFja0ZvcndhcmRMaXN0SXRlbUFkZGVkOihXS0Jh Y2tGb3J3YXJkTGlzdEl0ZW0gKilpdGVtQWRkZWQgcmVtb3ZlZDooTlNBcnJheTxXS0JhY2tGb3J3 YXJkTGlzdEl0ZW0gKj4gKilpdGVtc1JlbW92ZWQKK3sKKyAgICBOU1N0cmluZyAqZmlyc3RVUkwg PSBbW05TQnVuZGxlIG1haW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAic2ltcGxlIiB3aXRoRXh0 ZW5zaW9uOkAiaHRtbCIgc3ViZGlyZWN0b3J5OkAiVGVzdFdlYktpdEFQSS5yZXNvdXJjZXMiXS5h YnNvbHV0ZVN0cmluZzsKKyAgICBOU1N0cmluZyAqc2Vjb25kVVJMID0gW1tOU0J1bmRsZSBtYWlu QnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpAInNpbXBsZTIiIHdpdGhFeHRlbnNpb246QCJodG1sIiBz dWJkaXJlY3Rvcnk6QCJUZXN0V2ViS2l0QVBJLnJlc291cmNlcyJdLmFic29sdXRlU3RyaW5nOwor CisgICAgaWYgKCFmaXJzdEl0ZW0pIHsKKyAgICAgICAgRVhQRUNUX05VTEwoZmlyc3RJdGVtKTsK KyAgICAgICAgRVhQRUNUX05VTEwoc2Vjb25kSXRlbSk7CisgICAgICAgIEVYUEVDVF9OVUxMKGl0 ZW1zUmVtb3ZlZCk7CisgICAgICAgIEVYUEVDVF9OT1RfTlVMTChpdGVtQWRkZWQpOworICAgICAg ICBFWFBFQ1RfU1RSRVEoZmlyc3RVUkwuVVRGOFN0cmluZywgaXRlbUFkZGVkLlVSTC5hYnNvbHV0 ZVN0cmluZy5VVEY4U3RyaW5nKTsKKyAgICAgICAgZmlyc3RJdGVtID0gaXRlbUFkZGVkOworICAg IH0gZWxzZSBpZiAoIXNlY29uZEl0ZW0pIHsKKyAgICAgICAgRVhQRUNUX05PVF9OVUxMKGZpcnN0 SXRlbSk7CisgICAgICAgIEVYUEVDVF9OVUxMKHNlY29uZEl0ZW0pOworICAgICAgICBFWFBFQ1Rf TlVMTChpdGVtc1JlbW92ZWQpOworICAgICAgICBFWFBFQ1RfTk9UX05VTEwoaXRlbUFkZGVkKTsK KyAgICAgICAgRVhQRUNUX1NUUkVRKHNlY29uZFVSTC5VVEY4U3RyaW5nLCBpdGVtQWRkZWQuVVJM LmFic29sdXRlU3RyaW5nLlVURjhTdHJpbmcpOworICAgICAgICBzZWNvbmRJdGVtID0gaXRlbUFk ZGVkOworICAgIH0gZWxzZSB7CisgICAgICAgIEVYUEVDVF9OT1RfTlVMTChmaXJzdEl0ZW0pOwor ICAgICAgICBFWFBFQ1RfTk9UX05VTEwoc2Vjb25kSXRlbSk7CisgICAgICAgIEVYUEVDVF9OT1Rf TlVMTChpdGVtc1JlbW92ZWQpOworICAgICAgICBFWFBFQ1RfTlVMTChpdGVtQWRkZWQpOworICAg ICAgICBFWFBFQ1RfRVEoW2l0ZW1zUmVtb3ZlZCBjb3VudF0sIDJ1KTsKKyAgICAgICAgRVhQRUNU X1NUUkVRKGZpcnN0VVJMLlVURjhTdHJpbmcsIFtpdGVtc1JlbW92ZWQgb2JqZWN0QXRJbmRleDow XS5VUkwuYWJzb2x1dGVTdHJpbmcuVVRGOFN0cmluZyk7CisgICAgICAgIEVYUEVDVF9TVFJFUShz ZWNvbmRVUkwuVVRGOFN0cmluZywgW2l0ZW1zUmVtb3ZlZCBvYmplY3RBdEluZGV4OjFdLlVSTC5h YnNvbHV0ZVN0cmluZy5VVEY4U3RyaW5nKTsKKyAgICAgICAgaXNEb25lID0gdHJ1ZTsKKyAgICB9 Cit9CistICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGlkRmluaXNoTmF2aWdh dGlvbjooV0tOYXZpZ2F0aW9uICopbmF2aWdhdGlvbgoreworICAgIG5hdmlnYXRpb25Db21wbGV0 ZSA9IHRydWU7Cit9CitAZW5kCisKK1RFU1QoV0tOYXZpZ2F0aW9uLCBMaXN0SXRlbUFkZGVkUmVt b3ZlZCkKK3sKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBp bml0XSk7CisgICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tMaXN0SXRlbURlbGVnYXRlIGFs bG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcgc2V0TmF2aWdhdGlvbkRlbGVnYXRlOmRlbGVnYXRl LmdldCgpXTsKKyAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpbTlNVUkxSZXF1ZXN0IHJlcXVlc3RX aXRoVVJMOltbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gVVJMRm9yUmVzb3VyY2U6QCJzaW1wbGUiIHdp dGhFeHRlbnNpb246QCJodG1sIiBzdWJkaXJlY3Rvcnk6QCJUZXN0V2ViS2l0QVBJLnJlc291cmNl cyJdXV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZuYXZpZ2F0aW9uQ29tcGxldGUp OworICAgIG5hdmlnYXRpb25Db21wbGV0ZSA9IGZhbHNlOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1 ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W1tOU0J1bmRsZSBtYWluQnVuZGxlXSBV UkxGb3JSZXNvdXJjZTpAInNpbXBsZTIiIHdpdGhFeHRlbnNpb246QCJodG1sIiBzdWJkaXJlY3Rv cnk6QCJUZXN0V2ViS2l0QVBJLnJlc291cmNlcyJdXV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRp bDo6cnVuKCZuYXZpZ2F0aW9uQ29tcGxldGUpOworICAgIFtbd2ViVmlldyBiYWNrRm9yd2FyZExp c3RdIF9yZW1vdmVBbGxJdGVtc107CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZpc0Rv bmUpOworfQogI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykKIAogI2VuZGlmIC8vIFdLX0FQSV9FTkFC TEVECg==