193202 2019-01-07 12:01:09 -0800 Remove WKPageRef-based SPI in _WKAutomationSessionDelegate 2019-01-08 11:41:52 -0800 1 1 1 Unclassified WebKit WebKit API WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg achristensen bburg commit-queue ggaren jeffm simon.fraser thorton timothy webkit-bug-importer oldest_to_newest 1492319 0 bburg 2019-01-07 12:01:09 -0800 This is no longer needed. 1492320 1 bburg 2019-01-07 12:01:29 -0800 <rdar://problem/37408718> 1492426 2 358534 bburg 2019-01-07 15:04:29 -0800 Created attachment 358534 Patch 1492676 3 358534 commit-queue 2019-01-08 11:41:50 -0800 Comment on attachment 358534 Patch Clearing flags on attachment: 358534 Committed r239733: <https://trac.webkit.org/changeset/239733> 1492677 4 commit-queue 2019-01-08 11:41:52 -0800 All reviewed patches have been landed. Closing bug. 358534 2019-01-07 15:04:29 -0800 2019-01-08 11:41:50 -0800 Patch bug-193202-20190107150429.patch text/plain 17922 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5Njg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ3ZjY4MmI0OGY5YTUxMzBk NzMxYjAwZjhlMTZhNGU0MDNhM2U3YTIuLmYwODMxNjYyMjM1YWYxZTNhZGFlZWY5NWZhMjgwYzg2 YjIzNjZiNjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTktMDEtMDcgIEJyaWFuIEJ1 cmcgIDxiYnVyZ0BhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIFdLUGFnZVJlZi1iYXNlZCBT UEkgaW4gX1dLQXV0b21hdGlvblNlc3Npb25EZWxlZ2F0ZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzMjAyCisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS8zNzQwODcxOD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBUaGlzIGNvZGUgaXMgbm8gbG9uZ2VyIHVzZWQsIGl0IHNob3VsZCBiZSBkZWxldGVkLgor CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uU2Vzc2lvbkRlbGVn YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL0F1dG9tYXRpb25TZXNzaW9uQ2xpZW50 Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL0F1dG9tYXRpb25TZXNzaW9uQ2xpZW50Lm1t OgorICAgICAgICAoV2ViS2l0OjpBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudDo6QXV0b21hdGlvblNl c3Npb25DbGllbnQpOgorICAgICAgICAoV2ViS2l0OjpBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudDo6 cmVxdWVzdE5ld1BhZ2VXaXRoT3B0aW9ucyk6CisgICAgICAgIChXZWJLaXQ6OkF1dG9tYXRpb25T ZXNzaW9uQ2xpZW50OjpyZXF1ZXN0U3dpdGNoVG9QYWdlKToKKyAgICAgICAgKFdlYktpdDo6QXV0 b21hdGlvblNlc3Npb25DbGllbnQ6OnJlcXVlc3RIaWRlV2luZG93T2ZQYWdlKToKKyAgICAgICAg KFdlYktpdDo6QXV0b21hdGlvblNlc3Npb25DbGllbnQ6OnJlcXVlc3RSZXN0b3JlV2luZG93T2ZQ YWdlKToKKyAgICAgICAgKFdlYktpdDo6QXV0b21hdGlvblNlc3Npb25DbGllbnQ6OnJlcXVlc3RN YXhpbWl6ZVdpbmRvd09mUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OkF1dG9tYXRpb25TZXNzaW9u Q2xpZW50Ojppc1Nob3dpbmdKYXZhU2NyaXB0RGlhbG9nT25QYWdlKToKKyAgICAgICAgKFdlYktp dDo6QXV0b21hdGlvblNlc3Npb25DbGllbnQ6OmRpc21pc3NDdXJyZW50SmF2YVNjcmlwdERpYWxv Z09uUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OkF1dG9tYXRpb25TZXNzaW9uQ2xpZW50OjphY2Nl cHRDdXJyZW50SmF2YVNjcmlwdERpYWxvZ09uUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OkF1dG9t YXRpb25TZXNzaW9uQ2xpZW50OjptZXNzYWdlT2ZDdXJyZW50SmF2YVNjcmlwdERpYWxvZ09uUGFn ZSk6CisgICAgICAgIChXZWJLaXQ6OkF1dG9tYXRpb25TZXNzaW9uQ2xpZW50OjpzZXRVc2VySW5w dXRGb3JDdXJyZW50SmF2YVNjcmlwdFByb21wdE9uUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OkF1 dG9tYXRpb25TZXNzaW9uQ2xpZW50Ojp0eXBlT2ZDdXJyZW50SmF2YVNjcmlwdERpYWxvZ09uUGFn ZSk6CisgICAgICAgIENsZWFuIHVwIHRoZSBkZWxlZ2F0ZSBicmlkZ2luZyBtZXRob2RzIG5vdyB0 aGF0IG9ubHkgb25lIGRlbGVnYXRlIGltcGxlbWVudGF0aW9uIGlzIHBvc3NpYmxlLgorCiAyMDE5 LTAxLTA3ICBCcmlhbiBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgogCiAgICAgICAgIFVud2FudGVk IHBhZ2UgbmF2aWdhdGlvbiBhZnRlciBzaG93aW5nICYgZGlzbWlzc2luZyBjb250ZXh0dWFsIG1l bnUgd2l0aCBjb250cm9sLWNsaWNrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQ29jb2EvX1dLQXV0b21hdGlvblNlc3Npb25EZWxlZ2F0ZS5oIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0F1dG9tYXRpb25TZXNzaW9uRGVsZWdhdGUuaAppbmRl eCAzN2E2M2I3NDZhOTJlMTE0ODQ3NjA2OGM0NThiYmM3ZDc1MDQ2NzBmLi4yOTM4NjVjYzg2NDUx MjBiZWU1MDVkOTNlMTgyMmUyZGU1ZTkzMzc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvX1dLQXV0b21hdGlvblNlc3Npb25EZWxlZ2F0ZS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uU2Vzc2lvbkRlbGVn YXRlLmgKQEAgLTYzLDE5ICs2Myw2IEBAIHR5cGVkZWYgTlNfRU5VTShOU1VJbnRlZ2VyLCBfV0tB dXRvbWF0aW9uU2Vzc2lvbkJyb3dzaW5nQ29udGV4dE9wdGlvbnMpIHsKIC0gKHZvaWQpX2F1dG9t YXRpb25TZXNzaW9uOihfV0tBdXRvbWF0aW9uU2Vzc2lvbiAqKWF1dG9tYXRpb25TZXNzaW9uIHNl dFVzZXJJbnB1dDooTlNTdHJpbmcgKil2YWx1ZSBmb3JDdXJyZW50SmF2YVNjcmlwdERpYWxvZ0Zv cldlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goMTAu MTMpLCBpb3MoMTEuMCkpOwogLSAoX1dLQXV0b21hdGlvblNlc3Npb25KYXZhU2NyaXB0RGlhbG9n VHlwZSlfYXV0b21hdGlvblNlc3Npb246KF9XS0F1dG9tYXRpb25TZXNzaW9uICopYXV0b21hdGlv blNlc3Npb24gdHlwZU9mQ3VycmVudEphdmFTY3JpcHREaWFsb2dGb3JXZWJWaWV3OihXS1dlYlZp ZXcgKil3ZWJWaWV3IFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KDEwLjE0KSwgaW9zKDEyLjApKTsK IAotLy8gRklYTUUgMzc0MDg3MTg6IE9iamVjdGl2ZS1DIGRlbGVnYXRlIG1ldGhvZHMgc2hvdWxk bid0IHVzZSBDIEFQSSB0eXBlcyBsaWtlIFdLUGFnZVJlZi4gV2UgbmVlZCB0bwotLy8gbWlncmF0 ZSBjbGllbnRzIHRvIHVzZSBXS1dlYlZpZXcsIG9yIGV4cG9zZSB0aGUgc2FtZSBiZWhhdmlvciB2 aWEgYSBDIFNQSSBmb3IgdGhvc2UgY2xpZW50cy4KLS0gKHZvaWQpX2F1dG9tYXRpb25TZXNzaW9u OihfV0tBdXRvbWF0aW9uU2Vzc2lvbiAqKWF1dG9tYXRpb25TZXNzaW9uIHJlcXVlc3ROZXdQYWdl V2l0aE9wdGlvbnM6KF9XS0F1dG9tYXRpb25TZXNzaW9uQnJvd3NpbmdDb250ZXh0T3B0aW9ucylv cHRpb25zIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkKF4pKFdLUGFnZVJlZikpY29tcGxldGlvbkhh bmRsZXIgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goMTAuMTQpLCBpb3MoMTIuMCkpOwotLSAodm9p ZClfYXV0b21hdGlvblNlc3Npb246KF9XS0F1dG9tYXRpb25TZXNzaW9uICopYXV0b21hdGlvblNl c3Npb24gcmVxdWVzdEhpZGVXaW5kb3dPZlBhZ2U6KFdLUGFnZVJlZilwYWdlIGNvbXBsZXRpb25I YW5kbGVyOih2b2lkKF4pKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVyIFdLX0FQSV9BVkFJTEFCTEUo bWFjb3N4KDEwLjE0KSwgaW9zKDEyLjApKTsKLS0gKHZvaWQpX2F1dG9tYXRpb25TZXNzaW9uOihf V0tBdXRvbWF0aW9uU2Vzc2lvbiAqKWF1dG9tYXRpb25TZXNzaW9uIHJlcXVlc3RSZXN0b3JlV2lu ZG93T2ZQYWdlOihXS1BhZ2VSZWYpcGFnZSBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCheKSh2b2lk KSljb21wbGV0aW9uSGFuZGxlciBXS19BUElfQVZBSUxBQkxFKG1hY29zeCgxMC4xNCksIGlvcygx Mi4wKSk7Ci0tICh2b2lkKV9hdXRvbWF0aW9uU2Vzc2lvbjooX1dLQXV0b21hdGlvblNlc3Npb24g KilhdXRvbWF0aW9uU2Vzc2lvbiByZXF1ZXN0TWF4aW1pemVXaW5kb3dPZlBhZ2U6KFdLUGFnZVJl ZilwYWdlIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkKF4pKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVy IFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KDEwLjE0KSwgaW9zKDEyLjApKTsKLS0gKHZvaWQpX2F1 dG9tYXRpb25TZXNzaW9uOihfV0tBdXRvbWF0aW9uU2Vzc2lvbiAqKWF1dG9tYXRpb25TZXNzaW9u IHJlcXVlc3RTd2l0Y2hUb1BhZ2U6KFdLUGFnZVJlZilwYWdlIGNvbXBsZXRpb25IYW5kbGVyOih2 b2lkKF4pKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVyIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KDEw LjE0KSwgaW9zKDEyLjApKTsKLS0gKEJPT0wpX2F1dG9tYXRpb25TZXNzaW9uOihfV0tBdXRvbWF0 aW9uU2Vzc2lvbiAqKWF1dG9tYXRpb25TZXNzaW9uIGlzU2hvd2luZ0phdmFTY3JpcHREaWFsb2dP blBhZ2U6KFdLUGFnZVJlZilwYWdlIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KDEwLjEzKSwgaW9z KDExLjApKTsKLS0gKHZvaWQpX2F1dG9tYXRpb25TZXNzaW9uOihfV0tBdXRvbWF0aW9uU2Vzc2lv biAqKWF1dG9tYXRpb25TZXNzaW9uIGRpc21pc3NDdXJyZW50SmF2YVNjcmlwdERpYWxvZ09uUGFn ZTooV0tQYWdlUmVmKXBhZ2UgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goMTAuMTMpLCBpb3MoMTEu MCkpOwotLSAodm9pZClfYXV0b21hdGlvblNlc3Npb246KF9XS0F1dG9tYXRpb25TZXNzaW9uICop YXV0b21hdGlvblNlc3Npb24gYWNjZXB0Q3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2U6KFdL UGFnZVJlZilwYWdlIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KDEwLjEzKSwgaW9zKDExLjApKTsK LS0gKG51bGxhYmxlIE5TU3RyaW5nICopX2F1dG9tYXRpb25TZXNzaW9uOihfV0tBdXRvbWF0aW9u U2Vzc2lvbiAqKWF1dG9tYXRpb25TZXNzaW9uIG1lc3NhZ2VPZkN1cnJlbnRKYXZhU2NyaXB0RGlh bG9nT25QYWdlOihXS1BhZ2VSZWYpcGFnZSBXS19BUElfQVZBSUxBQkxFKG1hY29zeCgxMC4xMyks IGlvcygxMS4wKSk7Ci0tICh2b2lkKV9hdXRvbWF0aW9uU2Vzc2lvbjooX1dLQXV0b21hdGlvblNl c3Npb24gKilhdXRvbWF0aW9uU2Vzc2lvbiBzZXRVc2VySW5wdXQ6KE5TU3RyaW5nICopdmFsdWUg Zm9yQ3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2U6KFdLUGFnZVJlZilwYWdlIFdLX0FQSV9B VkFJTEFCTEUobWFjb3N4KDEwLjEzKSwgaW9zKDExLjApKTsKLS0gKF9XS0F1dG9tYXRpb25TZXNz aW9uSmF2YVNjcmlwdERpYWxvZ1R5cGUpX2F1dG9tYXRpb25TZXNzaW9uOihfV0tBdXRvbWF0aW9u U2Vzc2lvbiAqKWF1dG9tYXRpb25TZXNzaW9uIHR5cGVPZkN1cnJlbnRKYXZhU2NyaXB0RGlhbG9n T25QYWdlOihXS1BhZ2VSZWYpcGFnZSBXS19BUElfQVZBSUxBQkxFKG1hY29zeCgxMC4xNCksIGlv cygxMi4wKSk7CiBAZW5kCiAKIE5TX0FTU1VNRV9OT05OVUxMX0VORApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvQXV0b21hdGlvblNlc3Npb25DbGllbnQuaCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL0F1dG9tYXRpb25TZXNzaW9uQ2xpZW50LmgKaW5k ZXggZGI4ODQ5OTQyOWM0NDU5MzU5MWQ5YTU2MjQyNDdiN2E0ZmRkYWZiZS4uYjBiNDZjNmUzNTI5 MDk5YzQ5NTQ5NjUyZjAxNDY3YjY2NTU1MDJkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQ29jb2EvQXV0b21hdGlvblNlc3Npb25DbGllbnQuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Db2NvYS9BdXRvbWF0aW9uU2Vzc2lvbkNsaWVudC5oCkBAIC03NCwxOSAr NzQsNiBAQCBwcml2YXRlOgogICAgICAgICBib29sIG1lc3NhZ2VPZkN1cnJlbnRKYXZhU2NyaXB0 RGlhbG9nRm9yV2ViVmlldyA6IDE7CiAgICAgICAgIGJvb2wgc2V0VXNlcklucHV0Rm9yQ3VycmVu dEphdmFTY3JpcHRQcm9tcHRGb3JXZWJWaWV3IDogMTsKICAgICAgICAgYm9vbCB0eXBlT2ZDdXJy ZW50SmF2YVNjcmlwdERpYWxvZ0ZvcldlYlZpZXcgOiAxOwotCi0gICAgICAgIC8vIEZJWE1FIDM3 NDA4NzE4OiB0aGVzZSBkZWxlZ2F0ZSBtZXRob2RzIHNob3VsZCBiZSByZW1vdmVkLgotICAgICAg ICBib29sIHJlcXVlc3ROZXdQYWdlV2l0aE9wdGlvbnMgOiAxOwotICAgICAgICBib29sIHJlcXVl c3RTd2l0Y2hUb1BhZ2UgOiAxOwotICAgICAgICBib29sIHJlcXVlc3RIaWRlV2luZG93T2ZQYWdl IDogMTsKLSAgICAgICAgYm9vbCByZXF1ZXN0UmVzdG9yZVdpbmRvd09mUGFnZSA6IDE7Ci0gICAg ICAgIGJvb2wgcmVxdWVzdE1heGltaXplV2luZG93T2ZQYWdlIDogMTsKLSAgICAgICAgYm9vbCBp c1Nob3dpbmdKYXZhU2NyaXB0RGlhbG9nT25QYWdlIDogMTsKLSAgICAgICAgYm9vbCBkaXNtaXNz Q3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2UgOiAxOwotICAgICAgICBib29sIGFjY2VwdEN1 cnJlbnRKYXZhU2NyaXB0RGlhbG9nT25QYWdlIDogMTsKLSAgICAgICAgYm9vbCBtZXNzYWdlT2ZD dXJyZW50SmF2YVNjcmlwdERpYWxvZ09uUGFnZSA6IDE7Ci0gICAgICAgIGJvb2wgc2V0VXNlcklu cHV0Rm9yQ3VycmVudEphdmFTY3JpcHRQcm9tcHRPblBhZ2UgOiAxOwotICAgICAgICBib29sIHR5 cGVPZkN1cnJlbnRKYXZhU2NyaXB0RGlhbG9nT25QYWdlIDogMTsKICAgICB9IG1fZGVsZWdhdGVN ZXRob2RzOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2Ev QXV0b21hdGlvblNlc3Npb25DbGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2Nv YS9BdXRvbWF0aW9uU2Vzc2lvbkNsaWVudC5tbQppbmRleCAzOGI2YTE3ZmU0ZDU3MDc5ZTQ5YTAz YWY1MWE5OGE5NTIwZGNlZjg2Li5iMmY3ZDI1YzI2Y2E5YTA2MjA4OGFjNDg5OWZlMDg3MDQ1MTcz YTdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9BdXRvbWF0aW9u U2Vzc2lvbkNsaWVudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9BdXRv bWF0aW9uU2Vzc2lvbkNsaWVudC5tbQpAQCAtNTQsMTkgKzU0LDYgQEAgQXV0b21hdGlvblNlc3Np b25DbGllbnQ6OkF1dG9tYXRpb25TZXNzaW9uQ2xpZW50KGlkIDxfV0tBdXRvbWF0aW9uU2Vzc2lv bkRlbGVnYXQKICAgICBtX2RlbGVnYXRlTWV0aG9kcy5tZXNzYWdlT2ZDdXJyZW50SmF2YVNjcmlw dERpYWxvZ0ZvcldlYlZpZXcgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rv cihfYXV0b21hdGlvblNlc3Npb246bWVzc2FnZU9mQ3VycmVudEphdmFTY3JpcHREaWFsb2dGb3JX ZWJWaWV3OildOwogICAgIG1fZGVsZWdhdGVNZXRob2RzLnNldFVzZXJJbnB1dEZvckN1cnJlbnRK YXZhU2NyaXB0UHJvbXB0Rm9yV2ViVmlldyA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6 QHNlbGVjdG9yKF9hdXRvbWF0aW9uU2Vzc2lvbjpzZXRVc2VySW5wdXQ6Zm9yQ3VycmVudEphdmFT Y3JpcHREaWFsb2dGb3JXZWJWaWV3OildOwogICAgIG1fZGVsZWdhdGVNZXRob2RzLnR5cGVPZkN1 cnJlbnRKYXZhU2NyaXB0RGlhbG9nRm9yV2ViVmlldyA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2Vs ZWN0b3I6QHNlbGVjdG9yKF9hdXRvbWF0aW9uU2Vzc2lvbjp0eXBlT2ZDdXJyZW50SmF2YVNjcmlw dERpYWxvZ0ZvcldlYlZpZXc6KV07Ci0KLSAgICAvLyBGSVhNRSAzNzQwODcxODogdGhlc2UgZGVs ZWdhdGUgbWV0aG9kcyBzaG91bGQgYmUgcmVtb3ZlZC4KLSAgICBtX2RlbGVnYXRlTWV0aG9kcy5y ZXF1ZXN0TmV3UGFnZVdpdGhPcHRpb25zID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpA c2VsZWN0b3IoX2F1dG9tYXRpb25TZXNzaW9uOnJlcXVlc3ROZXdQYWdlV2l0aE9wdGlvbnM6Y29t cGxldGlvbkhhbmRsZXI6KV07Ci0gICAgbV9kZWxlZ2F0ZU1ldGhvZHMucmVxdWVzdFN3aXRjaFRv UGFnZSA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9hdXRvbWF0aW9u U2Vzc2lvbjpyZXF1ZXN0U3dpdGNoVG9QYWdlOmNvbXBsZXRpb25IYW5kbGVyOildOwotICAgIG1f ZGVsZWdhdGVNZXRob2RzLnJlcXVlc3RIaWRlV2luZG93T2ZQYWdlID0gW2RlbGVnYXRlIHJlc3Bv bmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX2F1dG9tYXRpb25TZXNzaW9uOnJlcXVlc3RIaWRlV2lu ZG93T2ZQYWdlOmNvbXBsZXRpb25IYW5kbGVyOildOwotICAgIG1fZGVsZWdhdGVNZXRob2RzLnJl cXVlc3RSZXN0b3JlV2luZG93T2ZQYWdlID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpA c2VsZWN0b3IoX2F1dG9tYXRpb25TZXNzaW9uOnJlcXVlc3RSZXN0b3JlV2luZG93T2ZQYWdlOmNv bXBsZXRpb25IYW5kbGVyOildOwotICAgIG1fZGVsZWdhdGVNZXRob2RzLnJlcXVlc3RNYXhpbWl6 ZVdpbmRvd09mUGFnZSA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9h dXRvbWF0aW9uU2Vzc2lvbjpyZXF1ZXN0TWF4aW1pemVXaW5kb3dPZlBhZ2U6Y29tcGxldGlvbkhh bmRsZXI6KV07Ci0gICAgbV9kZWxlZ2F0ZU1ldGhvZHMuaXNTaG93aW5nSmF2YVNjcmlwdERpYWxv Z09uUGFnZSA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9hdXRvbWF0 aW9uU2Vzc2lvbjppc1Nob3dpbmdKYXZhU2NyaXB0RGlhbG9nT25QYWdlOildOwotICAgIG1fZGVs ZWdhdGVNZXRob2RzLmRpc21pc3NDdXJyZW50SmF2YVNjcmlwdERpYWxvZ09uUGFnZSA9IFtkZWxl Z2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9hdXRvbWF0aW9uU2Vzc2lvbjpkaXNt aXNzQ3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2U6KV07Ci0gICAgbV9kZWxlZ2F0ZU1ldGhv ZHMuYWNjZXB0Q3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2UgPSBbZGVsZWdhdGUgcmVzcG9u ZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihfYXV0b21hdGlvblNlc3Npb246YWNjZXB0Q3VycmVudEph dmFTY3JpcHREaWFsb2dPblBhZ2U6KV07Ci0gICAgbV9kZWxlZ2F0ZU1ldGhvZHMubWVzc2FnZU9m Q3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2UgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVj dG9yOkBzZWxlY3RvcihfYXV0b21hdGlvblNlc3Npb246bWVzc2FnZU9mQ3VycmVudEphdmFTY3Jp cHREaWFsb2dPblBhZ2U6KV07Ci0gICAgbV9kZWxlZ2F0ZU1ldGhvZHMuc2V0VXNlcklucHV0Rm9y Q3VycmVudEphdmFTY3JpcHRQcm9tcHRPblBhZ2UgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVj dG9yOkBzZWxlY3RvcihfYXV0b21hdGlvblNlc3Npb246c2V0VXNlcklucHV0OmZvckN1cnJlbnRK YXZhU2NyaXB0RGlhbG9nT25QYWdlOildOwotICAgIG1fZGVsZWdhdGVNZXRob2RzLnR5cGVPZkN1 cnJlbnRKYXZhU2NyaXB0RGlhbG9nT25QYWdlID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3Rv cjpAc2VsZWN0b3IoX2F1dG9tYXRpb25TZXNzaW9uOnR5cGVPZkN1cnJlbnRKYXZhU2NyaXB0RGlh bG9nT25QYWdlOildOwogfQogCiB2b2lkIEF1dG9tYXRpb25TZXNzaW9uQ2xpZW50OjpkaWREaXNj b25uZWN0RnJvbVJlbW90ZShXZWJBdXRvbWF0aW9uU2Vzc2lvbiYgc2Vzc2lvbikKQEAgLTg1LDgz ICs3Miw0MyBAQCBzdGF0aWMgaW5saW5lIF9XS0F1dG9tYXRpb25TZXNzaW9uQnJvd3NpbmdDb250 ZXh0T3B0aW9ucyB0b0FQSShBUEk6OkF1dG9tYXRpb25TZQogICAgIHJldHVybiBzdGF0aWNfY2Fz dDxfV0tBdXRvbWF0aW9uU2Vzc2lvbkJyb3dzaW5nQ29udGV4dE9wdGlvbnM+KHdrT3B0aW9ucyk7 CiB9CiAKLS8vIEZJWE1FIDM3NDA4NzE4OiBzdXBwb3J0IGZvciBXS1BhZ2VSZWYtYmFzZWQgZGVs ZWdhdGUgbWV0aG9kcyBzaG91bGQgYmUgcmVtb3ZlZC4KLS8vIFVudGlsIHRoZXNlIGFyZSByZW1v dmVkLCBwcmVmZXIgdG8gdXNlIHRoZSBXS1dlYlZpZXcgZGVsZWdhdGUgbWV0aG9kcyBpZiBpbXBs ZW1lbnRlZC4KIHZvaWQgQXV0b21hdGlvblNlc3Npb25DbGllbnQ6OnJlcXVlc3ROZXdQYWdlV2l0 aE9wdGlvbnMoV2ViQXV0b21hdGlvblNlc3Npb24mIHNlc3Npb24sIEFQSTo6QXV0b21hdGlvblNl c3Npb25Ccm93c2luZ0NvbnRleHRPcHRpb25zIG9wdGlvbnMsIENvbXBsZXRpb25IYW5kbGVyPHZv aWQoV2ViS2l0OjpXZWJQYWdlUHJveHkqKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICBp ZiAobV9kZWxlZ2F0ZU1ldGhvZHMucmVxdWVzdE5ld1dlYlZpZXdXaXRoT3B0aW9ucykgewogICAg ICAgICBbbV9kZWxlZ2F0ZS5nZXQoKSBfYXV0b21hdGlvblNlc3Npb246d3JhcHBlcihzZXNzaW9u KSByZXF1ZXN0TmV3V2ViVmlld1dpdGhPcHRpb25zOnRvQVBJKG9wdGlvbnMpIGNvbXBsZXRpb25I YW5kbGVyOm1ha2VCbG9ja1B0cihbY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRp b25IYW5kbGVyKV0oV0tXZWJWaWV3ICp3ZWJWaWV3KSBtdXRhYmxlIHsKICAgICAgICAgICAgIGNv bXBsZXRpb25IYW5kbGVyKHdlYlZpZXctPl9wYWdlLmdldCgpKTsKICAgICAgICAgfSkuZ2V0KCld OwotICAgIH0gZWxzZSBpZiAobV9kZWxlZ2F0ZU1ldGhvZHMucmVxdWVzdE5ld1BhZ2VXaXRoT3B0 aW9ucykgewotICAgICAgICBbbV9kZWxlZ2F0ZS5nZXQoKSBfYXV0b21hdGlvblNlc3Npb246d3Jh cHBlcihzZXNzaW9uKSByZXF1ZXN0TmV3UGFnZVdpdGhPcHRpb25zOnRvQVBJKG9wdGlvbnMpIGNv bXBsZXRpb25IYW5kbGVyOm1ha2VCbG9ja1B0cihbY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3Zl KGNvbXBsZXRpb25IYW5kbGVyKV0oV0tQYWdlUmVmIHBhZ2UpIG11dGFibGUgewotICAgICAgICAg ICAgY29tcGxldGlvbkhhbmRsZXIodG9JbXBsKHBhZ2UpKTsKLSAgICAgICAgfSkuZ2V0KCldOwog ICAgIH0KIH0KIAogdm9pZCBBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudDo6cmVxdWVzdFN3aXRjaFRv UGFnZShXZWJBdXRvbWF0aW9uU2Vzc2lvbiYgc2Vzc2lvbiwgV2ViUGFnZVByb3h5JiBwYWdlLCBD b21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgaWYg KCFtX2RlbGVnYXRlTWV0aG9kcy5yZXF1ZXN0U3dpdGNoVG9XZWJWaWV3ICYmICFtX2RlbGVnYXRl TWV0aG9kcy5yZXF1ZXN0U3dpdGNoVG9QYWdlKSB7Ci0gICAgICAgIGNvbXBsZXRpb25IYW5kbGVy KCk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBhdXRvIGNvbXBsZXRpb25CbG9jayA9 IG1ha2VCbG9ja1B0cihXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CiAgICAgaWYgKG1fZGVs ZWdhdGVNZXRob2RzLnJlcXVlc3RTd2l0Y2hUb1dlYlZpZXcpCi0gICAgICAgIFttX2RlbGVnYXRl LmdldCgpIF9hdXRvbWF0aW9uU2Vzc2lvbjp3cmFwcGVyKHNlc3Npb24pIHJlcXVlc3RTd2l0Y2hU b1dlYlZpZXc6ZnJvbVdlYlBhZ2VQcm94eShwYWdlKSBjb21wbGV0aW9uSGFuZGxlcjpjb21wbGV0 aW9uQmxvY2suZ2V0KCldOwotICAgIGVsc2UgaWYgKG1fZGVsZWdhdGVNZXRob2RzLnJlcXVlc3RT d2l0Y2hUb1BhZ2UpCi0gICAgICAgIFttX2RlbGVnYXRlLmdldCgpIF9hdXRvbWF0aW9uU2Vzc2lv bjp3cmFwcGVyKHNlc3Npb24pIHJlcXVlc3RTd2l0Y2hUb1BhZ2U6dG9BUEkoJnBhZ2UpIGNvbXBs ZXRpb25IYW5kbGVyOmNvbXBsZXRpb25CbG9jay5nZXQoKV07CisgICAgICAgIFttX2RlbGVnYXRl LmdldCgpIF9hdXRvbWF0aW9uU2Vzc2lvbjp3cmFwcGVyKHNlc3Npb24pIHJlcXVlc3RTd2l0Y2hU b1dlYlZpZXc6ZnJvbVdlYlBhZ2VQcm94eShwYWdlKSBjb21wbGV0aW9uSGFuZGxlcjptYWtlQmxv Y2tQdHIoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpLmdldCgpXTsKIH0KIAogdm9pZCBBdXRv bWF0aW9uU2Vzc2lvbkNsaWVudDo6cmVxdWVzdEhpZGVXaW5kb3dPZlBhZ2UoV2ViQXV0b21hdGlv blNlc3Npb24mIHNlc3Npb24sIFdlYlBhZ2VQcm94eSYgcGFnZSwgQ29tcGxldGlvbkhhbmRsZXI8 dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIGlmICghbV9kZWxlZ2F0ZU1ldGhv ZHMucmVxdWVzdEhpZGVXaW5kb3dPZldlYlZpZXcgJiYgIW1fZGVsZWdhdGVNZXRob2RzLnJlcXVl c3RIaWRlV2luZG93T2ZQYWdlKSB7Ci0gICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7Ci0gICAg ICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBhdXRvIGNvbXBsZXRpb25CbG9jayA9IG1ha2VCbG9j a1B0cihXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CiAgICAgaWYgKG1fZGVsZWdhdGVNZXRo b2RzLnJlcXVlc3RIaWRlV2luZG93T2ZXZWJWaWV3KQotICAgICAgICBbbV9kZWxlZ2F0ZS5nZXQo KSBfYXV0b21hdGlvblNlc3Npb246d3JhcHBlcihzZXNzaW9uKSByZXF1ZXN0SGlkZVdpbmRvd09m V2ViVmlldzpmcm9tV2ViUGFnZVByb3h5KHBhZ2UpIGNvbXBsZXRpb25IYW5kbGVyOmNvbXBsZXRp b25CbG9jay5nZXQoKV07Ci0gICAgZWxzZSBpZiAobV9kZWxlZ2F0ZU1ldGhvZHMucmVxdWVzdEhp ZGVXaW5kb3dPZlBhZ2UpCi0gICAgICAgIFttX2RlbGVnYXRlLmdldCgpIF9hdXRvbWF0aW9uU2Vz c2lvbjp3cmFwcGVyKHNlc3Npb24pIHJlcXVlc3RIaWRlV2luZG93T2ZQYWdlOnRvQVBJKCZwYWdl KSBjb21wbGV0aW9uSGFuZGxlcjpjb21wbGV0aW9uQmxvY2suZ2V0KCldOworICAgICAgICBbbV9k ZWxlZ2F0ZS5nZXQoKSBfYXV0b21hdGlvblNlc3Npb246d3JhcHBlcihzZXNzaW9uKSByZXF1ZXN0 SGlkZVdpbmRvd09mV2ViVmlldzpmcm9tV2ViUGFnZVByb3h5KHBhZ2UpIGNvbXBsZXRpb25IYW5k bGVyOm1ha2VCbG9ja1B0cihXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSkuZ2V0KCldOwogfQog CiB2b2lkIEF1dG9tYXRpb25TZXNzaW9uQ2xpZW50OjpyZXF1ZXN0UmVzdG9yZVdpbmRvd09mUGFn ZShXZWJBdXRvbWF0aW9uU2Vzc2lvbiYgc2Vzc2lvbiwgV2ViUGFnZVByb3h5JiBwYWdlLCBDb21w bGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgaWYgKCFt X2RlbGVnYXRlTWV0aG9kcy5yZXF1ZXN0UmVzdG9yZVdpbmRvd09mV2ViVmlldyAmJiAhbV9kZWxl Z2F0ZU1ldGhvZHMucmVxdWVzdFJlc3RvcmVXaW5kb3dPZlBhZ2UpIHsKLSAgICAgICAgY29tcGxl dGlvbkhhbmRsZXIoKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIGF1dG8gY29tcGxl dGlvbkJsb2NrID0gbWFrZUJsb2NrUHRyKFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKICAg ICBpZiAobV9kZWxlZ2F0ZU1ldGhvZHMucmVxdWVzdFJlc3RvcmVXaW5kb3dPZldlYlZpZXcpCi0g ICAgICAgIFttX2RlbGVnYXRlLmdldCgpIF9hdXRvbWF0aW9uU2Vzc2lvbjp3cmFwcGVyKHNlc3Np b24pIHJlcXVlc3RSZXN0b3JlV2luZG93T2ZXZWJWaWV3OmZyb21XZWJQYWdlUHJveHkocGFnZSkg Y29tcGxldGlvbkhhbmRsZXI6Y29tcGxldGlvbkJsb2NrLmdldCgpXTsKLSAgICBlbHNlIGlmICht X2RlbGVnYXRlTWV0aG9kcy5yZXF1ZXN0UmVzdG9yZVdpbmRvd09mUGFnZSkKLSAgICAgICAgW21f ZGVsZWdhdGUuZ2V0KCkgX2F1dG9tYXRpb25TZXNzaW9uOndyYXBwZXIoc2Vzc2lvbikgcmVxdWVz dFJlc3RvcmVXaW5kb3dPZlBhZ2U6dG9BUEkoJnBhZ2UpIGNvbXBsZXRpb25IYW5kbGVyOmNvbXBs ZXRpb25CbG9jay5nZXQoKV07CisgICAgICAgIFttX2RlbGVnYXRlLmdldCgpIF9hdXRvbWF0aW9u U2Vzc2lvbjp3cmFwcGVyKHNlc3Npb24pIHJlcXVlc3RSZXN0b3JlV2luZG93T2ZXZWJWaWV3OmZy b21XZWJQYWdlUHJveHkocGFnZSkgY29tcGxldGlvbkhhbmRsZXI6bWFrZUJsb2NrUHRyKFdURk1v dmUoY29tcGxldGlvbkhhbmRsZXIpKS5nZXQoKV07CiB9CiAKIHZvaWQgQXV0b21hdGlvblNlc3Np b25DbGllbnQ6OnJlcXVlc3RNYXhpbWl6ZVdpbmRvd09mUGFnZShXZWJBdXRvbWF0aW9uU2Vzc2lv biYgc2Vzc2lvbiwgV2ViUGFnZVByb3h5JiBwYWdlLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+ JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgaWYgKCFtX2RlbGVnYXRlTWV0aG9kcy5yZXF1 ZXN0TWF4aW1pemVXaW5kb3dPZldlYlZpZXcgJiYgIW1fZGVsZWdhdGVNZXRob2RzLnJlcXVlc3RN YXhpbWl6ZVdpbmRvd09mUGFnZSkgewotICAgICAgICBjb21wbGV0aW9uSGFuZGxlcigpOwotICAg ICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgYXV0byBjb21wbGV0aW9uQmxvY2sgPSBtYWtlQmxv Y2tQdHIoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwogICAgIGlmIChtX2RlbGVnYXRlTWV0 aG9kcy5yZXF1ZXN0TWF4aW1pemVXaW5kb3dPZldlYlZpZXcpCi0gICAgICAgIFttX2RlbGVnYXRl LmdldCgpIF9hdXRvbWF0aW9uU2Vzc2lvbjp3cmFwcGVyKHNlc3Npb24pIHJlcXVlc3RNYXhpbWl6 ZVdpbmRvd09mV2ViVmlldzpmcm9tV2ViUGFnZVByb3h5KHBhZ2UpIGNvbXBsZXRpb25IYW5kbGVy OmNvbXBsZXRpb25CbG9jay5nZXQoKV07Ci0gICAgZWxzZSBpZiAobV9kZWxlZ2F0ZU1ldGhvZHMu cmVxdWVzdE1heGltaXplV2luZG93T2ZQYWdlKQotICAgICAgICBbbV9kZWxlZ2F0ZS5nZXQoKSBf YXV0b21hdGlvblNlc3Npb246d3JhcHBlcihzZXNzaW9uKSByZXF1ZXN0TWF4aW1pemVXaW5kb3dP ZlBhZ2U6dG9BUEkoJnBhZ2UpIGNvbXBsZXRpb25IYW5kbGVyOmNvbXBsZXRpb25CbG9jay5nZXQo KV07CisgICAgICAgIFttX2RlbGVnYXRlLmdldCgpIF9hdXRvbWF0aW9uU2Vzc2lvbjp3cmFwcGVy KHNlc3Npb24pIHJlcXVlc3RNYXhpbWl6ZVdpbmRvd09mV2ViVmlldzpmcm9tV2ViUGFnZVByb3h5 KHBhZ2UpIGNvbXBsZXRpb25IYW5kbGVyOm1ha2VCbG9ja1B0cihXVEZNb3ZlKGNvbXBsZXRpb25I YW5kbGVyKSkuZ2V0KCldOwogfQogCiBib29sIEF1dG9tYXRpb25TZXNzaW9uQ2xpZW50Ojppc1No b3dpbmdKYXZhU2NyaXB0RGlhbG9nT25QYWdlKFdlYkF1dG9tYXRpb25TZXNzaW9uJiBzZXNzaW9u LCBXZWJQYWdlUHJveHkmIHBhZ2UpCiB7CiAgICAgaWYgKG1fZGVsZWdhdGVNZXRob2RzLmlzU2hv d2luZ0phdmFTY3JpcHREaWFsb2dGb3JXZWJWaWV3KQogICAgICAgICByZXR1cm4gW21fZGVsZWdh dGUuZ2V0KCkgX2F1dG9tYXRpb25TZXNzaW9uOndyYXBwZXIoc2Vzc2lvbikgaXNTaG93aW5nSmF2 YVNjcmlwdERpYWxvZ0ZvcldlYlZpZXc6ZnJvbVdlYlBhZ2VQcm94eShwYWdlKV07Ci0gICAgZWxz ZSBpZiAobV9kZWxlZ2F0ZU1ldGhvZHMuaXNTaG93aW5nSmF2YVNjcmlwdERpYWxvZ09uUGFnZSkK LSAgICAgICAgcmV0dXJuIFttX2RlbGVnYXRlLmdldCgpIF9hdXRvbWF0aW9uU2Vzc2lvbjp3cmFw cGVyKHNlc3Npb24pIGlzU2hvd2luZ0phdmFTY3JpcHREaWFsb2dPblBhZ2U6dG9BUEkoJnBhZ2Up XTsKICAgICAKICAgICByZXR1cm4gZmFsc2U7CiB9CkBAIC0xNzAsMTYgKzExNywxMiBAQCB2b2lk IEF1dG9tYXRpb25TZXNzaW9uQ2xpZW50OjpkaXNtaXNzQ3VycmVudEphdmFTY3JpcHREaWFsb2dP blBhZ2UoV2ViQXV0b21hdGlvbgogewogICAgIGlmIChtX2RlbGVnYXRlTWV0aG9kcy5kaXNtaXNz Q3VycmVudEphdmFTY3JpcHREaWFsb2dGb3JXZWJWaWV3KQogICAgICAgICBbbV9kZWxlZ2F0ZS5n ZXQoKSBfYXV0b21hdGlvblNlc3Npb246d3JhcHBlcihzZXNzaW9uKSBkaXNtaXNzQ3VycmVudEph dmFTY3JpcHREaWFsb2dGb3JXZWJWaWV3OmZyb21XZWJQYWdlUHJveHkocGFnZSldOwotICAgIGVs c2UgaWYgKG1fZGVsZWdhdGVNZXRob2RzLmRpc21pc3NDdXJyZW50SmF2YVNjcmlwdERpYWxvZ09u UGFnZSkKLSAgICAgICAgW21fZGVsZWdhdGUuZ2V0KCkgX2F1dG9tYXRpb25TZXNzaW9uOndyYXBw ZXIoc2Vzc2lvbikgZGlzbWlzc0N1cnJlbnRKYXZhU2NyaXB0RGlhbG9nT25QYWdlOnRvQVBJKCZw YWdlKV07CiB9CiAKIHZvaWQgQXV0b21hdGlvblNlc3Npb25DbGllbnQ6OmFjY2VwdEN1cnJlbnRK YXZhU2NyaXB0RGlhbG9nT25QYWdlKFdlYkF1dG9tYXRpb25TZXNzaW9uJiBzZXNzaW9uLCBXZWJQ YWdlUHJveHkmIHBhZ2UpCiB7CiAgICAgaWYgKG1fZGVsZWdhdGVNZXRob2RzLmFjY2VwdEN1cnJl bnRKYXZhU2NyaXB0RGlhbG9nRm9yV2ViVmlldykKICAgICAgICAgW21fZGVsZWdhdGUuZ2V0KCkg X2F1dG9tYXRpb25TZXNzaW9uOndyYXBwZXIoc2Vzc2lvbikgYWNjZXB0Q3VycmVudEphdmFTY3Jp cHREaWFsb2dGb3JXZWJWaWV3OmZyb21XZWJQYWdlUHJveHkocGFnZSldOwotICAgIGVsc2UgaWYg KG1fZGVsZWdhdGVNZXRob2RzLmFjY2VwdEN1cnJlbnRKYXZhU2NyaXB0RGlhbG9nT25QYWdlKQot ICAgICAgICBbbV9kZWxlZ2F0ZS5nZXQoKSBfYXV0b21hdGlvblNlc3Npb246d3JhcHBlcihzZXNz aW9uKSBhY2NlcHRDdXJyZW50SmF2YVNjcmlwdERpYWxvZ09uUGFnZTp0b0FQSSgmcGFnZSldOwog fQogCiBTdHJpbmcgQXV0b21hdGlvblNlc3Npb25DbGllbnQ6Om1lc3NhZ2VPZkN1cnJlbnRKYXZh U2NyaXB0RGlhbG9nT25QYWdlKFdlYkF1dG9tYXRpb25TZXNzaW9uJiBzZXNzaW9uLCBXZWJQYWdl UHJveHkmIHBhZ2UpCkBAIC0xODcsOSArMTMwLDYgQEAgU3RyaW5nIEF1dG9tYXRpb25TZXNzaW9u Q2xpZW50OjptZXNzYWdlT2ZDdXJyZW50SmF2YVNjcmlwdERpYWxvZ09uUGFnZShXZWJBdXRvbWEK ICAgICBpZiAobV9kZWxlZ2F0ZU1ldGhvZHMubWVzc2FnZU9mQ3VycmVudEphdmFTY3JpcHREaWFs b2dGb3JXZWJWaWV3KQogICAgICAgICByZXR1cm4gW21fZGVsZWdhdGUuZ2V0KCkgX2F1dG9tYXRp b25TZXNzaW9uOndyYXBwZXIoc2Vzc2lvbikgbWVzc2FnZU9mQ3VycmVudEphdmFTY3JpcHREaWFs b2dGb3JXZWJWaWV3OmZyb21XZWJQYWdlUHJveHkocGFnZSldOwogCi0gICAgaWYgKG1fZGVsZWdh dGVNZXRob2RzLm1lc3NhZ2VPZkN1cnJlbnRKYXZhU2NyaXB0RGlhbG9nT25QYWdlKQotICAgICAg ICByZXR1cm4gW21fZGVsZWdhdGUuZ2V0KCkgX2F1dG9tYXRpb25TZXNzaW9uOndyYXBwZXIoc2Vz c2lvbikgbWVzc2FnZU9mQ3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2U6dG9BUEkoJnBhZ2Up XTsKLQogICAgIHJldHVybiBTdHJpbmcoKTsKIH0KIApAQCAtMTk3LDggKzEzNyw2IEBAIHZvaWQg QXV0b21hdGlvblNlc3Npb25DbGllbnQ6OnNldFVzZXJJbnB1dEZvckN1cnJlbnRKYXZhU2NyaXB0 UHJvbXB0T25QYWdlKFdlYkF1CiB7CiAgICAgaWYgKG1fZGVsZWdhdGVNZXRob2RzLnNldFVzZXJJ bnB1dEZvckN1cnJlbnRKYXZhU2NyaXB0UHJvbXB0Rm9yV2ViVmlldykKICAgICAgICAgW21fZGVs ZWdhdGUuZ2V0KCkgX2F1dG9tYXRpb25TZXNzaW9uOndyYXBwZXIoc2Vzc2lvbikgc2V0VXNlcklu cHV0OnZhbHVlIGZvckN1cnJlbnRKYXZhU2NyaXB0RGlhbG9nRm9yV2ViVmlldzpmcm9tV2ViUGFn ZVByb3h5KHBhZ2UpXTsKLSAgICBlbHNlIGlmIChtX2RlbGVnYXRlTWV0aG9kcy5zZXRVc2VySW5w dXRGb3JDdXJyZW50SmF2YVNjcmlwdFByb21wdE9uUGFnZSkKLSAgICAgICAgW21fZGVsZWdhdGUu Z2V0KCkgX2F1dG9tYXRpb25TZXNzaW9uOndyYXBwZXIoc2Vzc2lvbikgc2V0VXNlcklucHV0OnZh bHVlIGZvckN1cnJlbnRKYXZhU2NyaXB0RGlhbG9nT25QYWdlOnRvQVBJKCZwYWdlKV07CiB9CiAK IHN0YXRpYyBPcHRpb25hbDxBUEk6OkF1dG9tYXRpb25TZXNzaW9uQ2xpZW50OjpKYXZhU2NyaXB0 RGlhbG9nVHlwZT4gdG9JbXBsKF9XS0F1dG9tYXRpb25TZXNzaW9uSmF2YVNjcmlwdERpYWxvZ1R5 cGUgdHlwZSkKQEAgLTIxOSw4ICsxNTcsNiBAQCBPcHRpb25hbDxBUEk6OkF1dG9tYXRpb25TZXNz aW9uQ2xpZW50OjpKYXZhU2NyaXB0RGlhbG9nVHlwZT4gQXV0b21hdGlvblNlc3Npb25DbAogewog ICAgIGlmIChtX2RlbGVnYXRlTWV0aG9kcy50eXBlT2ZDdXJyZW50SmF2YVNjcmlwdERpYWxvZ0Zv cldlYlZpZXcpCiAgICAgICAgIHJldHVybiB0b0ltcGwoW21fZGVsZWdhdGUuZ2V0KCkgX2F1dG9t YXRpb25TZXNzaW9uOndyYXBwZXIoc2Vzc2lvbikgdHlwZU9mQ3VycmVudEphdmFTY3JpcHREaWFs b2dGb3JXZWJWaWV3OmZyb21XZWJQYWdlUHJveHkocGFnZSldKTsKLSAgICBpZiAobV9kZWxlZ2F0 ZU1ldGhvZHMudHlwZU9mQ3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2UpCi0gICAgICAgIHJl dHVybiB0b0ltcGwoW21fZGVsZWdhdGUuZ2V0KCkgX2F1dG9tYXRpb25TZXNzaW9uOndyYXBwZXIo c2Vzc2lvbikgdHlwZU9mQ3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2U6dG9BUEkoJnBhZ2Up XSk7CiAKICAgICByZXR1cm4gQVBJOjpBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudDo6SmF2YVNjcmlw dERpYWxvZ1R5cGU6OlByb21wdDsKIH0K