177974 2017-10-05 15:31:17 -0700 Add ObjC SPI with userInfo corresponding to WKPageNavigationClient's decidePolicyForNavigationAction, didStartProvisionalNavigation, and didFailNavigation 2017-10-05 16:14:52 -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 1357283 0 achristensen 2017-10-05 15:31:17 -0700 Add ObjC SPI with userInfo corresponding to WKPageNavigationClient's decidePolicyForNavigationAction, didStartProvisionalNavigation, and didFailNavigation 1357284 1 322925 achristensen 2017-10-05 15:32:35 -0700 Created attachment 322925 Patch 1357316 2 achristensen 2017-10-05 16:14:28 -0700 http://trac.webkit.org/r222942 1357317 3 webkit-bug-importer 2017-10-05 16:14:52 -0700 <rdar://problem/34845945> 322925 2017-10-05 15:32:35 -0700 2017-10-05 16:03:38 -0700 Patch bug-177974-20171005153234.patch text/plain 17863 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjI5MzQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE3LTEwLTA1ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIE9iakMgU1BJ IHdpdGggdXNlckluZm8gY29ycmVzcG9uZGluZyB0byBXS1BhZ2VOYXZpZ2F0aW9uQ2xpZW50J3Mg ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbiwgZGlkU3RhcnRQcm92aXNpb25hbE5hdmln YXRpb24sIGFuZCBkaWRGYWlsTmF2aWdhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc3OTc0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMjg4 ODgwMj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlLmg6CisgICAg ICAgICogVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5oOgorICAgICAgICAqIFVJUHJv Y2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW06CisgICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRp b25TdGF0ZTo6c2V0TmF2aWdhdGlvbkRlbGVnYXRlKToKKyAgICAgICAgKFdlYktpdDo6TmF2aWdh dGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0 aW9uKToKKyAgICAgICAgKFdlYktpdDo6TmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50 OjpkaWRTdGFydFByb3Zpc2lvbmFsTmF2aWdhdGlvbik6CisgICAgICAgIChXZWJLaXQ6Ok5hdmln YXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6ZGlkRmFpbE5hdmlnYXRpb25XaXRoRXJyb3Ip OgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1tOgorICAgICAgICAoV2Vi S2l0OjpVSURlbGVnYXRlOjpDb250ZXh0TWVudUNsaWVudDo6bWVudUZyb21Qcm9wb3NlZE1lbnUp OgorCiAyMDE3LTEwLTA1ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgog CiAgICAgICAgIE1ha2UgcHJvZ3Jlc3MgdG93YXJkIHByb3Blcmx5LWZvcm1lZCBYUEMgc2Vydmlj ZXMgaW4gdGhlIE1hYyBDTWFrZSBidWlsZApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25EZWxlZ2F0ZVByaXZh dGUuaAkocmV2aXNpb24gMjIyODk4KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC03Nyw2 ICs3Nyw5IEBAIHN0YXRpYyBjb25zdCBXS05hdmlnYXRpb25SZXNwb25zZVBvbGljeSAKIC0gKHZv aWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgd2lsbFNuYXBzaG90QmFja0ZvcndhcmRM aXN0SXRlbTooV0tCYWNrRm9yd2FyZExpc3RJdGVtICopaXRlbTsKIC0gKHZvaWQpX3dlYlZpZXdE aWRSZW1vdmVOYXZpZ2F0aW9uR2VzdHVyZVNuYXBzaG90OihXS1dlYlZpZXcgKil3ZWJWaWV3IFdL X0FQSV9BVkFJTEFCTEUobWFjb3N4KDEwLjEyKSwgaW9zKDEwLjApKTsKIC0gKHZvaWQpX3dlYlZp ZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbjoo V0tOYXZpZ2F0aW9uQWN0aW9uICopbmF2aWdhdGlvbkFjdGlvbiBkZWNpc2lvbkhhbmRsZXI6KHZv aWQgKF4pKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeSwgX1dLV2Vic2l0ZVBvbGljaWVzICopKWRl Y2lzaW9uSGFuZGxlciBXS19BUElfQVZBSUxBQkxFKG1hY29zeCgxMC4xMi4zKSwgaW9zKDEwLjMp KTsKKy0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGVjaWRlUG9saWN5Rm9y TmF2aWdhdGlvbkFjdGlvbjooV0tOYXZpZ2F0aW9uQWN0aW9uICopbmF2aWdhdGlvbkFjdGlvbiB1 c2VySW5mbzooaWQgPE5TU2VjdXJlQ29kaW5nPil1c2VySW5mbyBkZWNpc2lvbkhhbmRsZXI6KHZv aWQgKF4pKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeSwgX1dLV2Vic2l0ZVBvbGljaWVzICopKWRl Y2lzaW9uSGFuZGxlciBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSwgaW9zKFdL X0lPU19UQkEpKTsKKy0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGlkU3Rh cnRQcm92aXNpb25hbE5hdmlnYXRpb246KFdLTmF2aWdhdGlvbiAqKW5hdmlnYXRpb24gdXNlcklu Zm86KGlkIDxOU1NlY3VyZUNvZGluZz4pdXNlckluZm8gV0tfQVBJX0FWQUlMQUJMRShtYWNvc3go V0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CistICh2b2lkKV93ZWJWaWV3OihXS1dlYlZp ZXcgKil3ZWJWaWV3IGRpZEZhaWxOYXZpZ2F0aW9uOihXS05hdmlnYXRpb24gKiluYXZpZ2F0aW9u IHdpdGhFcnJvcjooTlNFcnJvciAqKWVycm9yIHVzZXJJbmZvOihpZCA8TlNTZWN1cmVDb2Rpbmc+ KXVzZXJJbmZvIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpLCBpb3MoV0tfSU9T X1RCQSkpOwogCiAtICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IFVSTDooTlNV UkwgKil1cmwgY29udGVudFJ1bGVMaXN0SWRlbnRpZmllcnM6KE5TQXJyYXk8TlNTdHJpbmcgKj4g KilpZGVudGlmaWVycyBub3RpZmljYXRpb25zOihOU0FycmF5PE5TU3RyaW5nICo+ICopbm90aWZp Y2F0aW9ucyBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19U QkEpKTsKIApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0 YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdh dGlvblN0YXRlLmgJKHJldmlzaW9uIDIyMjg5OCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0NvY29hL05hdmlnYXRpb25TdGF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNzYsOSArMTc2LDEx IEBAIHByaXZhdGU6CiAgICAgc3RydWN0IHsKICAgICAgICAgYm9vbCB3ZWJWaWV3RGVjaWRlUG9s aWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkRlY2lzaW9uSGFuZGxlciA6IDE7CiAgICAgICAgIGJvb2wg d2ViVmlld0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25EZWNpc2lvbkhhbmRsZXJXZWJz aXRlUG9saWNpZXMgOiAxOworICAgICAgICBib29sIHdlYlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uQWN0aW9uVXNlckluZm9EZWNpc2lvbkhhbmRsZXJXZWJzaXRlUG9saWNpZXMgOiAxOwog ICAgICAgICBib29sIHdlYlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uUmVzcG9uc2VEZWNp c2lvbkhhbmRsZXIgOiAxOwogCiAgICAgICAgIGJvb2wgd2ViVmlld0RpZFN0YXJ0UHJvdmlzaW9u YWxOYXZpZ2F0aW9uIDogMTsKKyAgICAgICAgYm9vbCB3ZWJWaWV3RGlkU3RhcnRQcm92aXNpb25h bE5hdmlnYXRpb25Vc2VySW5mbyA6IDE7CiAgICAgICAgIGJvb2wgd2ViVmlld0RpZFJlY2VpdmVT ZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTmF2aWdhdGlvbiA6IDE7CiAgICAgICAgIGJvb2wg d2ViVmlld0RpZEZhaWxQcm92aXNpb25hbE5hdmlnYXRpb25XaXRoRXJyb3IgOiAxOwogICAgICAg ICBib29sIHdlYlZpZXdOYXZpZ2F0aW9uRGlkRmFpbFByb3Zpc2lvbmFsTG9hZEluU3ViZnJhbWVX aXRoRXJyb3IgOiAxOwpAQCAtMTg4LDYgKzE5MCw3IEBAIHByaXZhdGU6CiAgICAgICAgIGJvb2wg d2ViVmlld05hdmlnYXRpb25EaWRGaW5pc2hEb2N1bWVudExvYWQgOiAxOwogICAgICAgICBib29s IHdlYlZpZXdEaWRGaW5pc2hOYXZpZ2F0aW9uIDogMTsKICAgICAgICAgYm9vbCB3ZWJWaWV3RGlk RmFpbE5hdmlnYXRpb25XaXRoRXJyb3IgOiAxOworICAgICAgICBib29sIHdlYlZpZXdEaWRGYWls TmF2aWdhdGlvbldpdGhFcnJvclVzZXJJbmZvIDogMTsKICAgICAgICAgYm9vbCB3ZWJWaWV3TmF2 aWdhdGlvbkRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb24gOiAxOwogCiAgICAgICAgIGJvb2wgd2Vi Vmlld1JlbmRlcmluZ1Byb2dyZXNzRGlkQ2hhbmdlIDogMTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0JKHJldmlzaW9uIDIyMjg5 OCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQko d29ya2luZyBjb3B5KQpAQCAtMTQxLDE0ICsxNDEsMTcgQEAgdm9pZCBOYXZpZ2F0aW9uU3RhdGU6 OnNldE5hdmlnYXRpb25EZWxlZwogCiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndl YlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uRGVjaXNpb25IYW5kbGVyID0gW2Rl bGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Iod2ViVmlldzpkZWNpZGVQb2xpY3lG b3JOYXZpZ2F0aW9uQWN0aW9uOmRlY2lzaW9uSGFuZGxlcjopXTsKICAgICBtX25hdmlnYXRpb25E ZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25EZWNp c2lvbkhhbmRsZXJXZWJzaXRlUG9saWNpZXMgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9y OkBzZWxlY3Rvcihfd2ViVmlldzpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOmRlY2lz aW9uSGFuZGxlcjopXTsKKyAgICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0Rl Y2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Vc2VySW5mb0RlY2lzaW9uSGFuZGxlcldlYnNp dGVQb2xpY2llcyA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJW aWV3OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246dXNlckluZm86ZGVjaXNpb25IYW5k bGVyOildOwogICAgIG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGVjaWRlUG9s aWN5Rm9yTmF2aWdhdGlvblJlc3BvbnNlRGVjaXNpb25IYW5kbGVyID0gW2RlbGVnYXRlIHJlc3Bv bmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Iod2ViVmlldzpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9u UmVzcG9uc2U6ZGVjaXNpb25IYW5kbGVyOildOwogCiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVN ZXRob2RzLndlYlZpZXdEaWRTdGFydFByb3Zpc2lvbmFsTmF2aWdhdGlvbiA9IFtkZWxlZ2F0ZSBy ZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHdlYlZpZXc6ZGlkU3RhcnRQcm92aXNpb25hbE5h dmlnYXRpb246KV07CisgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdEaWRT dGFydFByb3Zpc2lvbmFsTmF2aWdhdGlvblVzZXJJbmZvID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9T ZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6ZGlkU3RhcnRQcm92aXNpb25hbE5hdmlnYXRpb246 dXNlckluZm86KV07CiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdEaWRS ZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbE5hdmlnYXRpb24gPSBbZGVsZWdhdGUg cmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcih3ZWJWaWV3OmRpZFJlY2VpdmVTZXJ2ZXJSZWRp cmVjdEZvclByb3Zpc2lvbmFsTmF2aWdhdGlvbjopXTsKICAgICBtX25hdmlnYXRpb25EZWxlZ2F0 ZU1ldGhvZHMud2ViVmlld0RpZEZhaWxQcm92aXNpb25hbE5hdmlnYXRpb25XaXRoRXJyb3IgPSBb ZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcih3ZWJWaWV3OmRpZEZhaWxQcm92 aXNpb25hbE5hdmlnYXRpb246d2l0aEVycm9yOildOwogICAgIG1fbmF2aWdhdGlvbkRlbGVnYXRl TWV0aG9kcy53ZWJWaWV3RGlkQ29tbWl0TmF2aWdhdGlvbiA9IFtkZWxlZ2F0ZSByZXNwb25kc1Rv U2VsZWN0b3I6QHNlbGVjdG9yKHdlYlZpZXc6ZGlkQ29tbWl0TmF2aWdhdGlvbjopXTsKICAgICBt X25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RpZEZpbmlzaE5hdmlnYXRpb24gPSBb ZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcih3ZWJWaWV3OmRpZEZpbmlzaE5h dmlnYXRpb246KV07CiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdEaWRG YWlsTmF2aWdhdGlvbldpdGhFcnJvciA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNl bGVjdG9yKHdlYlZpZXc6ZGlkRmFpbE5hdmlnYXRpb246d2l0aEVycm9yOildOworICAgIG1fbmF2 aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGlkRmFpbE5hdmlnYXRpb25XaXRoRXJyb3JV c2VySW5mbyA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3 OmRpZEZhaWxOYXZpZ2F0aW9uOndpdGhFcnJvcjp1c2VySW5mbzopXTsKIAogICAgIG1fbmF2aWdh dGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3TmF2aWdhdGlvbkRpZEZhaWxQcm92aXNpb25hbExv YWRJblN1YmZyYW1lV2l0aEVycm9yID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2Vs ZWN0b3IoX3dlYlZpZXc6bmF2aWdhdGlvbjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkSW5TdWJmcmFt ZTp3aXRoRXJyb3I6KV07CiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdX aWxsUGVyZm9ybUNsaWVudFJlZGlyZWN0ID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpA c2VsZWN0b3IoX3dlYlZpZXc6d2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdFRvVVJMOmRlbGF5Oild OwpAQCAtMzkwLDMyICszOTMsMzAgQEAgc3RhdGljIHZvaWQgdHJ5QXBwTGluayhSZWZQdHI8QVBJ OjpOYXZpZwogI2VuZGlmCiB9CiAKLXZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xp ZW50OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFdlYlBhZ2VQcm94eSYgd2ViUGFn ZVByb3h5LCBSZWY8QVBJOjpOYXZpZ2F0aW9uQWN0aW9uPiYmIG5hdmlnYXRpb25BY3Rpb24sIFJl ZjxXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk+JiYgbGlzdGVuZXIsIEFQSTo6T2JqZWN0KiB1 c2VyRGF0YSkKK3ZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpkZWNpZGVQ b2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFdlYlBhZ2VQcm94eSYgd2ViUGFnZVByb3h5LCBSZWY8 QVBJOjpOYXZpZ2F0aW9uQWN0aW9uPiYmIG5hdmlnYXRpb25BY3Rpb24sIFJlZjxXZWJGcmFtZVBv bGljeUxpc3RlbmVyUHJveHk+JiYgbGlzdGVuZXIsIEFQSTo6T2JqZWN0KiB1c2VySW5mbykKIHsK ICAgICBTdHJpbmcgbWFpbkZyYW1lVVJMU3RyaW5nID0gd2ViUGFnZVByb3h5Lm1haW5GcmFtZSgp LT51cmwoKTsKIAogICAgIGlmICghbV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdh dGVNZXRob2RzLndlYlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uRGVjaXNpb25I YW5kbGVyCi0gICAgICAgICYmICFtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0 ZU1ldGhvZHMud2ViVmlld0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25EZWNpc2lvbkhh bmRsZXJXZWJzaXRlUG9saWNpZXMpIHsKLSAgICAgICAgUmVmPEFQSTo6TmF2aWdhdGlvbkFjdGlv bj4gbG9jYWxOYXZpZ2F0aW9uQWN0aW9uID0gbmF2aWdhdGlvbkFjdGlvbi5jb3B5UmVmKCk7Ci0g ICAgICAgIFJlZlB0cjxXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk+IGxvY2FsTGlzdGVuZXIg PSBXVEZNb3ZlKGxpc3RlbmVyKTsKLQotICAgICAgICB0cnlBcHBMaW5rKFdURk1vdmUobG9jYWxO YXZpZ2F0aW9uQWN0aW9uKSwgbWFpbkZyYW1lVVJMU3RyaW5nLCBbd2ViUGFnZSA9IFJlZlB0cjxX ZWJQYWdlUHJveHk+KCZ3ZWJQYWdlUHJveHkpLCBsb2NhbExpc3RlbmVyLCBsb2NhbE5hdmlnYXRp b25BY3Rpb24gPSBuYXZpZ2F0aW9uQWN0aW9uLmNvcHlSZWYoKV0gKGJvb2wgZm9sbG93ZWRMaW5r VG9BcHApIHsKKyAgICAgICAgJiYgIW1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRlbGVn YXRlTWV0aG9kcy53ZWJWaWV3RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkRlY2lzaW9u SGFuZGxlcldlYnNpdGVQb2xpY2llcworICAgICAgICAmJiAhbV9uYXZpZ2F0aW9uU3RhdGUubV9u YXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9u QWN0aW9uVXNlckluZm9EZWNpc2lvbkhhbmRsZXJXZWJzaXRlUG9saWNpZXMpIHsKKyAgICAgICAg YXV0byBjb21wbGV0aW9uSGFuZGxlciA9IFt3ZWJQYWdlID0gbWFrZVJlZih3ZWJQYWdlUHJveHkp LCBsaXN0ZW5lciA9IFdURk1vdmUobGlzdGVuZXIpLCBuYXZpZ2F0aW9uQWN0aW9uID0gbmF2aWdh dGlvbkFjdGlvbi5jb3B5UmVmKCldIChib29sIGZvbGxvd2VkTGlua1RvQXBwKSB7CiAgICAgICAg ICAgICBpZiAoZm9sbG93ZWRMaW5rVG9BcHApIHsKLSAgICAgICAgICAgICAgICBsb2NhbExpc3Rl bmVyLT5pZ25vcmUoKTsKKyAgICAgICAgICAgICAgICBsaXN0ZW5lci0+aWdub3JlKCk7CiAgICAg ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBpZiAoIWxv Y2FsTmF2aWdhdGlvbkFjdGlvbi0+dGFyZ2V0RnJhbWUoKSkgewotICAgICAgICAgICAgICAgIGxv Y2FsTGlzdGVuZXItPnVzZSh7IH0pOworICAgICAgICAgICAgaWYgKCFuYXZpZ2F0aW9uQWN0aW9u LT50YXJnZXRGcmFtZSgpKSB7CisgICAgICAgICAgICAgICAgbGlzdGVuZXItPnVzZSh7IH0pOwog ICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgUmV0 YWluUHRyPE5TVVJMUmVxdWVzdD4gbnNVUkxSZXF1ZXN0ID0gYWRvcHROUyh3cmFwcGVyKEFQSTo6 VVJMUmVxdWVzdDo6Y3JlYXRlKGxvY2FsTmF2aWdhdGlvbkFjdGlvbi0+cmVxdWVzdCgpKS5sZWFr UmVmKCkpKTsKKyAgICAgICAgICAgIFJldGFpblB0cjxOU1VSTFJlcXVlc3Q+IG5zVVJMUmVxdWVz dCA9IGFkb3B0TlMod3JhcHBlcihBUEk6OlVSTFJlcXVlc3Q6OmNyZWF0ZShuYXZpZ2F0aW9uQWN0 aW9uLT5yZXF1ZXN0KCkpLmxlYWtSZWYoKSkpOwogICAgICAgICAgICAgaWYgKFtOU1VSTENvbm5l Y3Rpb24gY2FuSGFuZGxlUmVxdWVzdDpuc1VSTFJlcXVlc3QuZ2V0KCldIHx8IHdlYlBhZ2UtPnVy bFNjaGVtZUhhbmRsZXJGb3JTY2hlbWUoW25zVVJMUmVxdWVzdCBVUkxdLnNjaGVtZSkpIHsKLSAg ICAgICAgICAgICAgICBpZiAobG9jYWxOYXZpZ2F0aW9uQWN0aW9uLT5zaG91bGRQZXJmb3JtRG93 bmxvYWQoKSkKLSAgICAgICAgICAgICAgICAgICAgbG9jYWxMaXN0ZW5lci0+ZG93bmxvYWQoKTsK KyAgICAgICAgICAgICAgICBpZiAobmF2aWdhdGlvbkFjdGlvbi0+c2hvdWxkUGVyZm9ybURvd25s b2FkKCkpCisgICAgICAgICAgICAgICAgICAgIGxpc3RlbmVyLT5kb3dubG9hZCgpOwogICAgICAg ICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgbG9jYWxMaXN0ZW5lci0+dXNlKHsg fSk7CisgICAgICAgICAgICAgICAgICAgIGxpc3RlbmVyLT51c2UoeyB9KTsKICAgICAgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAKQEAgLTQyNSw5ICs0MjYsOSBAQCB2b2lkIE5h dmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6CiAgICAgICAgICAgICBpZiAoIVtbbnNV UkxSZXF1ZXN0IFVSTF0gaXNGaWxlVVJMXSkKICAgICAgICAgICAgICAgICBbW05TV29ya3NwYWNl IHNoYXJlZFdvcmtzcGFjZV0gb3BlblVSTDpbbnNVUkxSZXF1ZXN0IFVSTF1dOwogI2VuZGlmCi0g ICAgICAgICAgICBsb2NhbExpc3RlbmVyLT5pZ25vcmUoKTsKLSAgICAgICAgfSk7Ci0KKyAgICAg ICAgICAgIGxpc3RlbmVyLT5pZ25vcmUoKTsKKyAgICAgICAgfTsKKyAgICAgICAgdHJ5QXBwTGlu ayhXVEZNb3ZlKG5hdmlnYXRpb25BY3Rpb24pLCBtYWluRnJhbWVVUkxTdHJpbmcsIFdURk1vdmUo Y29tcGxldGlvbkhhbmRsZXIpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNDM1LDkg KzQzNiw5IEBAIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjoKICAgICBp ZiAoIW5hdmlnYXRpb25EZWxlZ2F0ZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgYm9vbCBkZWxl Z2F0ZUhhc1dlYnNpdGVQb2xpY2llcyA9IG1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRl bGVnYXRlTWV0aG9kcy53ZWJWaWV3RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkRlY2lz aW9uSGFuZGxlcldlYnNpdGVQb2xpY2llczsKKyAgICBib29sIGRlbGVnYXRlSGFzV2Vic2l0ZVBv bGljaWVzID0gbV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndl YlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uRGVjaXNpb25IYW5kbGVyV2Vic2l0 ZVBvbGljaWVzIHx8IG1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9k cy53ZWJWaWV3RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvblVzZXJJbmZvRGVjaXNpb25I YW5kbGVyV2Vic2l0ZVBvbGljaWVzOwogICAgIAotICAgIFJlZlB0cjxDb21wbGV0aW9uSGFuZGxl ckNhbGxDaGVja2VyPiBjaGVja2VyID0gQ29tcGxldGlvbkhhbmRsZXJDYWxsQ2hlY2tlcjo6Y3Jl YXRlKG5hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKSwgZGVsZWdhdGVIYXNXZWJzaXRlUG9saWNpZXMg PyBAc2VsZWN0b3IoX3dlYlZpZXc6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbjpkZWNp c2lvbkhhbmRsZXI6KSA6IEBzZWxlY3Rvcih3ZWJWaWV3OmRlY2lkZVBvbGljeUZvck5hdmlnYXRp b25BY3Rpb246ZGVjaXNpb25IYW5kbGVyOikpOworICAgIGF1dG8gY2hlY2tlciA9IENvbXBsZXRp b25IYW5kbGVyQ2FsbENoZWNrZXI6OmNyZWF0ZShuYXZpZ2F0aW9uRGVsZWdhdGUuZ2V0KCksIGRl bGVnYXRlSGFzV2Vic2l0ZVBvbGljaWVzID8gQHNlbGVjdG9yKF93ZWJWaWV3OmRlY2lkZVBvbGlj eUZvck5hdmlnYXRpb25BY3Rpb246ZGVjaXNpb25IYW5kbGVyOikgOiBAc2VsZWN0b3Iod2ViVmll dzpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOmRlY2lzaW9uSGFuZGxlcjopKTsKICAg ICAKICAgICBhdXRvIGRlY2lzaW9uSGFuZGxlcldpdGhQb2xpY2llcyA9IFtsb2NhbExpc3RlbmVy ID0gUmVmUHRyPFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eT4oV1RGTW92ZShsaXN0ZW5lcikp LCBsb2NhbE5hdmlnYXRpb25BY3Rpb24gPSBuYXZpZ2F0aW9uQWN0aW9uLmNvcHlSZWYoKSwgY2hl Y2tlciA9IFdURk1vdmUoY2hlY2tlciksIG1haW5GcmFtZVVSTFN0cmluZ10oV0tOYXZpZ2F0aW9u QWN0aW9uUG9saWN5IGFjdGlvblBvbGljeSwgX1dLV2Vic2l0ZVBvbGljaWVzICp3ZWJzaXRlUG9s aWNpZXMpIG11dGFibGUgewogICAgICAgICBpZiAoY2hlY2tlci0+Y29tcGxldGlvbkhhbmRsZXJI YXNCZWVuQ2FsbGVkKCkpCkBAIC00NzgsOSArNDc5LDEzIEBAIHZvaWQgTmF2aWdhdGlvblN0YXRl OjpOYXZpZ2F0aW9uQ2xpZW50OjoKICAgICAgICAgfQogICAgIH07CiAgICAgCi0gICAgaWYgKGRl bGVnYXRlSGFzV2Vic2l0ZVBvbGljaWVzKQotICAgICAgICBbKGlkIDxXS05hdmlnYXRpb25EZWxl Z2F0ZVByaXZhdGU+KW5hdmlnYXRpb25EZWxlZ2F0ZSBfd2ViVmlldzptX25hdmlnYXRpb25TdGF0 ZS5tX3dlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbjp3cmFwcGVyKG5hdmln YXRpb25BY3Rpb24pIGRlY2lzaW9uSGFuZGxlcjpCbG9ja1B0cjx2b2lkKFdLTmF2aWdhdGlvbkFj dGlvblBvbGljeSwgX1dLV2Vic2l0ZVBvbGljaWVzICopPjo6ZnJvbUNhbGxhYmxlKFdURk1vdmUo ZGVjaXNpb25IYW5kbGVyV2l0aFBvbGljaWVzKSkuZ2V0KCldOwotICAgIGVsc2UgeworICAgIGlm IChkZWxlZ2F0ZUhhc1dlYnNpdGVQb2xpY2llcykgeworICAgICAgICBhdXRvIGRlY2lzaW9uSGFu ZGxlciA9IEJsb2NrUHRyPHZvaWQoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5LCBfV0tXZWJzaXRl UG9saWNpZXMgKik+Ojpmcm9tQ2FsbGFibGUoV1RGTW92ZShkZWNpc2lvbkhhbmRsZXJXaXRoUG9s aWNpZXMpKTsKKyAgICAgICAgaWYgKG1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRlbGVn YXRlTWV0aG9kcy53ZWJWaWV3RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvblVzZXJJbmZv RGVjaXNpb25IYW5kbGVyV2Vic2l0ZVBvbGljaWVzKQorICAgICAgICAgICAgWyhpZCA8V0tOYXZp Z2F0aW9uRGVsZWdhdGVQcml2YXRlPiluYXZpZ2F0aW9uRGVsZWdhdGUgX3dlYlZpZXc6bV9uYXZp Z2F0aW9uU3RhdGUubV93ZWJWaWV3IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246d3Jh cHBlcihuYXZpZ2F0aW9uQWN0aW9uKSB1c2VySW5mbzp1c2VySW5mbyA/IHN0YXRpY19jYXN0PGlk IDxOU1NlY3VyZUNvZGluZz4+KHVzZXJJbmZvLT53cmFwcGVyKCkpIDogbmlsIGRlY2lzaW9uSGFu ZGxlcjpkZWNpc2lvbkhhbmRsZXIuZ2V0KCldOworICAgICAgICBlbHNlCisgICAgICAgICAgICBb KGlkIDxXS05hdmlnYXRpb25EZWxlZ2F0ZVByaXZhdGU+KW5hdmlnYXRpb25EZWxlZ2F0ZSBfd2Vi VmlldzptX25hdmlnYXRpb25TdGF0ZS5tX3dlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlv bkFjdGlvbjp3cmFwcGVyKG5hdmlnYXRpb25BY3Rpb24pIGRlY2lzaW9uSGFuZGxlcjpkZWNpc2lv bkhhbmRsZXIuZ2V0KCldOworICAgIH0gZWxzZSB7CiAgICAgICAgIGF1dG8gZGVjaXNpb25IYW5k bGVyV2l0aG91dFBvbGljaWVzID0gW2RlY2lzaW9uSGFuZGxlcldpdGhQb2xpY2llcyA9IFdURk1v dmUoZGVjaXNpb25IYW5kbGVyV2l0aFBvbGljaWVzKV0gKFdLTmF2aWdhdGlvbkFjdGlvblBvbGlj eSBhY3Rpb25Qb2xpY3kpIG11dGFibGUgewogICAgICAgICAgICAgZGVjaXNpb25IYW5kbGVyV2l0 aFBvbGljaWVzKGFjdGlvblBvbGljeSwgbmlsKTsKICAgICAgICAgfTsKQEAgLTU2Myw5ICs1Njgs MTAgQEAgdm9pZCBOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25DbGllbnQ6OgogICAgIH1dOwog fQogCi12b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6ZGlkU3RhcnRQcm92 aXNpb25hbE5hdmlnYXRpb24oV2ViUGFnZVByb3h5JiBwYWdlLCBBUEk6Ok5hdmlnYXRpb24qIG5h dmlnYXRpb24sIEFQSTo6T2JqZWN0KikKK3ZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9u Q2xpZW50OjpkaWRTdGFydFByb3Zpc2lvbmFsTmF2aWdhdGlvbihXZWJQYWdlUHJveHkmIHBhZ2Us IEFQSTo6TmF2aWdhdGlvbiogbmF2aWdhdGlvbiwgQVBJOjpPYmplY3QqIHVzZXJJbmZvKQogewot ICAgIGlmICghbV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndl YlZpZXdEaWRTdGFydFByb3Zpc2lvbmFsTmF2aWdhdGlvbikKKyAgICBpZiAoIW1fbmF2aWdhdGlv blN0YXRlLm1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGlkU3RhcnRQcm92aXNp b25hbE5hdmlnYXRpb24KKyAgICAgICAgJiYgIW1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlv bkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGlkU3RhcnRQcm92aXNpb25hbE5hdmlnYXRpb25Vc2Vy SW5mbykKICAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byBuYXZpZ2F0aW9uRGVsZWdhdGUgPSBt X25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKTsKQEAgLTU3Nyw3ICs1 ODMsMTAgQEAgdm9pZCBOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25DbGllbnQ6OgogICAgIGlm IChuYXZpZ2F0aW9uKQogICAgICAgICB3a05hdmlnYXRpb24gPSB3cmFwcGVyKCpuYXZpZ2F0aW9u KTsKIAotICAgIFtuYXZpZ2F0aW9uRGVsZWdhdGUgd2ViVmlldzptX25hdmlnYXRpb25TdGF0ZS5t X3dlYlZpZXcgZGlkU3RhcnRQcm92aXNpb25hbE5hdmlnYXRpb246d2tOYXZpZ2F0aW9uXTsKKyAg ICBpZiAobV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZp ZXdEaWRTdGFydFByb3Zpc2lvbmFsTmF2aWdhdGlvblVzZXJJbmZvKQorICAgICAgICBbKGlkIDxX S05hdmlnYXRpb25EZWxlZ2F0ZVByaXZhdGU+KW5hdmlnYXRpb25EZWxlZ2F0ZSBfd2ViVmlldzpt X25hdmlnYXRpb25TdGF0ZS5tX3dlYlZpZXcgZGlkU3RhcnRQcm92aXNpb25hbE5hdmlnYXRpb246 d2tOYXZpZ2F0aW9uIHVzZXJJbmZvOnVzZXJJbmZvID8gc3RhdGljX2Nhc3Q8aWQgPE5TU2VjdXJl Q29kaW5nPj4odXNlckluZm8tPndyYXBwZXIoKSkgOiBuaWxdOworICAgIGVsc2UKKyAgICAgICAg W25hdmlnYXRpb25EZWxlZ2F0ZSB3ZWJWaWV3Om1fbmF2aWdhdGlvblN0YXRlLm1fd2ViVmlldyBk aWRTdGFydFByb3Zpc2lvbmFsTmF2aWdhdGlvbjp3a05hdmlnYXRpb25dOwogfQogCiB2b2lkIE5h dmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6ZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0 Rm9yUHJvdmlzaW9uYWxOYXZpZ2F0aW9uKFdlYlBhZ2VQcm94eSYgcGFnZSwgQVBJOjpOYXZpZ2F0 aW9uKiBuYXZpZ2F0aW9uLCBBUEk6Ok9iamVjdCopCkBAIC03MjcsOSArNzM2LDEwIEBAIHZvaWQg TmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjoKIH0KIAogLy8gRklYTUU6IFNob3Vs ZG4ndCBuZWVkIHRvIHBhc3MgdGhlIFdlYkZyYW1lUHJveHkgaW4gaGVyZS4gQXQgbW9zdCwgYSBG cmFtZUhhbmRsZS4KLXZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpkaWRG YWlsTmF2aWdhdGlvbldpdGhFcnJvcihXZWJQYWdlUHJveHkmIHBhZ2UsIFdlYkZyYW1lUHJveHkm IHdlYkZyYW1lUHJveHksIEFQSTo6TmF2aWdhdGlvbiogbmF2aWdhdGlvbiwgY29uc3QgV2ViQ29y ZTo6UmVzb3VyY2VFcnJvciYgZXJyb3IsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSkKK3ZvaWQgTmF2 aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpkaWRGYWlsTmF2aWdhdGlvbldpdGhFcnJv cihXZWJQYWdlUHJveHkmIHBhZ2UsIFdlYkZyYW1lUHJveHkmIHdlYkZyYW1lUHJveHksIEFQSTo6 TmF2aWdhdGlvbiogbmF2aWdhdGlvbiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYgZXJy b3IsIEFQSTo6T2JqZWN0KiB1c2VySW5mbykKIHsKLSAgICBpZiAoIW1fbmF2aWdhdGlvblN0YXRl Lm1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGlkRmFpbE5hdmlnYXRpb25XaXRo RXJyb3IpCisgICAgaWYgKCFtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZU1l dGhvZHMud2ViVmlld0RpZEZhaWxOYXZpZ2F0aW9uV2l0aEVycm9yCisgICAgICAgICYmICFtX25h dmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RpZEZhaWxO YXZpZ2F0aW9uV2l0aEVycm9yVXNlckluZm8pCiAgICAgICAgIHJldHVybjsKIAogICAgIGF1dG8g bmF2aWdhdGlvbkRlbGVnYXRlID0gbV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdh dGUuZ2V0KCk7CkBAIC03NDIsNyArNzUyLDEwIEBAIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZp Z2F0aW9uQ2xpZW50OjoKICAgICAgICAgd2tOYXZpZ2F0aW9uID0gd3JhcHBlcigqbmF2aWdhdGlv bik7CiAKICAgICBhdXRvIGVycm9yV2l0aFJlY292ZXJ5QXR0ZW1wdGVyID0gY3JlYXRlRXJyb3JX aXRoUmVjb3ZlcnlBdHRlbXB0ZXIobV9uYXZpZ2F0aW9uU3RhdGUubV93ZWJWaWV3LCB3ZWJGcmFt ZVByb3h5LCBlcnJvcik7Ci0gICAgW25hdmlnYXRpb25EZWxlZ2F0ZSB3ZWJWaWV3Om1fbmF2aWdh dGlvblN0YXRlLm1fd2ViVmlldyBkaWRGYWlsTmF2aWdhdGlvbjp3a05hdmlnYXRpb24gd2l0aEVy cm9yOmVycm9yV2l0aFJlY292ZXJ5QXR0ZW1wdGVyLmdldCgpXTsKKyAgICBpZiAobV9uYXZpZ2F0 aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdEaWRGYWlsTmF2aWdh dGlvbldpdGhFcnJvclVzZXJJbmZvKQorICAgICAgICBbKGlkIDxXS05hdmlnYXRpb25EZWxlZ2F0 ZVByaXZhdGU+KW5hdmlnYXRpb25EZWxlZ2F0ZSBfd2ViVmlldzptX25hdmlnYXRpb25TdGF0ZS5t X3dlYlZpZXcgZGlkRmFpbE5hdmlnYXRpb246d2tOYXZpZ2F0aW9uIHdpdGhFcnJvcjplcnJvcldp dGhSZWNvdmVyeUF0dGVtcHRlci5nZXQoKSB1c2VySW5mbzp1c2VySW5mbyA/IHN0YXRpY19jYXN0 PGlkIDxOU1NlY3VyZUNvZGluZz4+KHVzZXJJbmZvLT53cmFwcGVyKCkpIDogbmlsXTsKKyAgICBl bHNlCisgICAgICAgIFtuYXZpZ2F0aW9uRGVsZWdhdGUgd2ViVmlldzptX25hdmlnYXRpb25TdGF0 ZS5tX3dlYlZpZXcgZGlkRmFpbE5hdmlnYXRpb246d2tOYXZpZ2F0aW9uIHdpdGhFcnJvcjplcnJv cldpdGhSZWNvdmVyeUF0dGVtcHRlci5nZXQoKV07CiB9CiAKIHZvaWQgTmF2aWdhdGlvblN0YXRl OjpOYXZpZ2F0aW9uQ2xpZW50OjpkaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uKFdlYlBhZ2VQcm94 eSYsIEFQSTo6TmF2aWdhdGlvbiogbmF2aWdhdGlvbiwgU2FtZURvY3VtZW50TmF2aWdhdGlvblR5 cGUgbmF2aWdhdGlvblR5cGUsIEFQSTo6T2JqZWN0KikKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0NvY29hL1VJRGVsZWdhdGUubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbQkocmV2aXNpb24gMjIyODk4KQorKysgU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbQkod29ya2luZyBjb3B5KQpAQCAt MTg4LDcgKzE4OCw3IEBAIFJldGFpblB0cjxOU01lbnU+IFVJRGVsZWdhdGU6OkNvbnRleHRNZW4K ICAgICBpZiAobV91aURlbGVnYXRlLm1fZGVsZWdhdGVNZXRob2RzLndlYlZpZXdDb250ZXh0TWVu dUZvckVsZW1lbnQpCiAgICAgICAgIHJldHVybiBbKGlkIDxXS1VJRGVsZWdhdGVQcml2YXRlPilk ZWxlZ2F0ZSBfd2ViVmlldzptX3VpRGVsZWdhdGUubV93ZWJWaWV3IGNvbnRleHRNZW51Om1lbnUg Zm9yRWxlbWVudDpjb250ZXh0TWVudUVsZW1lbnRJbmZvLmdldCgpXTsKIAotICAgIHJldHVybiBb KGlkIDxXS1VJRGVsZWdhdGVQcml2YXRlPilkZWxlZ2F0ZSBfd2ViVmlldzptX3VpRGVsZWdhdGUu bV93ZWJWaWV3IGNvbnRleHRNZW51Om1lbnUgZm9yRWxlbWVudDpjb250ZXh0TWVudUVsZW1lbnRJ bmZvLmdldCgpIHVzZXJJbmZvOnN0YXRpY19jYXN0PGlkIDxOU1NlY3VyZUNvZGluZz4+KHVzZXJJ bmZvLT53cmFwcGVyKCkpXTsKKyAgICByZXR1cm4gWyhpZCA8V0tVSURlbGVnYXRlUHJpdmF0ZT4p ZGVsZWdhdGUgX3dlYlZpZXc6bV91aURlbGVnYXRlLm1fd2ViVmlldyBjb250ZXh0TWVudTptZW51 IGZvckVsZW1lbnQ6Y29udGV4dE1lbnVFbGVtZW50SW5mby5nZXQoKSB1c2VySW5mbzp1c2VySW5m byA/IHN0YXRpY19jYXN0PGlkIDxOU1NlY3VyZUNvZGluZz4+KHVzZXJJbmZvLT53cmFwcGVyKCkp IDogbmlsXTsKIH0KICNlbmRpZgogCg==