199371 2019-07-01 13:33:49 -0700 Add new decidePolicyForNavigationAction SPI with preferences and userInfo 2019-07-01 15:07:17 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen aestes beidson commit-queue thorton webkit-bug-importer oldest_to_newest 1549287 0 achristensen 2019-07-01 13:33:49 -0700 Add new decidePolicyForNavigationAction SPI with preferences and userInfo 1549288 1 373251 achristensen 2019-07-01 13:35:18 -0700 Created attachment 373251 Patch 1549289 2 achristensen 2019-07-01 13:35:21 -0700 <rdar://problem/52352905> 1549329 3 373264 achristensen 2019-07-01 14:19:16 -0700 Created attachment 373264 Patch 1549355 4 373264 commit-queue 2019-07-01 15:07:15 -0700 Comment on attachment 373264 Patch Clearing flags on attachment: 373264 Committed r247026: <https://trac.webkit.org/changeset/247026> 1549356 5 commit-queue 2019-07-01 15:07:17 -0700 All reviewed patches have been landed. Closing bug. 373251 2019-07-01 13:35:18 -0700 2019-07-01 14:19:14 -0700 Patch bug-199371-20190701133518.patch text/plain 14724 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2ODk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRjYjNlMTA5MTAxYWU3Yzgy NDcxYTAzNTZkYjA4MzdiY2M4MjVmMTMuLmY1ODZlOTU0NTdkMmNkNDIyMmE1NzZkYTk5M2FhOGJj YjAwMmEyOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTktMDctMDEgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBBZGQgbmV3IGRl Y2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24gU1BJIHdpdGggcHJlZmVyZW5jZXMgYW5kIHVz ZXJJbmZvCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x OTkzNzEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUyMzUyOTA1PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFsc28gZGVwcmVjYXRlIHNvbWUgb2xk ZXIgU1BJIHNvIHdlIG1heSBzb21lZGF5IGNsZWFuIHVwIHRoaXMgbWVzcy4KKworICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlLmg6CisgICAg ICAgICogVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5oOgorICAgICAgICAqIFVJUHJv Y2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW06CisgICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRp b25TdGF0ZTo6c2V0TmF2aWdhdGlvbkRlbGVnYXRlKToKKyAgICAgICAgKFdlYktpdDo6TmF2aWdh dGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0 aW9uKToKKyAgICAgICAgKFdlYktpdDo6TmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50 OjpzaG91bGRCeXBhc3NDb250ZW50TW9kZVNhZmVndWFyZHMgY29uc3QpOgorCiAyMDE5LTA2LTI3 ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBX ZWJTb2NrZXRzOiBhdm9pZCBkYXRhIGNvcGllcyB3aGVuIHF1ZXVpbmcgdGFza3MgaW4gV2ViU29j a2V0Q2hhbm5lbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L1dLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZS5oCmluZGV4IDM5MjZiYjBmM2Yz Njg0MTk5NmZhYmEzMmRiMThhOGIxNzI2MzRiMTkuLjA2ZTEwMWYzMDdmZTQ4MThmZmNmYTdjMjIx MDg0N2EwZWQ2ODdlODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS05hdmlnYXRpb25EZWxlZ2F0ZVByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlLmgKQEAgLTkzLDgg KzkzLDkgQEAgc3RhdGljIGNvbnN0IFdLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5IF9XS05hdmln YXRpb25SZXNwb25zZVBvbGljeUJlY29tZURvd25sb2EKIC0gKHZvaWQpX3dlYlZpZXdXaWxsRW5k TmF2aWdhdGlvbkdlc3R1cmU6KFdLV2ViVmlldyAqKXdlYlZpZXcgd2l0aE5hdmlnYXRpb25Ub0Jh Y2tGb3J3YXJkTGlzdEl0ZW06KFdLQmFja0ZvcndhcmRMaXN0SXRlbSAqKWl0ZW07CiAtICh2b2lk KV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHdpbGxTbmFwc2hvdEJhY2tGb3J3YXJkTGlz dEl0ZW06KFdLQmFja0ZvcndhcmRMaXN0SXRlbSAqKWl0ZW07CiAtICh2b2lkKV93ZWJWaWV3RGlk UmVtb3ZlTmF2aWdhdGlvbkdlc3R1cmVTbmFwc2hvdDooV0tXZWJWaWV3ICopd2ViVmlldyBXS19B UElfQVZBSUxBQkxFKG1hY29zKDEwLjEyKSwgaW9zKDEwLjApKTsKLS0gKHZvaWQpX3dlYlZpZXc6 KFdLV2ViVmlldyAqKXdlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbjooV0tO YXZpZ2F0aW9uQWN0aW9uICopbmF2aWdhdGlvbkFjdGlvbiBkZWNpc2lvbkhhbmRsZXI6KHZvaWQg KF4pKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeSwgX1dLV2Vic2l0ZVBvbGljaWVzICopKWRlY2lz aW9uSGFuZGxlciBXS19BUElfREVQUkVDQVRFRF9XSVRIX1JFUExBQ0VNRU5UKCJfd2ViVmlldzpk ZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOnVzZXJJbmZvOmRlY2lzaW9uSGFuZGxlcjoi LCBtYWNvcygxMC4xMi4zLCAxMC4xNC40KSwgaW9zKDEwLjMsIDEyLjIpKTsKLS0gKHZvaWQpX3dl YlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlv bjooV0tOYXZpZ2F0aW9uQWN0aW9uICopbmF2aWdhdGlvbkFjdGlvbiB1c2VySW5mbzooaWQgPE5T U2VjdXJlQ29kaW5nPil1c2VySW5mbyBkZWNpc2lvbkhhbmRsZXI6KHZvaWQgKF4pKFdLTmF2aWdh dGlvbkFjdGlvblBvbGljeSwgX1dLV2Vic2l0ZVBvbGljaWVzICopKWRlY2lzaW9uSGFuZGxlciBX S19BUElfQVZBSUxBQkxFKG1hY29zKDEwLjEzLjQpLCBpb3MoMTEuMykpOworLSAodm9pZClfd2Vi VmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9u OihXS05hdmlnYXRpb25BY3Rpb24gKiluYXZpZ2F0aW9uQWN0aW9uIGRlY2lzaW9uSGFuZGxlcjoo dm9pZCAoXikoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5LCBfV0tXZWJzaXRlUG9saWNpZXMgKikp ZGVjaXNpb25IYW5kbGVyIFdLX0FQSV9ERVBSRUNBVEVEX1dJVEhfUkVQTEFDRU1FTlQoIl93ZWJW aWV3OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246cHJlZmVyZW5jZXM6dXNlckluZm86 ZGVjaXNpb25IYW5kbGVyOiIsIG1hY29zKDEwLjEyLjMsIDEwLjE0LjQpLCBpb3MoMTAuMywgMTIu MikpOworLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkZWNpZGVQb2xpY3lG b3JOYXZpZ2F0aW9uQWN0aW9uOihXS05hdmlnYXRpb25BY3Rpb24gKiluYXZpZ2F0aW9uQWN0aW9u IHVzZXJJbmZvOihpZCA8TlNTZWN1cmVDb2Rpbmc+KXVzZXJJbmZvIGRlY2lzaW9uSGFuZGxlcjoo dm9pZCAoXikoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5LCBfV0tXZWJzaXRlUG9saWNpZXMgKikp ZGVjaXNpb25IYW5kbGVyIFdLX0FQSV9ERVBSRUNBVEVEX1dJVEhfUkVQTEFDRU1FTlQoIl93ZWJW aWV3OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246cHJlZmVyZW5jZXM6dXNlckluZm86 ZGVjaXNpb25IYW5kbGVyOiIsIG1hY29zKDEwLjEzLjQsIFdLX01BQ19UQkEpLCBpb3MoMTEuMywg V0tfSU9TX1RCQSkpOworLSh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGRlY2lk ZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246KFdLTmF2aWdhdGlvbkFjdGlvbiAqKW5hdmlnYXRp b25BY3Rpb24gcHJlZmVyZW5jZXM6KFdLV2VicGFnZVByZWZlcmVuY2VzICopcHJlZmVyZW5jZXMg dXNlckluZm86KGlkIDxOU1NlY3VyZUNvZGluZz4pdXNlckluZm8gZGVjaXNpb25IYW5kbGVyOih2 b2lkICheKShXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3ksIFdLV2VicGFnZVByZWZlcmVuY2VzICop KWRlY2lzaW9uSGFuZGxlciBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3Mo V0tfSU9TX1RCQSkpOwogLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkaWRT dGFydFByb3Zpc2lvbmFsTmF2aWdhdGlvbjooV0tOYXZpZ2F0aW9uICopbmF2aWdhdGlvbiB1c2Vy SW5mbzooaWQgPE5TU2VjdXJlQ29kaW5nPil1c2VySW5mbyBXS19BUElfQVZBSUxBQkxFKG1hY29z KDEwLjEzLjQpLCBpb3MoMTEuMykpOwogLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2Vi VmlldyBkaWRGYWlsTmF2aWdhdGlvbjooV0tOYXZpZ2F0aW9uICopbmF2aWdhdGlvbiB3aXRoRXJy b3I6KE5TRXJyb3IgKillcnJvciB1c2VySW5mbzooaWQgPE5TU2VjdXJlQ29kaW5nPil1c2VySW5m byBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEwLjEzLjQpLCBpb3MoMTEuMykpOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5oCmluZGV4IGQ2MTYy OGRkYTAwMWI1N2U5OGY5Y2YyNjA2MGE1NzcyNWY5ZmZhNmEuLmIzYTNkNmZiYTk2NzQ2YWI0MmUy NDE1NTkzNDNhNDg4ZDVjZjc2M2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0NvY29hL05hdmlnYXRpb25TdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Nv Y29hL05hdmlnYXRpb25TdGF0ZS5oCkBAIC0xOTMsNiArMTkzLDcgQEAgcHJpdmF0ZToKICAgICBz dHJ1Y3QgewogICAgICAgICBib29sIHdlYlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0 aW9uRGVjaXNpb25IYW5kbGVyIDogMTsKICAgICAgICAgYm9vbCB3ZWJWaWV3RGVjaWRlUG9saWN5 Rm9yTmF2aWdhdGlvbkFjdGlvbldpdGhQcmVmZXJlbmNlc0RlY2lzaW9uSGFuZGxlciA6IDE7Cisg ICAgICAgIGJvb2wgd2ViVmlld0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25XaXRoUHJl ZmVyZW5jZXNVc2VySW5mb0RlY2lzaW9uSGFuZGxlciA6IDE7CiAgICAgICAgIGJvb2wgd2ViVmll d0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25EZWNpc2lvbkhhbmRsZXJXZWJzaXRlUG9s aWNpZXMgOiAxOwogICAgICAgICBib29sIHdlYlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9u QWN0aW9uVXNlckluZm9EZWNpc2lvbkhhbmRsZXJXZWJzaXRlUG9saWNpZXMgOiAxOwogICAgICAg ICBib29sIHdlYlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uUmVzcG9uc2VEZWNpc2lvbkhh bmRsZXIgOiAxOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2 aWdhdGlvblN0YXRlLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlv blN0YXRlLm1tCmluZGV4IDZlOTk1MDBhOTQ0NGM0ZWFkYWI3NWM4MWI0NGZjYjZiNDQ2ZjY0MjIu LjU5Zjg3YTJjNzQyOTIxNDZlNmQ0MWVjNzc2NDQwN2IzMjI4NDFiMDAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0KQEAgLTE0OSw2ICsx NDksNyBAQCB2b2lkIE5hdmlnYXRpb25TdGF0ZTo6c2V0TmF2aWdhdGlvbkRlbGVnYXRlKGlkIDxX S05hdmlnYXRpb25EZWxlZ2F0ZT4gZGVsZWdhdGUpCiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVN ZXRob2RzLndlYlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uV2l0aFByZWZlcmVu Y2VzRGVjaXNpb25IYW5kbGVyID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0 b3Iod2ViVmlldzpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOnByZWZlcmVuY2VzOmRl Y2lzaW9uSGFuZGxlcjopXTsKICAgICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmll d0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25EZWNpc2lvbkhhbmRsZXJXZWJzaXRlUG9s aWNpZXMgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzpk ZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOmRlY2lzaW9uSGFuZGxlcjopXTsKICAgICBt X25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RlY2lkZVBvbGljeUZvck5hdmlnYXRp b25BY3Rpb25Vc2VySW5mb0RlY2lzaW9uSGFuZGxlcldlYnNpdGVQb2xpY2llcyA9IFtkZWxlZ2F0 ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OmRlY2lkZVBvbGljeUZvck5h dmlnYXRpb25BY3Rpb246dXNlckluZm86ZGVjaXNpb25IYW5kbGVyOildOworICAgIG1fbmF2aWdh dGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlv bldpdGhQcmVmZXJlbmNlc1VzZXJJbmZvRGVjaXNpb25IYW5kbGVyID0gW2RlbGVnYXRlIHJlc3Bv bmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlv bkFjdGlvbjpwcmVmZXJlbmNlczp1c2VySW5mbzpkZWNpc2lvbkhhbmRsZXI6KV07CiAgICAgbV9u YXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9u UmVzcG9uc2VEZWNpc2lvbkhhbmRsZXIgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBz ZWxlY3Rvcih3ZWJWaWV3OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25SZXNwb25zZTpkZWNpc2lv bkhhbmRsZXI6KV07CiAKICAgICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0Rp ZFN0YXJ0UHJvdmlzaW9uYWxOYXZpZ2F0aW9uID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3Rv cjpAc2VsZWN0b3Iod2ViVmlldzpkaWRTdGFydFByb3Zpc2lvbmFsTmF2aWdhdGlvbjopXTsKQEAg LTUyMiw2ICs1MjMsNyBAQCB2b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6 ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihXZWJQYWdlUAogICAgICAgICBkZWZhdWx0 V2Vic2l0ZVBvbGljaWVzID0gcG9saWNpZXMtPmNvcHkoKTsKIAogICAgIGlmICghbV9uYXZpZ2F0 aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdEZWNpZGVQb2xpY3lG b3JOYXZpZ2F0aW9uQWN0aW9uRGVjaXNpb25IYW5kbGVyCisgICAgICAgICYmICFtX25hdmlnYXRp b25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RlY2lkZVBvbGljeUZv ck5hdmlnYXRpb25BY3Rpb25XaXRoUHJlZmVyZW5jZXNVc2VySW5mb0RlY2lzaW9uSGFuZGxlcgog ICAgICAgICAmJiAhbV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2Rz LndlYlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uV2l0aFByZWZlcmVuY2VzRGVj aXNpb25IYW5kbGVyCiAgICAgICAgICYmICFtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25E ZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25EZWNp c2lvbkhhbmRsZXJXZWJzaXRlUG9saWNpZXMKICAgICAgICAgJiYgIW1fbmF2aWdhdGlvblN0YXRl Lm1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGVjaWRlUG9saWN5Rm9yTmF2aWdh dGlvbkFjdGlvblVzZXJJbmZvRGVjaXNpb25IYW5kbGVyV2Vic2l0ZVBvbGljaWVzKSB7CkBAIC01 NjEsMTIgKzU2MywxMyBAQCB2b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6 ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihXZWJQYWdlUAogICAgIGlmICghbmF2aWdh dGlvbkRlbGVnYXRlKQogICAgICAgICByZXR1cm47CiAKLSAgICBib29sIGRlbGVnYXRlSGFzV2Vi cGFnZVByZWZlcmVuY2VzID0gbV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVN ZXRob2RzLndlYlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uV2l0aFByZWZlcmVu Y2VzRGVjaXNpb25IYW5kbGVyOworICAgIGJvb2wgZGVsZWdhdGVIYXNXZWJwYWdlUHJlZmVyZW5j ZXMgPSBtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmll d0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25XaXRoUHJlZmVyZW5jZXNEZWNpc2lvbkhh bmRsZXIKKyAgICAgICAgfHwgbV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVN ZXRob2RzLndlYlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uV2l0aFByZWZlcmVu Y2VzVXNlckluZm9EZWNpc2lvbkhhbmRsZXI7CiAgICAgYm9vbCBkZWxlZ2F0ZUhhc1dlYnNpdGVQ b2xpY2llcyA9IG1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53 ZWJWaWV3RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkRlY2lzaW9uSGFuZGxlcldlYnNp dGVQb2xpY2llcyB8fCBtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhv ZHMud2ViVmlld0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25Vc2VySW5mb0RlY2lzaW9u SGFuZGxlcldlYnNpdGVQb2xpY2llczsKIAogICAgIGF1dG8gc2VsZWN0b3JGb3JDb21wbGV0aW9u SGFuZGxlckNoZWNrZXIgPSAoWyZdICgpIC0+IFNFTCB7CiAgICAgICAgIGlmIChkZWxlZ2F0ZUhh c1dlYnBhZ2VQcmVmZXJlbmNlcykKLSAgICAgICAgICAgIHJldHVybiBAc2VsZWN0b3Iod2ViVmll dzpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOnByZWZlcmVuY2VzOmRlY2lzaW9uSGFu ZGxlcjopOworICAgICAgICAgICAgcmV0dXJuIG1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlv bkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbldp dGhQcmVmZXJlbmNlc0RlY2lzaW9uSGFuZGxlciA/IEBzZWxlY3Rvcih3ZWJWaWV3OmRlY2lkZVBv bGljeUZvck5hdmlnYXRpb25BY3Rpb246cHJlZmVyZW5jZXM6ZGVjaXNpb25IYW5kbGVyOikgOiBA c2VsZWN0b3IoX3dlYlZpZXc6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbjpwcmVmZXJl bmNlczp1c2VySW5mbzpkZWNpc2lvbkhhbmRsZXI6KTsKICAgICAgICAgaWYgKGRlbGVnYXRlSGFz V2Vic2l0ZVBvbGljaWVzKQogICAgICAgICAgICAgcmV0dXJuIEBzZWxlY3Rvcihfd2ViVmlldzpk ZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOmRlY2lzaW9uSGFuZGxlcjopOwogICAgICAg ICByZXR1cm4gQHNlbGVjdG9yKHdlYlZpZXc6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlv bjpkZWNpc2lvbkhhbmRsZXI6KTsKQEAgLTYzNiwxMyArNjM5LDE4IEBAIHZvaWQgTmF2aWdhdGlv blN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9u KFdlYlBhZ2VQCiAgICAgICAgIH0KICAgICB9OwogCi0gICAgaWYgKGRlbGVnYXRlSGFzV2VicGFn ZVByZWZlcmVuY2VzKQotICAgICAgICBbbmF2aWdhdGlvbkRlbGVnYXRlIHdlYlZpZXc6bV9uYXZp Z2F0aW9uU3RhdGUubV93ZWJWaWV3IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246d3Jh cHBlcihuYXZpZ2F0aW9uQWN0aW9uKSBwcmVmZXJlbmNlczp3cmFwcGVyKGRlZmF1bHRXZWJzaXRl UG9saWNpZXMpIGRlY2lzaW9uSGFuZGxlcjptYWtlQmxvY2tQdHIoV1RGTW92ZShkZWNpc2lvbkhh bmRsZXJXaXRoUHJlZmVyZW5jZXNPclBvbGljaWVzKSkuZ2V0KCldOwotICAgIGVsc2UgaWYgKGRl bGVnYXRlSGFzV2Vic2l0ZVBvbGljaWVzKSB7CisgICAgaWYgKGRlbGVnYXRlSGFzV2VicGFnZVBy ZWZlcmVuY2VzKSB7CisgICAgICAgIGlmIChtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25E ZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25XaXRo UHJlZmVyZW5jZXNEZWNpc2lvbkhhbmRsZXIpCisgICAgICAgICAgICBbbmF2aWdhdGlvbkRlbGVn YXRlIHdlYlZpZXc6bV9uYXZpZ2F0aW9uU3RhdGUubV93ZWJWaWV3IGRlY2lkZVBvbGljeUZvck5h dmlnYXRpb25BY3Rpb246d3JhcHBlcihuYXZpZ2F0aW9uQWN0aW9uKSBwcmVmZXJlbmNlczp3cmFw cGVyKGRlZmF1bHRXZWJzaXRlUG9saWNpZXMpIGRlY2lzaW9uSGFuZGxlcjptYWtlQmxvY2tQdHIo V1RGTW92ZShkZWNpc2lvbkhhbmRsZXJXaXRoUHJlZmVyZW5jZXNPclBvbGljaWVzKSkuZ2V0KCld OworICAgICAgICBlbHNlCisgICAgICAgICAgICBbKGlkIDxXS05hdmlnYXRpb25EZWxlZ2F0ZVBy aXZhdGU+KW5hdmlnYXRpb25EZWxlZ2F0ZSBfd2ViVmlldzptX25hdmlnYXRpb25TdGF0ZS5tX3dl YlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbjp3cmFwcGVyKG5hdmlnYXRpb25B Y3Rpb24pIHByZWZlcmVuY2VzOndyYXBwZXIoZGVmYXVsdFdlYnNpdGVQb2xpY2llcykgdXNlcklu Zm86dXNlckluZm8gPyBzdGF0aWNfY2FzdDxpZDxOU1NlY3VyZUNvZGluZz4+KHVzZXJJbmZvLT53 cmFwcGVyKCkpIDogbmlsIGRlY2lzaW9uSGFuZGxlcjptYWtlQmxvY2tQdHIoV1RGTW92ZShkZWNp c2lvbkhhbmRsZXJXaXRoUHJlZmVyZW5jZXNPclBvbGljaWVzKSkuZ2V0KCldOworICAgIH0gZWxz ZSBpZiAoZGVsZWdhdGVIYXNXZWJzaXRlUG9saWNpZXMpIHsKICAgICAgICAgYXV0byBkZWNpc2lv bkhhbmRsZXIgPSBtYWtlQmxvY2tQdHIoV1RGTW92ZShkZWNpc2lvbkhhbmRsZXJXaXRoUHJlZmVy ZW5jZXNPclBvbGljaWVzKSk7Ci0gICAgICAgIGlmIChtX25hdmlnYXRpb25TdGF0ZS5tX25hdmln YXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rp b25Vc2VySW5mb0RlY2lzaW9uSGFuZGxlcldlYnNpdGVQb2xpY2llcykKKyAgICAgICAgaWYgKG1f bmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGVjaWRl UG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvblVzZXJJbmZvRGVjaXNpb25IYW5kbGVyV2Vic2l0ZVBv bGljaWVzKSB7CisgICAgICAgICAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJ TgogICAgICAgICAgICAgWyhpZCA8V0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlPiluYXZpZ2F0 aW9uRGVsZWdhdGUgX3dlYlZpZXc6bV9uYXZpZ2F0aW9uU3RhdGUubV93ZWJWaWV3IGRlY2lkZVBv bGljeUZvck5hdmlnYXRpb25BY3Rpb246d3JhcHBlcihuYXZpZ2F0aW9uQWN0aW9uKSB1c2VySW5m bzp1c2VySW5mbyA/IHN0YXRpY19jYXN0PGlkIDxOU1NlY3VyZUNvZGluZz4+KHVzZXJJbmZvLT53 cmFwcGVyKCkpIDogbmlsIGRlY2lzaW9uSGFuZGxlcjpkZWNpc2lvbkhhbmRsZXIuZ2V0KCldOwot ICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05T X0VORAorICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNM QVJBVElPTlNfQkVHSU4KICAgICAgICAgICAgIFsoaWQgPFdLTmF2aWdhdGlvbkRlbGVnYXRlUHJp dmF0ZT4pbmF2aWdhdGlvbkRlbGVnYXRlIF93ZWJWaWV3Om1fbmF2aWdhdGlvblN0YXRlLm1fd2Vi VmlldyBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOndyYXBwZXIobmF2aWdhdGlvbkFj dGlvbikgZGVjaXNpb25IYW5kbGVyOmRlY2lzaW9uSGFuZGxlci5nZXQoKV07CiAgICAgICAgICAg ICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKQEAgLTk0Nyw3ICs5NTUsOCBAQCB2 b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6cmVuZGVyaW5nUHJvZ3Jlc3NE aWRDaGFuZ2UoV2ViUGFnZVByb3h5JgogCiBib29sIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlv bkNsaWVudDo6c2hvdWxkQnlwYXNzQ29udGVudE1vZGVTYWZlZ3VhcmRzKCkgY29uc3QKIHsKLSAg ICByZXR1cm4gbV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndl YlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uV2l0aFByZWZlcmVuY2VzRGVjaXNp b25IYW5kbGVyOworICAgIHJldHVybiBtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxl Z2F0ZU1ldGhvZHMud2ViVmlld0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25XaXRoUHJl ZmVyZW5jZXNEZWNpc2lvbkhhbmRsZXIKKyAgICAgICAgfHwgbV9uYXZpZ2F0aW9uU3RhdGUubV9u YXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9u QWN0aW9uV2l0aFByZWZlcmVuY2VzVXNlckluZm9EZWNpc2lvbkhhbmRsZXI7CiB9CiAKIHN0YXRp YyBBdXRoZW50aWNhdGlvbkNoYWxsZW5nZURpc3Bvc2l0aW9uIHRvQXV0aGVudGljYXRpb25DaGFs bGVuZ2VEaXNwb3NpdGlvbihOU1VSTFNlc3Npb25BdXRoQ2hhbGxlbmdlRGlzcG9zaXRpb24gZGlz cG9zaXRpb24pCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cK aW5kZXggZTE0YjEyMzk0YjUxMGMxMjc4ZmY0ODNiMTdkNTU2YTVmYmZmOGE0OC4uYmRmZDJkNjA4 N2MxOWU3N2E5MTFjMDBiM2MxNjlhZTEyNzYzNjI1NSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdl TG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTA3LTAxICBB bGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRk IG5ldyBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uIFNQSSB3aXRoIHByZWZlcmVuY2Vz IGFuZCB1c2VySW5mbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTk5MzcxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MjM1MjkwNT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvTmF2aWdhdGlvbi5tbToKKyAgICAgICAgKC1bTmF2aWdhdGlvbkFj dGlvblNQSURlbGVnYXRlIHdlYlZpZXc6ZGlkRmluaXNoTmF2aWdhdGlvbjpdKToKKyAgICAgICAg KC1bTmF2aWdhdGlvbkFjdGlvblNQSURlbGVnYXRlIF93ZWJWaWV3OmRlY2lkZVBvbGljeUZvck5h dmlnYXRpb25BY3Rpb246cHJlZmVyZW5jZXM6dXNlckluZm86ZGVjaXNpb25IYW5kbGVyOl0pOgor ICAgICAgICAoLVtOYXZpZ2F0aW9uQWN0aW9uU1BJRGVsZWdhdGUgc3BpQ2FsbGVkXSk6CisgICAg ICAgIChURVNUKToKKwogMjAxOS0wNi0yNyAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+ CiAKICAgICAgICAgVXBzdHJlYW0gdXNlIG9mIE1BQ0NBVEFMWVNUCmRpZmYgLS1naXQgYS9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL05hdmlnYXRpb24ubW0gYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL05hdmlnYXRpb24ubW0KaW5kZXggZWEzYWNl NTA1MGI2ODMyMDcyYmI0NDg0YTg2MjQzMWQ5ZTc0YWI0MS4uYWRiMjIzZDBhYzQwZmFlNjRkNjQ1 YTM1MDQyN2M5MjAzYTk3Nzg5OSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXRDb2NvYS9OYXZpZ2F0aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Q29jb2EvTmF2aWdhdGlvbi5tbQpAQCAtMzU0LDYgKzM1NCw0MiBAQCBURVNUKFdL TmF2aWdhdGlvbiwgV2ViVmlld0RpZENhbmNlbENsaWVudFJlZGlyZWN0KQogICAgIEFTU0VSVF9U UlVFKGRpZENhbmNlbFJlZGlyZWN0KTsKIH0KIAorQGludGVyZmFjZSBOYXZpZ2F0aW9uQWN0aW9u U1BJRGVsZWdhdGUgOiBOU09iamVjdCA8V0tOYXZpZ2F0aW9uRGVsZWdhdGU+IHsKK0BwdWJsaWMK KyAgICBCT09MIF9zcGlDYWxsZWQ7Cit9CistIChCT09MKXNwaUNhbGxlZDsKK0BlbmQKKworQGlt cGxlbWVudGF0aW9uIE5hdmlnYXRpb25BY3Rpb25TUElEZWxlZ2F0ZQorCistICh2b2lkKXdlYlZp ZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGlkRmluaXNoTmF2aWdhdGlvbjooV0tOYXZpZ2F0aW9u ICopbmF2aWdhdGlvbgoreworICAgIGlzRG9uZSA9IHRydWU7Cit9CisKKy0odm9pZClfd2ViVmll dzooV0tXZWJWaWV3ICopd2ViVmlldyBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOihX S05hdmlnYXRpb25BY3Rpb24gKiluYXZpZ2F0aW9uQWN0aW9uIHByZWZlcmVuY2VzOihXS1dlYnBh Z2VQcmVmZXJlbmNlcyAqKXByZWZlcmVuY2VzIHVzZXJJbmZvOihpZCA8TlNTZWN1cmVDb2Rpbmc+ KXVzZXJJbmZvIGRlY2lzaW9uSGFuZGxlcjoodm9pZCAoXikoV0tOYXZpZ2F0aW9uQWN0aW9uUG9s aWN5LCBXS1dlYnBhZ2VQcmVmZXJlbmNlcyAqKSlkZWNpc2lvbkhhbmRsZXIgeworICAgIF9zcGlD YWxsZWQgPSBUUlVFOworICAgIGRlY2lzaW9uSGFuZGxlcihXS05hdmlnYXRpb25BY3Rpb25Qb2xp Y3lBbGxvdywgcHJlZmVyZW5jZXMpOworfQorCistIChCT09MKXNwaUNhbGxlZAoreworICAgIHJl dHVybiBfc3BpQ2FsbGVkOworfQorCitAZW5kCisKK1RFU1QoV0tOYXZpZ2F0aW9uLCBOYXZpZ2F0 aW9uQWN0aW9uU1BJKQoreworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcg YWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCldKTsKKyAgICBh dXRvIGRlbGVnYXRlID0gYWRvcHROUyhbW05hdmlnYXRpb25BY3Rpb25TUElEZWxlZ2F0ZSBhbGxv Y10gaW5pdF0pOworICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpkZWxlZ2F0ZS5n ZXQoKV07CisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0 aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImRhdGE6dGV4dC9odG1sLDEiXV1dOworICAgIFRl c3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmaXNEb25lKTsKKyAgICBFWFBFQ1RfVFJVRShbZGVsZWdh dGUgc3BpQ2FsbGVkXSk7Cit9CisKICNpZiBQTEFURk9STShNQUMpCiAKIHN0YXRpYyBib29sIG5h dmlnYXRpb25Db21wbGV0ZTsK 373264 2019-07-01 14:19:16 -0700 2019-07-01 15:07:15 -0700 Patch bug-199371-20190701141915.patch text/plain 16230 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2ODk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRjYjNlMTA5MTAxYWU3Yzgy NDcxYTAzNTZkYjA4MzdiY2M4MjVmMTMuLjFkZWFmOTJkNmQyOTAwODczYmVkNmM3YjU3ODdiMzYy NTk1NzJhMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTktMDctMDEgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBBZGQgbmV3IGRl Y2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24gU1BJIHdpdGggcHJlZmVyZW5jZXMgYW5kIHVz ZXJJbmZvCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x OTkzNzEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUyMzUyOTA1PgorCisgICAgICAgIFJldmll d2VkIGJ5IFRpbSBIb3J0b24uCisKKyAgICAgICAgQWxzbyBkZXByZWNhdGUgc29tZSBvbGRlciBT UEkgc28gd2UgbWF5IHNvbWVkYXkgY2xlYW4gdXAgdGhpcyBtZXNzLgorCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25EZWxlZ2F0ZVByaXZhdGUuaDoKKyAgICAgICAg KiBVSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNz L0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbToKKyAgICAgICAgKFdlYktpdDo6TmF2aWdhdGlvblN0 YXRlOjpzZXROYXZpZ2F0aW9uRGVsZWdhdGUpOgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9u U3RhdGU6Ok5hdmlnYXRpb25DbGllbnQ6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24p OgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25DbGllbnQ6OnNo b3VsZEJ5cGFzc0NvbnRlbnRNb2RlU2FmZWd1YXJkcyBjb25zdCk6CisKIDIwMTktMDYtMjcgIENh cmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFdlYlNv Y2tldHM6IGF2b2lkIGRhdGEgY29waWVzIHdoZW4gcXVldWluZyB0YXNrcyBpbiBXZWJTb2NrZXRD aGFubmVsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tO YXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlLmgKaW5kZXggMzkyNmJiMGYzZjM2ODQx OTk2ZmFiYTMyZGIxOGE4YjE3MjYzNGIxOS4uMDZlMTAxZjMwN2ZlNDgxOGZmY2ZhN2MyMjEwODQ3 YTBlZDY4N2U4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L1dLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25EZWxlZ2F0ZVByaXZhdGUuaApAQCAtOTMsOCArOTMs OSBAQCBzdGF0aWMgY29uc3QgV0tOYXZpZ2F0aW9uUmVzcG9uc2VQb2xpY3kgX1dLTmF2aWdhdGlv blJlc3BvbnNlUG9saWN5QmVjb21lRG93bmxvYQogLSAodm9pZClfd2ViVmlld1dpbGxFbmROYXZp Z2F0aW9uR2VzdHVyZTooV0tXZWJWaWV3ICopd2ViVmlldyB3aXRoTmF2aWdhdGlvblRvQmFja0Zv cndhcmRMaXN0SXRlbTooV0tCYWNrRm9yd2FyZExpc3RJdGVtICopaXRlbTsKIC0gKHZvaWQpX3dl YlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgd2lsbFNuYXBzaG90QmFja0ZvcndhcmRMaXN0SXRl bTooV0tCYWNrRm9yd2FyZExpc3RJdGVtICopaXRlbTsKIC0gKHZvaWQpX3dlYlZpZXdEaWRSZW1v dmVOYXZpZ2F0aW9uR2VzdHVyZVNuYXBzaG90OihXS1dlYlZpZXcgKil3ZWJWaWV3IFdLX0FQSV9B VkFJTEFCTEUobWFjb3MoMTAuMTIpLCBpb3MoMTAuMCkpOwotLSAodm9pZClfd2ViVmlldzooV0tX ZWJWaWV3ICopd2ViVmlldyBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOihXS05hdmln YXRpb25BY3Rpb24gKiluYXZpZ2F0aW9uQWN0aW9uIGRlY2lzaW9uSGFuZGxlcjoodm9pZCAoXiko V0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5LCBfV0tXZWJzaXRlUG9saWNpZXMgKikpZGVjaXNpb25I YW5kbGVyIFdLX0FQSV9ERVBSRUNBVEVEX1dJVEhfUkVQTEFDRU1FTlQoIl93ZWJWaWV3OmRlY2lk ZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246dXNlckluZm86ZGVjaXNpb25IYW5kbGVyOiIsIG1h Y29zKDEwLjEyLjMsIDEwLjE0LjQpLCBpb3MoMTAuMywgMTIuMikpOwotLSAodm9pZClfd2ViVmll dzooV0tXZWJWaWV3ICopd2ViVmlldyBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOihX S05hdmlnYXRpb25BY3Rpb24gKiluYXZpZ2F0aW9uQWN0aW9uIHVzZXJJbmZvOihpZCA8TlNTZWN1 cmVDb2Rpbmc+KXVzZXJJbmZvIGRlY2lzaW9uSGFuZGxlcjoodm9pZCAoXikoV0tOYXZpZ2F0aW9u QWN0aW9uUG9saWN5LCBfV0tXZWJzaXRlUG9saWNpZXMgKikpZGVjaXNpb25IYW5kbGVyIFdLX0FQ SV9BVkFJTEFCTEUobWFjb3MoMTAuMTMuNCksIGlvcygxMS4zKSk7CistICh2b2lkKV93ZWJWaWV3 OihXS1dlYlZpZXcgKil3ZWJWaWV3IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246KFdL TmF2aWdhdGlvbkFjdGlvbiAqKW5hdmlnYXRpb25BY3Rpb24gZGVjaXNpb25IYW5kbGVyOih2b2lk ICheKShXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3ksIF9XS1dlYnNpdGVQb2xpY2llcyAqKSlkZWNp c2lvbkhhbmRsZXIgV0tfQVBJX0RFUFJFQ0FURURfV0lUSF9SRVBMQUNFTUVOVCgiX3dlYlZpZXc6 ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbjpwcmVmZXJlbmNlczp1c2VySW5mbzpkZWNp c2lvbkhhbmRsZXI6IiwgbWFjb3MoMTAuMTIuMywgMTAuMTQuNCksIGlvcygxMC4zLCAxMi4yKSk7 CistICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGRlY2lkZVBvbGljeUZvck5h dmlnYXRpb25BY3Rpb246KFdLTmF2aWdhdGlvbkFjdGlvbiAqKW5hdmlnYXRpb25BY3Rpb24gdXNl ckluZm86KGlkIDxOU1NlY3VyZUNvZGluZz4pdXNlckluZm8gZGVjaXNpb25IYW5kbGVyOih2b2lk ICheKShXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3ksIF9XS1dlYnNpdGVQb2xpY2llcyAqKSlkZWNp c2lvbkhhbmRsZXIgV0tfQVBJX0RFUFJFQ0FURURfV0lUSF9SRVBMQUNFTUVOVCgiX3dlYlZpZXc6 ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbjpwcmVmZXJlbmNlczp1c2VySW5mbzpkZWNp c2lvbkhhbmRsZXI6IiwgbWFjb3MoMTAuMTMuNCwgV0tfTUFDX1RCQSksIGlvcygxMS4zLCBXS19J T1NfVEJBKSk7CistKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGVjaWRlUG9s aWN5Rm9yTmF2aWdhdGlvbkFjdGlvbjooV0tOYXZpZ2F0aW9uQWN0aW9uICopbmF2aWdhdGlvbkFj dGlvbiBwcmVmZXJlbmNlczooV0tXZWJwYWdlUHJlZmVyZW5jZXMgKilwcmVmZXJlbmNlcyB1c2Vy SW5mbzooaWQgPE5TU2VjdXJlQ29kaW5nPil1c2VySW5mbyBkZWNpc2lvbkhhbmRsZXI6KHZvaWQg KF4pKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeSwgV0tXZWJwYWdlUHJlZmVyZW5jZXMgKikpZGVj aXNpb25IYW5kbGVyIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19J T1NfVEJBKSk7CiAtICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGRpZFN0YXJ0 UHJvdmlzaW9uYWxOYXZpZ2F0aW9uOihXS05hdmlnYXRpb24gKiluYXZpZ2F0aW9uIHVzZXJJbmZv OihpZCA8TlNTZWN1cmVDb2Rpbmc+KXVzZXJJbmZvIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTAu MTMuNCksIGlvcygxMS4zKSk7CiAtICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3 IGRpZEZhaWxOYXZpZ2F0aW9uOihXS05hdmlnYXRpb24gKiluYXZpZ2F0aW9uIHdpdGhFcnJvcjoo TlNFcnJvciAqKWVycm9yIHVzZXJJbmZvOihpZCA8TlNTZWN1cmVDb2Rpbmc+KXVzZXJJbmZvIFdL X0FQSV9BVkFJTEFCTEUobWFjb3MoMTAuMTMuNCksIGlvcygxMS4zKSk7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5oIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLmgKaW5kZXggZDYxNjI4ZGRh MDAxYjU3ZTk4ZjljZjI2MDYwYTU3NzI1ZjlmZmE2YS4uYjNhM2Q2ZmJhOTY3NDZhYjQyZTI0MTU1 OTM0M2E0ODhkNWNmNzYzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29j b2EvTmF2aWdhdGlvblN0YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2Ev TmF2aWdhdGlvblN0YXRlLmgKQEAgLTE5Myw2ICsxOTMsNyBAQCBwcml2YXRlOgogICAgIHN0cnVj dCB7CiAgICAgICAgIGJvb2wgd2ViVmlld0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25E ZWNpc2lvbkhhbmRsZXIgOiAxOwogICAgICAgICBib29sIHdlYlZpZXdEZWNpZGVQb2xpY3lGb3JO YXZpZ2F0aW9uQWN0aW9uV2l0aFByZWZlcmVuY2VzRGVjaXNpb25IYW5kbGVyIDogMTsKKyAgICAg ICAgYm9vbCB3ZWJWaWV3RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbldpdGhQcmVmZXJl bmNlc1VzZXJJbmZvRGVjaXNpb25IYW5kbGVyIDogMTsKICAgICAgICAgYm9vbCB3ZWJWaWV3RGVj aWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkRlY2lzaW9uSGFuZGxlcldlYnNpdGVQb2xpY2ll cyA6IDE7CiAgICAgICAgIGJvb2wgd2ViVmlld0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rp b25Vc2VySW5mb0RlY2lzaW9uSGFuZGxlcldlYnNpdGVQb2xpY2llcyA6IDE7CiAgICAgICAgIGJv b2wgd2ViVmlld0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25SZXNwb25zZURlY2lzaW9uSGFuZGxl ciA6IDE7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0 aW9uU3RhdGUubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3Rh dGUubW0KaW5kZXggNmU5OTUwMGE5NDQ0YzRlYWRhYjc1YzgxYjQ0ZmNiNmI0NDZmNjQyMi4uNTlm ODdhMmM3NDI5MjE0NmU2ZDQxZWM3NzY0NDA3YjMyMjg0MWIwMCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQpAQCAtMTQ5LDYgKzE0OSw3 IEBAIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpzZXROYXZpZ2F0aW9uRGVsZWdhdGUoaWQgPFdLTmF2 aWdhdGlvbkRlbGVnYXRlPiBkZWxlZ2F0ZSkKICAgICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhv ZHMud2ViVmlld0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25XaXRoUHJlZmVyZW5jZXNE ZWNpc2lvbkhhbmRsZXIgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcih3 ZWJWaWV3OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246cHJlZmVyZW5jZXM6ZGVjaXNp b25IYW5kbGVyOildOwogICAgIG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGVj aWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkRlY2lzaW9uSGFuZGxlcldlYnNpdGVQb2xpY2ll cyA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OmRlY2lk ZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246ZGVjaXNpb25IYW5kbGVyOildOwogICAgIG1fbmF2 aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFj dGlvblVzZXJJbmZvRGVjaXNpb25IYW5kbGVyV2Vic2l0ZVBvbGljaWVzID0gW2RlbGVnYXRlIHJl c3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6ZGVjaWRlUG9saWN5Rm9yTmF2aWdh dGlvbkFjdGlvbjp1c2VySW5mbzpkZWNpc2lvbkhhbmRsZXI6KV07CisgICAgbV9uYXZpZ2F0aW9u RGVsZWdhdGVNZXRob2RzLndlYlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uV2l0 aFByZWZlcmVuY2VzVXNlckluZm9EZWNpc2lvbkhhbmRsZXIgPSBbZGVsZWdhdGUgcmVzcG9uZHNU b1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0 aW9uOnByZWZlcmVuY2VzOnVzZXJJbmZvOmRlY2lzaW9uSGFuZGxlcjopXTsKICAgICBtX25hdmln YXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25SZXNw b25zZURlY2lzaW9uSGFuZGxlciA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVj dG9yKHdlYlZpZXc6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvblJlc3BvbnNlOmRlY2lzaW9uSGFu ZGxlcjopXTsKIAogICAgIG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGlkU3Rh cnRQcm92aXNpb25hbE5hdmlnYXRpb24gPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBz ZWxlY3Rvcih3ZWJWaWV3OmRpZFN0YXJ0UHJvdmlzaW9uYWxOYXZpZ2F0aW9uOildOwpAQCAtNTIy LDYgKzUyMyw3IEBAIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpkZWNp ZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFdlYlBhZ2VQCiAgICAgICAgIGRlZmF1bHRXZWJz aXRlUG9saWNpZXMgPSBwb2xpY2llcy0+Y29weSgpOwogCiAgICAgaWYgKCFtX25hdmlnYXRpb25T dGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RlY2lkZVBvbGljeUZvck5h dmlnYXRpb25BY3Rpb25EZWNpc2lvbkhhbmRsZXIKKyAgICAgICAgJiYgIW1fbmF2aWdhdGlvblN0 YXRlLm1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGVjaWRlUG9saWN5Rm9yTmF2 aWdhdGlvbkFjdGlvbldpdGhQcmVmZXJlbmNlc1VzZXJJbmZvRGVjaXNpb25IYW5kbGVyCiAgICAg ICAgICYmICFtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2Vi Vmlld0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25XaXRoUHJlZmVyZW5jZXNEZWNpc2lv bkhhbmRsZXIKICAgICAgICAgJiYgIW1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRlbGVn YXRlTWV0aG9kcy53ZWJWaWV3RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkRlY2lzaW9u SGFuZGxlcldlYnNpdGVQb2xpY2llcwogICAgICAgICAmJiAhbV9uYXZpZ2F0aW9uU3RhdGUubV9u YXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9u QWN0aW9uVXNlckluZm9EZWNpc2lvbkhhbmRsZXJXZWJzaXRlUG9saWNpZXMpIHsKQEAgLTU2MSwx MiArNTYzLDEzIEBAIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpkZWNp ZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFdlYlBhZ2VQCiAgICAgaWYgKCFuYXZpZ2F0aW9u RGVsZWdhdGUpCiAgICAgICAgIHJldHVybjsKIAotICAgIGJvb2wgZGVsZWdhdGVIYXNXZWJwYWdl UHJlZmVyZW5jZXMgPSBtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhv ZHMud2ViVmlld0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25XaXRoUHJlZmVyZW5jZXNE ZWNpc2lvbkhhbmRsZXI7CisgICAgYm9vbCBkZWxlZ2F0ZUhhc1dlYnBhZ2VQcmVmZXJlbmNlcyA9 IG1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGVj aWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbldpdGhQcmVmZXJlbmNlc0RlY2lzaW9uSGFuZGxl cgorICAgICAgICB8fCBtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhv ZHMud2ViVmlld0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25XaXRoUHJlZmVyZW5jZXNV c2VySW5mb0RlY2lzaW9uSGFuZGxlcjsKICAgICBib29sIGRlbGVnYXRlSGFzV2Vic2l0ZVBvbGlj aWVzID0gbV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZp ZXdEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uRGVjaXNpb25IYW5kbGVyV2Vic2l0ZVBv bGljaWVzIHx8IG1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53 ZWJWaWV3RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvblVzZXJJbmZvRGVjaXNpb25IYW5k bGVyV2Vic2l0ZVBvbGljaWVzOwogCiAgICAgYXV0byBzZWxlY3RvckZvckNvbXBsZXRpb25IYW5k bGVyQ2hlY2tlciA9IChbJl0gKCkgLT4gU0VMIHsKICAgICAgICAgaWYgKGRlbGVnYXRlSGFzV2Vi cGFnZVByZWZlcmVuY2VzKQotICAgICAgICAgICAgcmV0dXJuIEBzZWxlY3Rvcih3ZWJWaWV3OmRl Y2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246cHJlZmVyZW5jZXM6ZGVjaXNpb25IYW5kbGVy Oik7CisgICAgICAgICAgICByZXR1cm4gbV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVs ZWdhdGVNZXRob2RzLndlYlZpZXdEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uV2l0aFBy ZWZlcmVuY2VzRGVjaXNpb25IYW5kbGVyID8gQHNlbGVjdG9yKHdlYlZpZXc6ZGVjaWRlUG9saWN5 Rm9yTmF2aWdhdGlvbkFjdGlvbjpwcmVmZXJlbmNlczpkZWNpc2lvbkhhbmRsZXI6KSA6IEBzZWxl Y3Rvcihfd2ViVmlldzpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOnByZWZlcmVuY2Vz OnVzZXJJbmZvOmRlY2lzaW9uSGFuZGxlcjopOwogICAgICAgICBpZiAoZGVsZWdhdGVIYXNXZWJz aXRlUG9saWNpZXMpCiAgICAgICAgICAgICByZXR1cm4gQHNlbGVjdG9yKF93ZWJWaWV3OmRlY2lk ZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246ZGVjaXNpb25IYW5kbGVyOik7CiAgICAgICAgIHJl dHVybiBAc2VsZWN0b3Iod2ViVmlldzpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOmRl Y2lzaW9uSGFuZGxlcjopOwpAQCAtNjM2LDEzICs2MzksMTggQEAgdm9pZCBOYXZpZ2F0aW9uU3Rh dGU6Ok5hdmlnYXRpb25DbGllbnQ6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oV2Vi UGFnZVAKICAgICAgICAgfQogICAgIH07CiAKLSAgICBpZiAoZGVsZWdhdGVIYXNXZWJwYWdlUHJl ZmVyZW5jZXMpCi0gICAgICAgIFtuYXZpZ2F0aW9uRGVsZWdhdGUgd2ViVmlldzptX25hdmlnYXRp b25TdGF0ZS5tX3dlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbjp3cmFwcGVy KG5hdmlnYXRpb25BY3Rpb24pIHByZWZlcmVuY2VzOndyYXBwZXIoZGVmYXVsdFdlYnNpdGVQb2xp Y2llcykgZGVjaXNpb25IYW5kbGVyOm1ha2VCbG9ja1B0cihXVEZNb3ZlKGRlY2lzaW9uSGFuZGxl cldpdGhQcmVmZXJlbmNlc09yUG9saWNpZXMpKS5nZXQoKV07Ci0gICAgZWxzZSBpZiAoZGVsZWdh dGVIYXNXZWJzaXRlUG9saWNpZXMpIHsKKyAgICBpZiAoZGVsZWdhdGVIYXNXZWJwYWdlUHJlZmVy ZW5jZXMpIHsKKyAgICAgICAgaWYgKG1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRlbGVn YXRlTWV0aG9kcy53ZWJWaWV3RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbldpdGhQcmVm ZXJlbmNlc0RlY2lzaW9uSGFuZGxlcikKKyAgICAgICAgICAgIFtuYXZpZ2F0aW9uRGVsZWdhdGUg d2ViVmlldzptX25hdmlnYXRpb25TdGF0ZS5tX3dlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2aWdh dGlvbkFjdGlvbjp3cmFwcGVyKG5hdmlnYXRpb25BY3Rpb24pIHByZWZlcmVuY2VzOndyYXBwZXIo ZGVmYXVsdFdlYnNpdGVQb2xpY2llcykgZGVjaXNpb25IYW5kbGVyOm1ha2VCbG9ja1B0cihXVEZN b3ZlKGRlY2lzaW9uSGFuZGxlcldpdGhQcmVmZXJlbmNlc09yUG9saWNpZXMpKS5nZXQoKV07Cisg ICAgICAgIGVsc2UKKyAgICAgICAgICAgIFsoaWQgPFdLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0 ZT4pbmF2aWdhdGlvbkRlbGVnYXRlIF93ZWJWaWV3Om1fbmF2aWdhdGlvblN0YXRlLm1fd2ViVmll dyBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOndyYXBwZXIobmF2aWdhdGlvbkFjdGlv bikgcHJlZmVyZW5jZXM6d3JhcHBlcihkZWZhdWx0V2Vic2l0ZVBvbGljaWVzKSB1c2VySW5mbzp1 c2VySW5mbyA/IHN0YXRpY19jYXN0PGlkPE5TU2VjdXJlQ29kaW5nPj4odXNlckluZm8tPndyYXBw ZXIoKSkgOiBuaWwgZGVjaXNpb25IYW5kbGVyOm1ha2VCbG9ja1B0cihXVEZNb3ZlKGRlY2lzaW9u SGFuZGxlcldpdGhQcmVmZXJlbmNlc09yUG9saWNpZXMpKS5nZXQoKV07CisgICAgfSBlbHNlIGlm IChkZWxlZ2F0ZUhhc1dlYnNpdGVQb2xpY2llcykgewogICAgICAgICBhdXRvIGRlY2lzaW9uSGFu ZGxlciA9IG1ha2VCbG9ja1B0cihXVEZNb3ZlKGRlY2lzaW9uSGFuZGxlcldpdGhQcmVmZXJlbmNl c09yUG9saWNpZXMpKTsKLSAgICAgICAgaWYgKG1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlv bkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvblVz ZXJJbmZvRGVjaXNpb25IYW5kbGVyV2Vic2l0ZVBvbGljaWVzKQorICAgICAgICBpZiAobV9uYXZp Z2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdEZWNpZGVQb2xp Y3lGb3JOYXZpZ2F0aW9uQWN0aW9uVXNlckluZm9EZWNpc2lvbkhhbmRsZXJXZWJzaXRlUG9saWNp ZXMpIHsKKyAgICAgICAgICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JFR0lOCiAg ICAgICAgICAgICBbKGlkIDxXS05hdmlnYXRpb25EZWxlZ2F0ZVByaXZhdGU+KW5hdmlnYXRpb25E ZWxlZ2F0ZSBfd2ViVmlldzptX25hdmlnYXRpb25TdGF0ZS5tX3dlYlZpZXcgZGVjaWRlUG9saWN5 Rm9yTmF2aWdhdGlvbkFjdGlvbjp3cmFwcGVyKG5hdmlnYXRpb25BY3Rpb24pIHVzZXJJbmZvOnVz ZXJJbmZvID8gc3RhdGljX2Nhc3Q8aWQgPE5TU2VjdXJlQ29kaW5nPj4odXNlckluZm8tPndyYXBw ZXIoKSkgOiBuaWwgZGVjaXNpb25IYW5kbGVyOmRlY2lzaW9uSGFuZGxlci5nZXQoKV07Ci0gICAg ICAgIGVsc2UgeworICAgICAgICAgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5E CisgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFU SU9OU19CRUdJTgogICAgICAgICAgICAgWyhpZCA8V0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRl PiluYXZpZ2F0aW9uRGVsZWdhdGUgX3dlYlZpZXc6bV9uYXZpZ2F0aW9uU3RhdGUubV93ZWJWaWV3 IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246d3JhcHBlcihuYXZpZ2F0aW9uQWN0aW9u KSBkZWNpc2lvbkhhbmRsZXI6ZGVjaXNpb25IYW5kbGVyLmdldCgpXTsKICAgICAgICAgICAgIEFM TE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORApAQCAtOTQ3LDcgKzk1NSw4IEBAIHZvaWQg TmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpyZW5kZXJpbmdQcm9ncmVzc0RpZENo YW5nZShXZWJQYWdlUHJveHkmCiAKIGJvb2wgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xp ZW50OjpzaG91bGRCeXBhc3NDb250ZW50TW9kZVNhZmVndWFyZHMoKSBjb25zdAogewotICAgIHJl dHVybiBtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmll d0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25XaXRoUHJlZmVyZW5jZXNEZWNpc2lvbkhh bmRsZXI7CisgICAgcmV0dXJuIG1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRlbGVnYXRl TWV0aG9kcy53ZWJWaWV3RGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbldpdGhQcmVmZXJl bmNlc0RlY2lzaW9uSGFuZGxlcgorICAgICAgICB8fCBtX25hdmlnYXRpb25TdGF0ZS5tX25hdmln YXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rp b25XaXRoUHJlZmVyZW5jZXNVc2VySW5mb0RlY2lzaW9uSGFuZGxlcjsKIH0KIAogc3RhdGljIEF1 dGhlbnRpY2F0aW9uQ2hhbGxlbmdlRGlzcG9zaXRpb24gdG9BdXRoZW50aWNhdGlvbkNoYWxsZW5n ZURpc3Bvc2l0aW9uKE5TVVJMU2Vzc2lvbkF1dGhDaGFsbGVuZ2VEaXNwb3NpdGlvbiBkaXNwb3Np dGlvbikKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRl eCBlMTRiMTIzOTRiNTEwYzEyNzhmZjQ4M2IxN2Q1NTZhNWZiZmY4YTQ4Li5mNjE3Y2NhN2UxYjVj YzBkOTE5OGEyN2U5ZGFmNDQ2MmQ5MWUwMDQ3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cK KysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTktMDctMDEgIEFsZXgg Q2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBBZGQgbmV3 IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24gU1BJIHdpdGggcHJlZmVyZW5jZXMgYW5k IHVzZXJJbmZvCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTkzNzEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUyMzUyOTA1PgorCisgICAgICAgIFJl dmlld2VkIGJ5IFRpbSBIb3J0b24uCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL05hdmlnYXRpb24ubW06CisgICAgICAgICgtW05hdmlnYXRpb25BY3Rpb25TUElE ZWxlZ2F0ZSB3ZWJWaWV3OmRpZEZpbmlzaE5hdmlnYXRpb246XSk6CisgICAgICAgICgtW05hdmln YXRpb25BY3Rpb25TUElEZWxlZ2F0ZSBfd2ViVmlldzpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9u QWN0aW9uOnByZWZlcmVuY2VzOnVzZXJJbmZvOmRlY2lzaW9uSGFuZGxlcjpdKToKKyAgICAgICAg KC1bTmF2aWdhdGlvbkFjdGlvblNQSURlbGVnYXRlIHNwaUNhbGxlZF0pOgorICAgICAgICAoVEVT VCk6CisKIDIwMTktMDYtMjcgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFVwc3RyZWFtIHVzZSBvZiBNQUNDQVRBTFlTVApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9OYXZpZ2F0aW9uLm1tIGIvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9OYXZpZ2F0aW9uLm1tCmluZGV4IGVhM2FjZTUwNTBiNjgz MjA3MmJiNDQ4NGE4NjI0MzFkOWU3NGFiNDEuLmFkYjIyM2QwYWM0MGZhZTY0ZDY0NWEzNTA0Mjdj OTIwM2E5Nzc4OTkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvTmF2aWdhdGlvbi5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dENvY29hL05hdmlnYXRpb24ubW0KQEAgLTM1NCw2ICszNTQsNDIgQEAgVEVTVChXS05hdmlnYXRp b24sIFdlYlZpZXdEaWRDYW5jZWxDbGllbnRSZWRpcmVjdCkKICAgICBBU1NFUlRfVFJVRShkaWRD YW5jZWxSZWRpcmVjdCk7CiB9CiAKK0BpbnRlcmZhY2UgTmF2aWdhdGlvbkFjdGlvblNQSURlbGVn YXRlIDogTlNPYmplY3QgPFdLTmF2aWdhdGlvbkRlbGVnYXRlPiB7CitAcHVibGljCisgICAgQk9P TCBfc3BpQ2FsbGVkOworfQorLSAoQk9PTClzcGlDYWxsZWQ7CitAZW5kCisKK0BpbXBsZW1lbnRh dGlvbiBOYXZpZ2F0aW9uQWN0aW9uU1BJRGVsZWdhdGUKKworLSAodm9pZCl3ZWJWaWV3OihXS1dl YlZpZXcgKil3ZWJWaWV3IGRpZEZpbmlzaE5hdmlnYXRpb246KFdLTmF2aWdhdGlvbiAqKW5hdmln YXRpb24KK3sKKyAgICBpc0RvbmUgPSB0cnVlOworfQorCistKHZvaWQpX3dlYlZpZXc6KFdLV2Vi VmlldyAqKXdlYlZpZXcgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbjooV0tOYXZpZ2F0 aW9uQWN0aW9uICopbmF2aWdhdGlvbkFjdGlvbiBwcmVmZXJlbmNlczooV0tXZWJwYWdlUHJlZmVy ZW5jZXMgKilwcmVmZXJlbmNlcyB1c2VySW5mbzooaWQgPE5TU2VjdXJlQ29kaW5nPil1c2VySW5m byBkZWNpc2lvbkhhbmRsZXI6KHZvaWQgKF4pKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeSwgV0tX ZWJwYWdlUHJlZmVyZW5jZXMgKikpZGVjaXNpb25IYW5kbGVyIHsKKyAgICBfc3BpQ2FsbGVkID0g VFJVRTsKKyAgICBkZWNpc2lvbkhhbmRsZXIoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5QWxsb3cs IHByZWZlcmVuY2VzKTsKK30KKworLSAoQk9PTClzcGlDYWxsZWQKK3sKKyAgICByZXR1cm4gX3Nw aUNhbGxlZDsKK30KKworQGVuZAorCitURVNUKFdLTmF2aWdhdGlvbiwgTmF2aWdhdGlvbkFjdGlv blNQSSkKK3sKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBp bml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApXSk7CisgICAgYXV0byBkZWxl Z2F0ZSA9IGFkb3B0TlMoW1tOYXZpZ2F0aW9uQWN0aW9uU1BJRGVsZWdhdGUgYWxsb2NdIGluaXRd KTsKKyAgICBbd2ViVmlldyBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOwor ICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05T VVJMIFVSTFdpdGhTdHJpbmc6QCJkYXRhOnRleHQvaHRtbCwxIl1dXTsKKyAgICBUZXN0V2ViS2l0 QVBJOjpVdGlsOjpydW4oJmlzRG9uZSk7CisgICAgRVhQRUNUX1RSVUUoW2RlbGVnYXRlIHNwaUNh bGxlZF0pOworfQorCiAjaWYgUExBVEZPUk0oTUFDKQogCiBzdGF0aWMgYm9vbCBuYXZpZ2F0aW9u Q29tcGxldGU7CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL1dlYnNpdGVQb2xpY2llcy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvV2Vic2l0ZVBvbGljaWVzLm1tCmluZGV4IGJlYjMxMmFlYzczZWJjNDczNjc5NDhlMjRi MTcxZGZlYzVjYTRlM2UuLjhlMTc1MjBlZjBhZTBlZWQ4MTYyNzQ1YThhN2JhMmE0NzQ1MTQwY2Qg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0 ZVBvbGljaWVzLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev V2Vic2l0ZVBvbGljaWVzLm1tCkBAIC0yNTAsNyArMjUwLDkgQEAgVEVTVChXZWJLaXQsIFdlYnNp dGVQb2xpY2llc0NvbnRlbnRCbG9ja2Vyc0VuYWJsZWQpCiAKIEBpbXBsZW1lbnRhdGlvbiBXZWJz aXRlUG9saWNpZXNOYXZpZ2F0aW9uRGVsZWdhdGUKIAorSUdOT1JFX1dBUk5JTkdTX0JFR0lOKCJk ZXByZWNhdGVkLWltcGxlbWVudGF0aW9ucyIpCiAtICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcg Kil3ZWJWaWV3IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246KFdLTmF2aWdhdGlvbkFj dGlvbiAqKW5hdmlnYXRpb25BY3Rpb24gdXNlckluZm86KGlkIDxOU1NlY3VyZUNvZGluZz4pdXNl ckluZm8gZGVjaXNpb25IYW5kbGVyOih2b2lkICheKShXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3ks IF9XS1dlYnNpdGVQb2xpY2llcyAqKSlkZWNpc2lvbkhhbmRsZXIKK0lHTk9SRV9XQVJOSU5HU19F TkQKIHsKICAgICBpZiAoX2RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25XaXRoV2Vic2l0 ZVBvbGljaWVzKQogICAgICAgICBfZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbldpdGhX ZWJzaXRlUG9saWNpZXMobmF2aWdhdGlvbkFjdGlvbiwgdXNlckluZm8sIGRlY2lzaW9uSGFuZGxl cik7CkBAIC0xMTI3LDcgKzExMjksOSBAQCBzdGF0aWMgdW5zaWduZWQgbG9hZENvdW50OwogCiBA aW1wbGVtZW50YXRpb24gQ3VzdG9tVXNlckFnZW50RGVsZWdhdGUKIAorSUdOT1JFX1dBUk5JTkdT X0JFR0lOKCJkZXByZWNhdGVkLWltcGxlbWVudGF0aW9ucyIpCiAtICh2b2lkKV93ZWJWaWV3OihX S1dlYlZpZXcgKil3ZWJWaWV3IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246KFdLTmF2 aWdhdGlvbkFjdGlvbiAqKW5hdmlnYXRpb25BY3Rpb24gdXNlckluZm86KGlkIDxOU1NlY3VyZUNv ZGluZz4pdXNlckluZm8gZGVjaXNpb25IYW5kbGVyOih2b2lkICheKShXS05hdmlnYXRpb25BY3Rp b25Qb2xpY3ksIF9XS1dlYnNpdGVQb2xpY2llcyAqKSlkZWNpc2lvbkhhbmRsZXIKK0lHTk9SRV9X QVJOSU5HU19FTkQKIHsKICAgICBfV0tXZWJzaXRlUG9saWNpZXMgKndlYnNpdGVQb2xpY2llcyA9 IFtbW19XS1dlYnNpdGVQb2xpY2llcyBhbGxvY10gaW5pdF0gYXV0b3JlbGVhc2VdOwogICAgIGlm IChuYXZpZ2F0aW9uQWN0aW9uLnRhcmdldEZyYW1lLm1haW5GcmFtZSkK