140644 2015-01-19 15:40:50 -0800 Adjust naming of action menu SPI 2015-01-19 15:47:34 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton bdakin sam oldest_to_newest 1062528 0 thorton 2015-01-19 15:40:50 -0800 Adjust naming of action menu SPI 1062529 1 244933 thorton 2015-01-19 15:41:49 -0800 Created attachment 244933 Patch 1062530 2 thorton 2015-01-19 15:47:34 -0800 http://trac.webkit.org/changeset/178679 244933 2015-01-19 15:41:49 -0800 2015-01-19 15:42:34 -0800 Patch bug-140644-20150119154155.patch text/plain 24697 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4NjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDgxNDlkNzVkN2Q4MjJi MDFhZTA5NTVhZjc5Njg5NzFmZmZiZjQzMS4uNGFhNjQyMmI3ODk0YjBkZjBjMDUwOGUwMjkwOTA4 NzFmMzI3NTA5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE1LTAxLTE5ICBUaW1v dGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBBZGp1c3Qg bmFtaW5nIG9mIGFjdGlvbiBtZW51IFNQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQwNjQ0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xOTQ0ODEy OT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBs YXRmb3JtL3NwaS9tYWMvTlNWaWV3U1BJLmg6CisgICAgICAgIEFkZCBhbiB1bmRlcnNjb3JlLgor CiAyMDE1LTAxLTE2ICBBZGEgQ2hhbiAgPGFkYWNoYW5AYXBwbGUuY29tPgogCiAgICAgICAgIEhU TUxNZWRpYUVsZW1lbnQ6OmlzUGxheWluZ0F1ZGlvKCkgc2hvdWxkIHJldHVybiBmYWxzZSBpZiB0 aGUgZWxlbWVudCBpcyBleHBsaWNpdGx5IG11dGVkIGJ5IHNjcmlwdC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpp bmRleCBjM2U5YjdiNTMxMDI2YWI5NDU2ODRmMjY3YTk3MTI4MDgyNWExYWY4Li40OTFmNzA1ZWFk NmZiZTczYzVhNzIxYzgwYzRjODdjZWE5YWI3YWQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjEgQEAKKzIwMTUtMDEtMTkgIFRpbW90aHkgSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBw bGUuY29tPgorCisgICAgICAgIEFkanVzdCBuYW1pbmcgb2YgYWN0aW9uIG1lbnUgU1BJCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDA2NDQKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzE5NDQ4MTI5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogV2ViVmlldy9XZWJBY3Rpb25NZW51Q29udHJvbGxlci5t bToKKyAgICAgICAgKC1bV2ViQWN0aW9uTWVudUNvbnRyb2xsZXIgcHJlcGFyZUZvck1lbnU6d2l0 aEV2ZW50Ol0pOgorICAgICAgICAoLVtXZWJBY3Rpb25NZW51Q29udHJvbGxlciB3aWxsT3Blbk1l bnU6d2l0aEV2ZW50Ol0pOgorICAgICAgICAoLVtXZWJBY3Rpb25NZW51Q29udHJvbGxlciBkaWRD bG9zZU1lbnU6d2l0aEV2ZW50Ol0pOgorICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAg ICAgICAgKC1bV2ViVmlldyBfY29tbW9uSW5pdGlhbGl6YXRpb25XaXRoRnJhbWVOYW1lOmdyb3Vw TmFtZTpdKToKKyAgICAgICAgKC1bV2ViVmlldyBwcmVwYXJlRm9yTWVudTp3aXRoRXZlbnQ6XSk6 CisgICAgICAgICgtW1dlYlZpZXcgd2lsbE9wZW5NZW51OndpdGhFdmVudDpdKToKKyAgICAgICAg KC1bV2ViVmlldyBkaWRDbG9zZU1lbnU6d2l0aEV2ZW50Ol0pOgorCiAyMDE1LTAxLTE5ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgW1NWRyAtPiBP VEYgQ29udmVydGVyXSBGbGlwIHRoZSBzd2l0Y2ggb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBhYjRkNTZhM2My ZGU2NjlmMGEzMmZhOTk5ZWNmNTc1YjMxOTM3MTI3Li42MWY0NjQ1OTBiNjg1YTBjMWI1ODRjZGQ2 MGViNTJjZmY2YjM0NGE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTUtMDEtMTkg IFRpbW90aHkgSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIEFk anVzdCBuYW1pbmcgb2YgYWN0aW9uIG1lbnUgU1BJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDA2NDQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE5 NDQ4MTI5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tOgorICAgICAgICAoLVtXS1ZpZXcgaW5pdFdp dGhGcmFtZTpwcm9jZXNzUG9vbDpjb25maWd1cmF0aW9uOndlYlZpZXc6XSk6CisgICAgICAgICog VUlQcm9jZXNzL21hYy9XS0FjdGlvbk1lbnVDb250cm9sbGVyLm1tOgorICAgICAgICAoLVtXS0Fj dGlvbk1lbnVDb250cm9sbGVyIHByZXBhcmVGb3JNZW51OndpdGhFdmVudDpdKToKKyAgICAgICAg KC1bV0tBY3Rpb25NZW51Q29udHJvbGxlciB3aWxsT3Blbk1lbnU6d2l0aEV2ZW50Ol0pOgorICAg ICAgICAoLVtXS0FjdGlvbk1lbnVDb250cm9sbGVyIGRpZENsb3NlTWVudTp3aXRoRXZlbnQ6XSk6 CisgICAgICAgICgtW1dLQWN0aW9uTWVudUNvbnRyb2xsZXIgbWVudU5lZWRzVXBkYXRlOl0pOgor ICAgICAgICAoLVtXS0FjdGlvbk1lbnVDb250cm9sbGVyIF91cGRhdGVBY3Rpb25NZW51SXRlbXNd KToKKwogMjAxNS0wMS0xOSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29t PgogCiAgICAgICAgIFtTVkcgLT4gT1RGIENvbnZlcnRlcl0gRmxpcCB0aGUgc3dpdGNoIG9uCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcGkvbWFjL05TVmlld1NQSS5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3BpL21hYy9OU1ZpZXdTUEkuaAppbmRleCAyNGM1OGM2 MTc4MmQ2ZmYxMzVjOTNlNzIxOGY4ZTFhYzEzYWU4MWE5Li4yM2Q4Mzc4YmZlNGNlM2U0NmEwMTFm OGY1Nzk1NTI1MzM1NGE2ZDI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9z cGkvbWFjL05TVmlld1NQSS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9tYWMv TlNWaWV3U1BJLmgKQEAgLTIzLDE2ICsyMywxMCBAQAogICogVEhFIFBPU1NJQklMSVRZIE9GIFNV Q0ggREFNQUdFLgogICovCiAKLSNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKSAmJiBfX01BQ19P U19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTAwMgotCi0jaW1wb3J0IDxBcHBLaXQvTlNW aWV3X1ByaXZhdGUuaD4KLQotI2Vsc2UKKy8vIEZJWE1FOiBUaGlzIHNob3VsZCBpbmNsdWRlIHBy aXZhdGUgaGVhZGVycyB3aGVuIHBvc3NpYmxlLgogCiAjaW1wb3J0IDxBcHBLaXQvTlNWaWV3Lmg+ CiAKIEBpbnRlcmZhY2UgTlNWaWV3IChQcml2YXRlKQotQHByb3BlcnR5IChzdHJvbmcpIE5TTWVu dSAqYWN0aW9uTWVudTsKK0Bwcm9wZXJ0eSAoc3Ryb25nKSBOU01lbnUgKl9hY3Rpb25NZW51Owog QGVuZAotCi0jZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi QWN0aW9uTWVudUNvbnRyb2xsZXIubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkFj dGlvbk1lbnVDb250cm9sbGVyLm1tCmluZGV4IDRiMjViOTM0YTRiYWRmOWE0NmFlOWNkNjQ4ODcx NDAzNjEwMDIwMDAuLjUxZDU1MTRlYTQ0NTQyNjYyNmRhYmUzMWM4N2JjMTI0YjkzZTM1NzIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViQWN0aW9uTWVudUNvbnRyb2xs ZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJBY3Rpb25NZW51Q29udHJv bGxlci5tbQpAQCAtMTIzLDcgKzEyMyw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogICAg IGlmICghX3dlYlZpZXcpCiAgICAgICAgIHJldHVybjsKIAotICAgIE5TTWVudSAqYWN0aW9uTWVu dSA9IF93ZWJWaWV3LmFjdGlvbk1lbnU7CisgICAgTlNNZW51ICphY3Rpb25NZW51ID0gX3dlYlZp ZXcuX2FjdGlvbk1lbnU7CiAgICAgaWYgKG1lbnUgIT0gYWN0aW9uTWVudSkKICAgICAgICAgcmV0 dXJuOwogCkBAIC0xNzQsNyArMTc0LDcgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIC0g KHZvaWQpd2lsbE9wZW5NZW51OihOU01lbnUgKiltZW51IHdpdGhFdmVudDooTlNFdmVudCAqKWV2 ZW50CiB7Ci0gICAgaWYgKG1lbnUgIT0gX3dlYlZpZXcuYWN0aW9uTWVudSkKKyAgICBpZiAobWVu dSAhPSBfd2ViVmlldy5fYWN0aW9uTWVudSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKCFt ZW51Lm51bWJlck9mSXRlbXMpCkBAIC0yMDYsNyArMjA2LDcgQEAgdXNpbmcgbmFtZXNwYWNlIFdl YkNvcmU7CiAKIC0gKHZvaWQpZGlkQ2xvc2VNZW51OihOU01lbnUgKiltZW51IHdpdGhFdmVudDoo TlNFdmVudCAqKWV2ZW50CiB7Ci0gICAgaWYgKG1lbnUgIT0gX3dlYlZpZXcuYWN0aW9uTWVudSkK KyAgICBpZiAobWVudSAhPSBfd2ViVmlldy5fYWN0aW9uTWVudSkKICAgICAgICAgcmV0dXJuOwog CiAgICAgaWYgKF9jdXJyZW50QWN0aW9uQ29udGV4dCAmJiBfaGFzQWN0aXZhdGVkQWN0aW9uQ29u dGV4dCkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1t IGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCmluZGV4IDc1YjQ1ODY0NmEx Nzk3YThhMDBjZDk4Y2U1OTE3MzdhMzA4MDg3ODguLmQ0YjU3MGRiMzI1ODUyYTUxMTIwZmM1YWU4 OWZhYmZkMjZiNjBkZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi Vmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KQEAgLTg5 MSw5ICs4OTEsOSBAQCBzdGF0aWMgdm9pZCBXZWJLaXRJbml0aWFsaXplR2FtZXBhZFByb3ZpZGVy SWZOZWNlc3NhcnkoKQogI2lmIFBMQVRGT1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01J Tl9SRVFVSVJFRCA+PSAxMDEwMDAKICAgICBpZiAoW3NlbGYgcmVzcG9uZHNUb1NlbGVjdG9yOkBz ZWxlY3RvcihzZXRBY3Rpb25NZW51OildKSB7CiAgICAgICAgIFJldGFpblB0cjxOU01lbnU+IGFj dGlvbk1lbnUgPSBhZG9wdE5TKFtbTlNNZW51IGFsbG9jXSBpbml0XSk7Ci0gICAgICAgIHNlbGYu YWN0aW9uTWVudSA9IGFjdGlvbk1lbnUuZ2V0KCk7CisgICAgICAgIHNlbGYuX2FjdGlvbk1lbnUg PSBhY3Rpb25NZW51LmdldCgpOwogICAgICAgICBfcHJpdmF0ZS0+YWN0aW9uTWVudUNvbnRyb2xs ZXIgPSBbW1dlYkFjdGlvbk1lbnVDb250cm9sbGVyIGFsbG9jXSBpbml0V2l0aFdlYlZpZXc6c2Vs Zl07Ci0gICAgICAgIHNlbGYuYWN0aW9uTWVudS5hdXRvZW5hYmxlc0l0ZW1zID0gTk87CisgICAg ICAgIHNlbGYuX2FjdGlvbk1lbnUuYXV0b2VuYWJsZXNJdGVtcyA9IE5POwogICAgIH0KIAogICAg IGlmIChDbGFzcyBnZXN0dXJlQ2xhc3MgPSBOU0NsYXNzRnJvbVN0cmluZyhAIk5TSW1tZWRpYXRl QWN0aW9uR2VzdHVyZVJlY29nbml6ZXIiKSkgewpAQCAtODU3OSw3ICs4NTc5LDcgQEAgc3RhdGlj IHZvaWQgZ2xpYkNvbnRleHRJdGVyYXRpb25DYWxsYmFjayhDRlJ1bkxvb3BPYnNlcnZlclJlZiwg Q0ZSdW5Mb29wQWN0aXZpdHkKICNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49 IDEwMTAwMAogLSAodm9pZClwcmVwYXJlRm9yTWVudTooTlNNZW51ICopbWVudSB3aXRoRXZlbnQ6 KE5TRXZlbnQgKilldmVudAogewotICAgIGlmIChtZW51ICE9IHNlbGYuYWN0aW9uTWVudSkKKyAg ICBpZiAobWVudSAhPSBzZWxmLl9hY3Rpb25NZW51KQogICAgICAgICByZXR1cm47CiAKICAgICBb X3ByaXZhdGUtPmFjdGlvbk1lbnVDb250cm9sbGVyIHByZXBhcmVGb3JNZW51Om1lbnUgd2l0aEV2 ZW50OmV2ZW50XTsKQEAgLTg1ODcsNyArODU4Nyw3IEBAIHN0YXRpYyB2b2lkIGdsaWJDb250ZXh0 SXRlcmF0aW9uQ2FsbGJhY2soQ0ZSdW5Mb29wT2JzZXJ2ZXJSZWYsIENGUnVuTG9vcEFjdGl2aXR5 CiAKIC0gKHZvaWQpd2lsbE9wZW5NZW51OihOU01lbnUgKiltZW51IHdpdGhFdmVudDooTlNFdmVu dCAqKWV2ZW50CiB7Ci0gICAgaWYgKG1lbnUgIT0gc2VsZi5hY3Rpb25NZW51KQorICAgIGlmICht ZW51ICE9IHNlbGYuX2FjdGlvbk1lbnUpCiAgICAgICAgIHJldHVybjsKIAogICAgIFtfcHJpdmF0 ZS0+YWN0aW9uTWVudUNvbnRyb2xsZXIgd2lsbE9wZW5NZW51Om1lbnUgd2l0aEV2ZW50OmV2ZW50 XTsKQEAgLTg1OTUsNyArODU5NSw3IEBAIHN0YXRpYyB2b2lkIGdsaWJDb250ZXh0SXRlcmF0aW9u Q2FsbGJhY2soQ0ZSdW5Mb29wT2JzZXJ2ZXJSZWYsIENGUnVuTG9vcEFjdGl2aXR5CiAKIC0gKHZv aWQpZGlkQ2xvc2VNZW51OihOU01lbnUgKiltZW51IHdpdGhFdmVudDooTlNFdmVudCAqKWV2ZW50 CiB7Ci0gICAgaWYgKG1lbnUgIT0gc2VsZi5hY3Rpb25NZW51KQorICAgIGlmIChtZW51ICE9IHNl bGYuX2FjdGlvbk1lbnUpCiAgICAgICAgIHJldHVybjsKIAogICAgIFtfcHJpdmF0ZS0+YWN0aW9u TWVudUNvbnRyb2xsZXIgZGlkQ2xvc2VNZW51Om1lbnUgd2l0aEV2ZW50OmV2ZW50XTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbSBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQppbmRleCA3ZGEzNDVlYzg4YzU5 YjMyYzBkOTM2OGRlNzYzYzcyMDVlYmVlNDMwLi5kNzZiYTg1M2E3ZjI1OWZlNWQ4NTY1ZGQ4OTJi MzdhNGY4MGNiMDM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21h Yy9XS1ZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3 Lm1tCkBAIC0zNjE1LDEwICszNjE1LDEwIEBAIHN0YXRpYyBOU1N0cmluZyAqcGF0aFdpdGhVbmlx dWVGaWxlbmFtZUZvclBhdGgoTlNTdHJpbmcgKnBhdGgpCiAjaWYgX19NQUNfT1NfWF9WRVJTSU9O X01JTl9SRVFVSVJFRCA+PSAxMDEwMDAKICAgICBpZiAoW3NlbGYgcmVzcG9uZHNUb1NlbGVjdG9y OkBzZWxlY3RvcihzZXRBY3Rpb25NZW51OildKSB7CiAgICAgICAgIFJldGFpblB0cjxOU01lbnU+ IG1lbnUgPSBhZG9wdE5TKFtbTlNNZW51IGFsbG9jXSBpbml0XSk7Ci0gICAgICAgIHNlbGYuYWN0 aW9uTWVudSA9IG1lbnUuZ2V0KCk7CisgICAgICAgIHNlbGYuX2FjdGlvbk1lbnUgPSBtZW51Lmdl dCgpOwogICAgICAgICBfZGF0YS0+X2FjdGlvbk1lbnVDb250cm9sbGVyID0gYWRvcHROUyhbW1dL QWN0aW9uTWVudUNvbnRyb2xsZXIgYWxsb2NdIGluaXRXaXRoUGFnZToqX2RhdGEtPl9wYWdlIHZp ZXc6c2VsZl0pOwotICAgICAgICBzZWxmLmFjdGlvbk1lbnUuZGVsZWdhdGUgPSBfZGF0YS0+X2Fj dGlvbk1lbnVDb250cm9sbGVyLmdldCgpOwotICAgICAgICBzZWxmLmFjdGlvbk1lbnUuYXV0b2Vu YWJsZXNJdGVtcyA9IE5POworICAgICAgICBzZWxmLl9hY3Rpb25NZW51LmRlbGVnYXRlID0gX2Rh dGEtPl9hY3Rpb25NZW51Q29udHJvbGxlci5nZXQoKTsKKyAgICAgICAgc2VsZi5fYWN0aW9uTWVu dS5hdXRvZW5hYmxlc0l0ZW1zID0gTk87CiAgICAgfQogCiAgICAgaWYgKENsYXNzIGdlc3R1cmVD bGFzcyA9IE5TQ2xhc3NGcm9tU3RyaW5nKEAiTlNJbW1lZGlhdGVBY3Rpb25HZXN0dXJlUmVjb2du aXplciIpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLQWN0 aW9uTWVudUNvbnRyb2xsZXIubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLQWN0 aW9uTWVudUNvbnRyb2xsZXIubW0KaW5kZXggZmY2ODc0YzgyMDY1MzEzNmJjOTZmYzY2MWYzOTdk OTA5NTFiMDQ0My4uYzNmZDYyYTIzY2E4Zjk5NjRmNWUwZDBlMmJkOGE5MjU1NmJkNGU0MyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1lbnVDb250cm9s bGVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tBY3Rpb25NZW51Q29u dHJvbGxlci5tbQpAQCAtOTYsNyArOTYsNyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogCiAt ICh2b2lkKXByZXBhcmVGb3JNZW51OihOU01lbnUgKiltZW51IHdpdGhFdmVudDooTlNFdmVudCAq KWV2ZW50CiB7Ci0gICAgaWYgKG1lbnUgIT0gX3drVmlldy5hY3Rpb25NZW51KQorICAgIGlmICht ZW51ICE9IF93a1ZpZXcuX2FjdGlvbk1lbnUpCiAgICAgICAgIHJldHVybjsKIAogICAgIFtfd2tW aWV3IF9kaXNtaXNzQ29udGVudFJlbGF0aXZlQ2hpbGRXaW5kb3dzXTsKQEAgLTExNCw3ICsxMTQs NyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogCiAtICh2b2lkKXdpbGxPcGVuTWVudTooTlNN ZW51ICopbWVudSB3aXRoRXZlbnQ6KE5TRXZlbnQgKilldmVudAogewotICAgIGlmIChtZW51ICE9 IF93a1ZpZXcuYWN0aW9uTWVudSkKKyAgICBpZiAobWVudSAhPSBfd2tWaWV3Ll9hY3Rpb25NZW51 KQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoIW1lbnUubnVtYmVyT2ZJdGVtcykKQEAgLTE0 Nyw3ICsxNDcsNyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogCiAtICh2b2lkKWRpZENsb3Nl TWVudTooTlNNZW51ICopbWVudSB3aXRoRXZlbnQ6KE5TRXZlbnQgKilldmVudAogewotICAgIGlm IChtZW51ICE9IF93a1ZpZXcuYWN0aW9uTWVudSkKKyAgICBpZiAobWVudSAhPSBfd2tWaWV3Ll9h Y3Rpb25NZW51KQogICAgICAgICByZXR1cm47CiAKICAgICBbc2VsZiBfY2xlYXJBY3Rpb25NZW51 U3RhdGVdOwpAQCAtNTA1LDcgKzUwNSw3IEBAIHN0YXRpYyBOU1N0cmluZyAqcGF0aFRvUGhvdG9P bkRpc2soTlNTdHJpbmcgKnN1Z2dlc3RlZEZpbGVuYW1lKQogCiAtICh2b2lkKW1lbnVOZWVkc1Vw ZGF0ZTooTlNNZW51ICopbWVudQogewotICAgIGlmIChtZW51ICE9IF93a1ZpZXcuYWN0aW9uTWVu dSkKKyAgICBpZiAobWVudSAhPSBfd2tWaWV3Ll9hY3Rpb25NZW51KQogICAgICAgICByZXR1cm47 CiAKICAgICBBU1NFUlQoX3N0YXRlICE9IEFjdGlvbk1lbnVTdGF0ZTo6Tm9uZSk7CkBAIC03NDks NyArNzQ5LDcgQEAgc3RhdGljIE5TU3RyaW5nICpwYXRoVG9QaG90b09uRGlzayhOU1N0cmluZyAq c3VnZ2VzdGVkRmlsZW5hbWUpCiAKIC0gKHZvaWQpX3VwZGF0ZUFjdGlvbk1lbnVJdGVtcwogewot ICAgIFtfd2tWaWV3LmFjdGlvbk1lbnUgcmVtb3ZlQWxsSXRlbXNdOworICAgIFtfd2tWaWV3Ll9h Y3Rpb25NZW51IHJlbW92ZUFsbEl0ZW1zXTsKIAogICAgIE5TQXJyYXkgKm1lbnVJdGVtcyA9IFtz ZWxmIF9kZWZhdWx0TWVudUl0ZW1zXTsKICAgICBSZWZQdHI8V2ViSGl0VGVzdFJlc3VsdD4gaGl0 VGVzdFJlc3VsdCA9IFtzZWxmIF93ZWJIaXRUZXN0UmVzdWx0XTsKQEAgLTc2MCwxMCArNzYwLDEw IEBAIHN0YXRpYyBOU1N0cmluZyAqcGF0aFRvUGhvdG9PbkRpc2soTlNTdHJpbmcgKnN1Z2dlc3Rl ZEZpbGVuYW1lKQogICAgICAgICBtZW51SXRlbXMgPSBbX3drVmlldyBfYWN0aW9uTWVudUl0ZW1z Rm9ySGl0VGVzdFJlc3VsdDp0b0FQSShoaXRUZXN0UmVzdWx0LmdldCgpKSB3aXRoVHlwZTpfdHlw ZSBkZWZhdWx0QWN0aW9uTWVudUl0ZW1zOm1lbnVJdGVtcyB1c2VyRGF0YTp0b0FQSShfdXNlckRh dGEuZ2V0KCkpXTsKIAogICAgIGZvciAoTlNNZW51SXRlbSAqaXRlbSBpbiBtZW51SXRlbXMpCi0g ICAgICAgIFtfd2tWaWV3LmFjdGlvbk1lbnUgYWRkSXRlbTppdGVtXTsKKyAgICAgICAgW193a1Zp ZXcuX2FjdGlvbk1lbnUgYWRkSXRlbTppdGVtXTsKIAotICAgIGlmICghX3drVmlldy5hY3Rpb25N ZW51Lm51bWJlck9mSXRlbXMpCi0gICAgICAgIFtfd2tWaWV3LmFjdGlvbk1lbnUgY2FuY2VsVHJh Y2tpbmddOworICAgIGlmICghX3drVmlldy5fYWN0aW9uTWVudS5udW1iZXJPZkl0ZW1zKQorICAg ICAgICBbX3drVmlldy5fYWN0aW9uTWVudSBjYW5jZWxUcmFja2luZ107CiB9CiAKIEBlbmQKZGlm ZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2YmM0YmU5 ZjhjMDc3NjdkZWY2YTg3NGEyYjdlZWVhZDkxYTNiMDMwLi4wM2ZlNzBlYjE1ZTRhODg1YjU3Yzcy ZWNjMzZjMmRhYzIwMzg1YTU4IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9v bHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTUtMDEtMTkgIFRpbW90aHkgSG9ydG9u ICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIEFkanVzdCBuYW1pbmcgb2Yg YWN0aW9uIG1lbnUgU1BJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNDA2NDQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE5NDQ4MTI5PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXQyT2JqQy9BY3Rpb25NZW51cy5tbToKKyAgICAgICAgKC1bQWN0aW9uTWVu dXNUZXN0V0tWaWV3IHJ1bk1lbnVTZXF1ZW5jZUF0UG9pbnQ6cHJlRGlkQ2xvc2VNZW51SGFuZGxl cjpdKToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorCiAyMDE1LTAxLTE5ICBEYXZp ZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gRG8gbm90IGhh cmQtY29kZSBpcGhvbmVvcy5pbnRlcm5hbCBTREsgaW4gYnVpbGRYQ29kZVByb2plY3QoKQpkaWZm IC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyT2JqQy9BY3Rpb25NZW51 cy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mk9iakMvQWN0aW9uTWVudXMu bW0KaW5kZXggOGVhYzdhZGVmYTEzODkwMmExZTBiZTU3NGRkMjc5ZTNjMWM0NjBmYi4uNGE4NGQz YjUxNWYwYTk0MGMwZDFlZmI1MWU3Yzk3MTVhZTBkZTk0MiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyT2JqQy9BY3Rpb25NZW51cy5tbQorKysgYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJPYmpDL0FjdGlvbk1lbnVzLm1tCkBAIC01MSw3ICs1 MSw3IEBAIHN0YXRpYyBib29sIGRpZEZpbmlzaERvd25sb2FkID0gZmFsc2U7CiAtICh2b2lkKXdp bGxPcGVuTWVudTooTlNNZW51ICopbWVudSB3aXRoRXZlbnQ6KE5TRXZlbnQgKilldmVudDsKIC0g KHZvaWQpZGlkQ2xvc2VNZW51OihOU01lbnUgKiltZW51IHdpdGhFdmVudDooTlNFdmVudCAqKWV2 ZW50OwogCi0tIChOU01lbnUgKilhY3Rpb25NZW51OworLSAoTlNNZW51ICopX2FjdGlvbk1lbnU7 CiAtICh2b2lkKWNvcHk6KGlkKXNlbmRlcjsKIAogQGVuZApAQCAtMTA4LDcgKzEwOCw3IEBAIHN0 cnVjdCBBY3Rpb25NZW51UmVzdWx0IHsKIHsKICAgICBfX2Jsb2NrIGJvb2wgZGlkRmluaXNoU2Vx dWVuY2UgPSBmYWxzZTsKIAotICAgIE5TTWVudSAqYWN0aW9uTWVudSA9IHNlbGYuYWN0aW9uTWVu dTsKKyAgICBOU01lbnUgKmFjdGlvbk1lbnUgPSBzZWxmLl9hY3Rpb25NZW51OwogICAgIFJldGFp blB0cjxOU0V2ZW50PiBldmVudCA9IFtOU0V2ZW50IG1vdXNlRXZlbnRXaXRoVHlwZTpOU0xlZnRN b3VzZURvd24gbG9jYXRpb246cG9pbnQgbW9kaWZpZXJGbGFnczowIHRpbWVzdGFtcDowIHdpbmRv d051bWJlcjpzZWxmLndpbmRvdy53aW5kb3dOdW1iZXIgY29udGV4dDowIGV2ZW50TnVtYmVyOjAg Y2xpY2tDb3VudDowIHByZXNzdXJlOjBdOwogCiAgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hf Z2V0X21haW5fcXVldWUoKSwgXnsKQEAgLTQ4MCw3ICs0ODAsNyBAQCBURVNUKFdlYktpdDIsIERJ U0FCTEVEX0FjdGlvbk1lbnVzVGVzdCkKICAgICBbd2tWaWV3IHJ1bk1lbnVTZXF1ZW5jZUF0UG9p bnQ6d2luZG93UG9pbnRGb3JUYXJnZXQoVGFyZ2V0VHlwZTo6V29yZCkgcHJlRGlkQ2xvc2VNZW51 SGFuZGxlcjpeKCkgewogICAgICAgICBFWFBFQ1RfRVEoa1dLQWN0aW9uTWVudVJlYWRPbmx5VGV4 dCwgW3drVmlldyBfYWN0aW9uTWVudVJlc3VsdF0udHlwZSk7CiAgICAgICAgIEVYUEVDVF9XS19T VFJFUShAIndvcmQiLCByZXRyaWV2ZVNlbGVjdGlvbihbd2tWaWV3IHBhZ2VSZWZdKSk7Ci0gICAg ICAgIHBlcmZvcm1NZW51SXRlbUF0SW5kZXhPZlR5cGVBc3luYyhbd2tWaWV3IGFjdGlvbk1lbnVd LCAwLCBrV0tDb250ZXh0QWN0aW9uSXRlbVRhZ0NvcHlUZXh0KTsKKyAgICAgICAgcGVyZm9ybU1l bnVJdGVtQXRJbmRleE9mVHlwZUFzeW5jKFt3a1ZpZXcgX2FjdGlvbk1lbnVdLCAwLCBrV0tDb250 ZXh0QWN0aW9uSXRlbVRhZ0NvcHlUZXh0KTsKICAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAid29y ZCIsIHdhdGNoUGFzdGVib2FyZEZvclN0cmluZygpKTsKICAgICB9XTsKIApAQCAtNDg4LDcgKzQ4 OCw3IEBAIFRFU1QoV2ViS2l0MiwgRElTQUJMRURfQWN0aW9uTWVudXNUZXN0KQogICAgIFt3a1Zp ZXcgcnVuTWVudVNlcXVlbmNlQXRQb2ludDp3aW5kb3dQb2ludEZvclRhcmdldChUYXJnZXRUeXBl OjpQaHJhc2UpIHByZURpZENsb3NlTWVudUhhbmRsZXI6XigpIHsKICAgICAgICAgRVhQRUNUX0VR KGtXS0FjdGlvbk1lbnVSZWFkT25seVRleHQsIFt3a1ZpZXcgX2FjdGlvbk1lbnVSZXN1bHRdLnR5 cGUpOwogICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJOZXcgWW9yayIsIHJldHJpZXZlU2VsZWN0 aW9uKFt3a1ZpZXcgcGFnZVJlZl0pKTsKLSAgICAgICAgcGVyZm9ybU1lbnVJdGVtQXRJbmRleE9m VHlwZUFzeW5jKFt3a1ZpZXcgYWN0aW9uTWVudV0sIDAsIGtXS0NvbnRleHRBY3Rpb25JdGVtVGFn Q29weVRleHQpOworICAgICAgICBwZXJmb3JtTWVudUl0ZW1BdEluZGV4T2ZUeXBlQXN5bmMoW3dr VmlldyBfYWN0aW9uTWVudV0sIDAsIGtXS0NvbnRleHRBY3Rpb25JdGVtVGFnQ29weVRleHQpOwog ICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJOZXcgWW9yayIsIHdhdGNoUGFzdGVib2FyZEZvclN0 cmluZygpKTsKICAgICB9XTsKIApAQCAtNTE4LDcgKzUxOCw3IEBAIFRFU1QoV2ViS2l0MiwgRElT QUJMRURfQWN0aW9uTWVudXNUZXN0KQogICAgIFt3a1ZpZXcgcnVuTWVudVNlcXVlbmNlQXRQb2lu dDp3aW5kb3dQb2ludEZvclRhcmdldChUYXJnZXRUeXBlOjpDb250ZW50RWRpdGFibGVXb3Jkcykg cHJlRGlkQ2xvc2VNZW51SGFuZGxlcjpeKCkgewogICAgICAgICBFWFBFQ1RfRVEoa1dLQWN0aW9u TWVudUVkaXRhYmxlVGV4dCwgW3drVmlldyBfYWN0aW9uTWVudVJlc3VsdF0udHlwZSk7CiAgICAg ICAgIEVYUEVDVF9XS19TVFJFUShAImVkaXRhYmxlIiwgcmV0cmlldmVTZWxlY3Rpb24oW3drVmll dyBwYWdlUmVmXSkpOwotICAgICAgICBwZXJmb3JtTWVudUl0ZW1BdEluZGV4T2ZUeXBlQXN5bmMo W3drVmlldyBhY3Rpb25NZW51XSwgMCwga1dLQ29udGV4dEFjdGlvbkl0ZW1UYWdDb3B5VGV4dCk7 CisgICAgICAgIHBlcmZvcm1NZW51SXRlbUF0SW5kZXhPZlR5cGVBc3luYyhbd2tWaWV3IF9hY3Rp b25NZW51XSwgMCwga1dLQ29udGV4dEFjdGlvbkl0ZW1UYWdDb3B5VGV4dCk7CiAgICAgICAgIEVY UEVDVF9XS19TVFJFUShAImVkaXRhYmxlIiwgd2F0Y2hQYXN0ZWJvYXJkRm9yU3RyaW5nKCkpOwog ICAgIH1dOwogCkBAIC01MjYsNyArNTI2LDcgQEAgVEVTVChXZWJLaXQyLCBESVNBQkxFRF9BY3Rp b25NZW51c1Rlc3QpCiAgICAgW3drVmlldyBydW5NZW51U2VxdWVuY2VBdFBvaW50OndpbmRvd1Bv aW50Rm9yVGFyZ2V0KFRhcmdldFR5cGU6OkNvbnRlbnRFZGl0YWJsZVBocmFzZSkgcHJlRGlkQ2xv c2VNZW51SGFuZGxlcjpeKCkgewogICAgICAgICBFWFBFQ1RfRVEoa1dLQWN0aW9uTWVudUVkaXRh YmxlVGV4dCwgW3drVmlldyBfYWN0aW9uTWVudVJlc3VsdF0udHlwZSk7CiAgICAgICAgIEVYUEVD VF9XS19TVFJFUShAIk5ldyBZb3JrIiwgcmV0cmlldmVTZWxlY3Rpb24oW3drVmlldyBwYWdlUmVm XSkpOwotICAgICAgICBwZXJmb3JtTWVudUl0ZW1BdEluZGV4T2ZUeXBlQXN5bmMoW3drVmlldyBh Y3Rpb25NZW51XSwgMCwga1dLQ29udGV4dEFjdGlvbkl0ZW1UYWdDb3B5VGV4dCk7CisgICAgICAg IHBlcmZvcm1NZW51SXRlbUF0SW5kZXhPZlR5cGVBc3luYyhbd2tWaWV3IF9hY3Rpb25NZW51XSwg MCwga1dLQ29udGV4dEFjdGlvbkl0ZW1UYWdDb3B5VGV4dCk7CiAgICAgICAgIEVYUEVDVF9XS19T VFJFUShAIk5ldyBZb3JrIiwgd2F0Y2hQYXN0ZWJvYXJkRm9yU3RyaW5nKCkpOwogICAgIH1dOwog CkBAIC01MzYsNyArNTM2LDcgQEAgVEVTVChXZWJLaXQyLCBESVNBQkxFRF9BY3Rpb25NZW51c1Rl c3QpCiAgICAgICAgIFtbTlNQYXN0ZWJvYXJkIGdlbmVyYWxQYXN0ZWJvYXJkXSBjbGVhckNvbnRl bnRzXTsKICAgICAgICAgW1tOU1Bhc3RlYm9hcmQgZ2VuZXJhbFBhc3RlYm9hcmRdIHNldFN0cmlu ZzpAInBhc3RlZCBzdHJpbmciIGZvclR5cGU6TlNQYXN0ZWJvYXJkVHlwZVN0cmluZ107CiAgICAg ICAgIEVYUEVDVF9XS19TVFJFUShAImVkaXRhYmxlIiwgcmV0cmlldmVTZWxlY3Rpb24oW3drVmll dyBwYWdlUmVmXSkpOwotICAgICAgICBwZXJmb3JtTWVudUl0ZW1BdEluZGV4T2ZUeXBlQXN5bmMo W3drVmlldyBhY3Rpb25NZW51XSwgMiwga1dLQ29udGV4dEFjdGlvbkl0ZW1UYWdQYXN0ZSk7Cisg ICAgICAgIHBlcmZvcm1NZW51SXRlbUF0SW5kZXhPZlR5cGVBc3luYyhbd2tWaWV3IF9hY3Rpb25N ZW51XSwgMiwga1dLQ29udGV4dEFjdGlvbkl0ZW1UYWdQYXN0ZSk7CiAKICAgICAgICAgLy8gTm93 IGNoZWNrIGFuZCBzZWUgaWYgb3VyIHBhc3RlIHN1Y2NlZWRlZC4gSXQgc2hvdWxkIG9ubHkgcmVw bGFjZSBvbmUgJ2VkaXRhYmxlJy4KICAgICAgICAgd2F0Y2hFZGl0YWJsZUFyZWFGb3JTdHJpbmco W3drVmlldyBwYWdlUmVmXSwgImVkaXRhYmxlMSIsICJwYXN0ZWQgc3RyaW5nIGVkaXRhYmxlIGVk aXRhYmxlIGVkaXRhYmxlIik7CkBAIC01NDgsNyArNTQ4LDcgQEAgVEVTVChXZWJLaXQyLCBESVNB QkxFRF9BY3Rpb25NZW51c1Rlc3QpCiAgICAgICAgIFtbTlNQYXN0ZWJvYXJkIGdlbmVyYWxQYXN0 ZWJvYXJkXSBjbGVhckNvbnRlbnRzXTsKICAgICAgICAgW1tOU1Bhc3RlYm9hcmQgZ2VuZXJhbFBh c3RlYm9hcmRdIHNldFN0cmluZzpAInBhc3RlZCBvdmVyIHBocmFzZSIgZm9yVHlwZTpOU1Bhc3Rl Ym9hcmRUeXBlU3RyaW5nXTsKICAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAiTmV3IFlvcmsiLCBy ZXRyaWV2ZVNlbGVjdGlvbihbd2tWaWV3IHBhZ2VSZWZdKSk7Ci0gICAgICAgIHBlcmZvcm1NZW51 SXRlbUF0SW5kZXhPZlR5cGVBc3luYyhbd2tWaWV3IGFjdGlvbk1lbnVdLCAyLCBrV0tDb250ZXh0 QWN0aW9uSXRlbVRhZ1Bhc3RlKTsKKyAgICAgICAgcGVyZm9ybU1lbnVJdGVtQXRJbmRleE9mVHlw ZUFzeW5jKFt3a1ZpZXcgX2FjdGlvbk1lbnVdLCAyLCBrV0tDb250ZXh0QWN0aW9uSXRlbVRhZ1Bh c3RlKTsKIAogICAgICAgICAvLyBOb3cgY2hlY2sgYW5kIHNlZSBpZiBvdXIgcGFzdGUgc3VjY2Vl ZGVkLCBhbmQgcmVwbGFjZWQgdGhlIHdob2xlIHBocmFzZS4KICAgICAgICAgd2F0Y2hFZGl0YWJs ZUFyZWFGb3JTdHJpbmcoW3drVmlldyBwYWdlUmVmXSwgImVkaXRhYmxlMiIsICJwYXN0ZWQgb3Zl ciBwaHJhc2Ugc29tZSB3b3JkcyIpOwpAQCAtNTU4LDcgKzU1OCw3IEBAIFRFU1QoV2ViS2l0Miwg RElTQUJMRURfQWN0aW9uTWVudXNUZXN0KQogICAgIFt3a1ZpZXcgcnVuTWVudVNlcXVlbmNlQXRQ b2ludDp3aW5kb3dQb2ludEZvclRhcmdldChUYXJnZXRUeXBlOjpUZXh0SW5wdXRXb3JkcykgcHJl RGlkQ2xvc2VNZW51SGFuZGxlcjpeKCkgewogICAgICAgICBFWFBFQ1RfRVEoa1dLQWN0aW9uTWVu dUVkaXRhYmxlVGV4dCwgW3drVmlldyBfYWN0aW9uTWVudVJlc3VsdF0udHlwZSk7CiAgICAgICAg IEVYUEVDVF9XS19TVFJFUShAImVkaXRhYmxlIiwgcmV0cmlldmVTZWxlY3Rpb25JbkVsZW1lbnQo W3drVmlldyBwYWdlUmVmXSwgImlucHV0MSIpKTsKLSAgICAgICAgcGVyZm9ybU1lbnVJdGVtQXRJ bmRleE9mVHlwZUFzeW5jKFt3a1ZpZXcgYWN0aW9uTWVudV0sIDAsIGtXS0NvbnRleHRBY3Rpb25J dGVtVGFnQ29weVRleHQpOworICAgICAgICBwZXJmb3JtTWVudUl0ZW1BdEluZGV4T2ZUeXBlQXN5 bmMoW3drVmlldyBfYWN0aW9uTWVudV0sIDAsIGtXS0NvbnRleHRBY3Rpb25JdGVtVGFnQ29weVRl eHQpOwogICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJlZGl0YWJsZSIsIHdhdGNoUGFzdGVib2Fy ZEZvclN0cmluZygpKTsKICAgICB9XTsKIApAQCAtNTY2LDcgKzU2Niw3IEBAIFRFU1QoV2ViS2l0 MiwgRElTQUJMRURfQWN0aW9uTWVudXNUZXN0KQogICAgIFt3a1ZpZXcgcnVuTWVudVNlcXVlbmNl QXRQb2ludDp3aW5kb3dQb2ludEZvclRhcmdldChUYXJnZXRUeXBlOjpUZXh0SW5wdXRQaHJhc2Up IHByZURpZENsb3NlTWVudUhhbmRsZXI6XigpIHsKICAgICAgICAgRVhQRUNUX0VRKGtXS0FjdGlv bk1lbnVFZGl0YWJsZVRleHQsIFt3a1ZpZXcgX2FjdGlvbk1lbnVSZXN1bHRdLnR5cGUpOwogICAg ICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJOZXcgWW9yayIsIHJldHJpZXZlU2VsZWN0aW9uSW5FbGVt ZW50KFt3a1ZpZXcgcGFnZVJlZl0sICJpbnB1dDIiKSk7Ci0gICAgICAgIHBlcmZvcm1NZW51SXRl bUF0SW5kZXhPZlR5cGVBc3luYyhbd2tWaWV3IGFjdGlvbk1lbnVdLCAwLCBrV0tDb250ZXh0QWN0 aW9uSXRlbVRhZ0NvcHlUZXh0KTsKKyAgICAgICAgcGVyZm9ybU1lbnVJdGVtQXRJbmRleE9mVHlw ZUFzeW5jKFt3a1ZpZXcgX2FjdGlvbk1lbnVdLCAwLCBrV0tDb250ZXh0QWN0aW9uSXRlbVRhZ0Nv cHlUZXh0KTsKICAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAiTmV3IFlvcmsiLCB3YXRjaFBhc3Rl Ym9hcmRGb3JTdHJpbmcoKSk7CiAgICAgfV07CiAKQEAgLTU3Niw3ICs1NzYsNyBAQCBURVNUKFdl YktpdDIsIERJU0FCTEVEX0FjdGlvbk1lbnVzVGVzdCkKICAgICAgICAgW1tOU1Bhc3RlYm9hcmQg Z2VuZXJhbFBhc3RlYm9hcmRdIGNsZWFyQ29udGVudHNdOwogICAgICAgICBbW05TUGFzdGVib2Fy ZCBnZW5lcmFsUGFzdGVib2FyZF0gc2V0U3RyaW5nOkAicGFzdGVkIHN0cmluZyIgZm9yVHlwZTpO U1Bhc3RlYm9hcmRUeXBlU3RyaW5nXTsKICAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAiZWRpdGFi bGUiLCByZXRyaWV2ZVNlbGVjdGlvbkluRWxlbWVudChbd2tWaWV3IHBhZ2VSZWZdLCAiaW5wdXQx IikpOwotICAgICAgICBwZXJmb3JtTWVudUl0ZW1BdEluZGV4T2ZUeXBlQXN5bmMoW3drVmlldyBh Y3Rpb25NZW51XSwgMiwga1dLQ29udGV4dEFjdGlvbkl0ZW1UYWdQYXN0ZSk7CisgICAgICAgIHBl cmZvcm1NZW51SXRlbUF0SW5kZXhPZlR5cGVBc3luYyhbd2tWaWV3IF9hY3Rpb25NZW51XSwgMiwg a1dLQ29udGV4dEFjdGlvbkl0ZW1UYWdQYXN0ZSk7CiAKICAgICAgICAgLy8gTm93IGNoZWNrIGFu ZCBzZWUgaWYgb3VyIHBhc3RlIHN1Y2NlZWRlZC4gSXQgc2hvdWxkIG9ubHkgcmVwbGFjZSBvbmUg J2VkaXRhYmxlJy4KICAgICAgICAgd2F0Y2hFZGl0YWJsZUFyZWFGb3JTdHJpbmcoW3drVmlldyBw YWdlUmVmXSwgImlucHV0MSIsICJwYXN0ZWQgc3RyaW5nIGVkaXRhYmxlIGVkaXRhYmxlIGVkaXRh YmxlIik7CkBAIC01ODgsNyArNTg4LDcgQEAgVEVTVChXZWJLaXQyLCBESVNBQkxFRF9BY3Rpb25N ZW51c1Rlc3QpCiAgICAgICAgIFtbTlNQYXN0ZWJvYXJkIGdlbmVyYWxQYXN0ZWJvYXJkXSBjbGVh ckNvbnRlbnRzXTsKICAgICAgICAgW1tOU1Bhc3RlYm9hcmQgZ2VuZXJhbFBhc3RlYm9hcmRdIHNl dFN0cmluZzpAInBhc3RlZCBvdmVyIHBocmFzZSIgZm9yVHlwZTpOU1Bhc3RlYm9hcmRUeXBlU3Ry aW5nXTsKICAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAiTmV3IFlvcmsiLCByZXRyaWV2ZVNlbGVj dGlvbkluRWxlbWVudChbd2tWaWV3IHBhZ2VSZWZdLCAiaW5wdXQyIikpOwotICAgICAgICBwZXJm b3JtTWVudUl0ZW1BdEluZGV4T2ZUeXBlQXN5bmMoW3drVmlldyBhY3Rpb25NZW51XSwgMiwga1dL Q29udGV4dEFjdGlvbkl0ZW1UYWdQYXN0ZSk7CisgICAgICAgIHBlcmZvcm1NZW51SXRlbUF0SW5k ZXhPZlR5cGVBc3luYyhbd2tWaWV3IF9hY3Rpb25NZW51XSwgMiwga1dLQ29udGV4dEFjdGlvbkl0 ZW1UYWdQYXN0ZSk7CiAKICAgICAgICAgLy8gTm93IGNoZWNrIGFuZCBzZWUgaWYgb3VyIHBhc3Rl IHN1Y2NlZWRlZCwgYW5kIHJlcGxhY2VkIHRoZSB3aG9sZSBwaHJhc2UuCiAgICAgICAgIHdhdGNo RWRpdGFibGVBcmVhRm9yU3RyaW5nKFt3a1ZpZXcgcGFnZVJlZl0sICJpbnB1dDIiLCAicGFzdGVk IG92ZXIgcGhyYXNlIHNvbWUgd29yZHMiKTsKQEAgLTU5OCw3ICs1OTgsNyBAQCBURVNUKFdlYktp dDIsIERJU0FCTEVEX0FjdGlvbk1lbnVzVGVzdCkKICAgICBbd2tWaWV3IHJ1bk1lbnVTZXF1ZW5j ZUF0UG9pbnQ6d2luZG93UG9pbnRGb3JUYXJnZXQoVGFyZ2V0VHlwZTo6VGV4dEFyZWFXb3Jkcykg cHJlRGlkQ2xvc2VNZW51SGFuZGxlcjpeKCkgewogICAgICAgICBFWFBFQ1RfRVEoa1dLQWN0aW9u TWVudUVkaXRhYmxlVGV4dCwgW3drVmlldyBfYWN0aW9uTWVudVJlc3VsdF0udHlwZSk7CiAgICAg ICAgIEVYUEVDVF9XS19TVFJFUShAImVkaXRhYmxlIiwgcmV0cmlldmVTZWxlY3Rpb25JbkVsZW1l bnQoW3drVmlldyBwYWdlUmVmXSwgInRleHRhcmVhMSIpKTsKLSAgICAgICAgcGVyZm9ybU1lbnVJ dGVtQXRJbmRleE9mVHlwZUFzeW5jKFt3a1ZpZXcgYWN0aW9uTWVudV0sIDAsIGtXS0NvbnRleHRB Y3Rpb25JdGVtVGFnQ29weVRleHQpOworICAgICAgICBwZXJmb3JtTWVudUl0ZW1BdEluZGV4T2ZU eXBlQXN5bmMoW3drVmlldyBfYWN0aW9uTWVudV0sIDAsIGtXS0NvbnRleHRBY3Rpb25JdGVtVGFn Q29weVRleHQpOwogICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJlZGl0YWJsZSIsIHdhdGNoUGFz dGVib2FyZEZvclN0cmluZygpKTsKICAgICB9XTsKIApAQCAtNjA2LDcgKzYwNiw3IEBAIFRFU1Qo V2ViS2l0MiwgRElTQUJMRURfQWN0aW9uTWVudXNUZXN0KQogICAgIFt3a1ZpZXcgcnVuTWVudVNl cXVlbmNlQXRQb2ludDp3aW5kb3dQb2ludEZvclRhcmdldChUYXJnZXRUeXBlOjpUZXh0QXJlYVBo cmFzZSkgcHJlRGlkQ2xvc2VNZW51SGFuZGxlcjpeKCkgewogICAgICAgICBFWFBFQ1RfRVEoa1dL QWN0aW9uTWVudUVkaXRhYmxlVGV4dCwgW3drVmlldyBfYWN0aW9uTWVudVJlc3VsdF0udHlwZSk7 CiAgICAgICAgIEVYUEVDVF9XS19TVFJFUShAIk5ldyBZb3JrIiwgcmV0cmlldmVTZWxlY3Rpb25J bkVsZW1lbnQoW3drVmlldyBwYWdlUmVmXSwgInRleHRhcmVhMiIpKTsKLSAgICAgICAgcGVyZm9y bU1lbnVJdGVtQXRJbmRleE9mVHlwZUFzeW5jKFt3a1ZpZXcgYWN0aW9uTWVudV0sIDAsIGtXS0Nv bnRleHRBY3Rpb25JdGVtVGFnQ29weVRleHQpOworICAgICAgICBwZXJmb3JtTWVudUl0ZW1BdElu ZGV4T2ZUeXBlQXN5bmMoW3drVmlldyBfYWN0aW9uTWVudV0sIDAsIGtXS0NvbnRleHRBY3Rpb25J dGVtVGFnQ29weVRleHQpOwogICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJOZXcgWW9yayIsIHdh dGNoUGFzdGVib2FyZEZvclN0cmluZygpKTsKICAgICB9XTsKIApAQCAtNjE2LDcgKzYxNiw3IEBA IFRFU1QoV2ViS2l0MiwgRElTQUJMRURfQWN0aW9uTWVudXNUZXN0KQogICAgICAgICBbW05TUGFz dGVib2FyZCBnZW5lcmFsUGFzdGVib2FyZF0gY2xlYXJDb250ZW50c107CiAgICAgICAgIFtbTlNQ YXN0ZWJvYXJkIGdlbmVyYWxQYXN0ZWJvYXJkXSBzZXRTdHJpbmc6QCJwYXN0ZWQiIGZvclR5cGU6 TlNQYXN0ZWJvYXJkVHlwZVN0cmluZ107CiAgICAgICAgIEVYUEVDVF9XS19TVFJFUShAImVkaXRh YmxlIiwgcmV0cmlldmVTZWxlY3Rpb25JbkVsZW1lbnQoW3drVmlldyBwYWdlUmVmXSwgInRleHRh cmVhMSIpKTsKLSAgICAgICAgcGVyZm9ybU1lbnVJdGVtQXRJbmRleE9mVHlwZUFzeW5jKFt3a1Zp ZXcgYWN0aW9uTWVudV0sIDIsIGtXS0NvbnRleHRBY3Rpb25JdGVtVGFnUGFzdGUpOworICAgICAg ICBwZXJmb3JtTWVudUl0ZW1BdEluZGV4T2ZUeXBlQXN5bmMoW3drVmlldyBfYWN0aW9uTWVudV0s IDIsIGtXS0NvbnRleHRBY3Rpb25JdGVtVGFnUGFzdGUpOwogCiAgICAgICAgIC8vIE5vdyBjaGVj ayBhbmQgc2VlIGlmIG91ciBwYXN0ZSBzdWNjZWVkZWQuIEl0IHNob3VsZCBvbmx5IHJlcGxhY2Ug b25lICdlZGl0YWJsZScuCiAgICAgICAgIHdhdGNoRWRpdGFibGVBcmVhRm9yU3RyaW5nKFt3a1Zp ZXcgcGFnZVJlZl0sICJ0ZXh0YXJlYTEiLCAicGFzdGVkIGVkaXRhYmxlIGVkaXRhYmxlIGVkaXRh YmxlIik7CkBAIC02MjgsNyArNjI4LDcgQEAgVEVTVChXZWJLaXQyLCBESVNBQkxFRF9BY3Rpb25N ZW51c1Rlc3QpCiAgICAgICAgIFtbTlNQYXN0ZWJvYXJkIGdlbmVyYWxQYXN0ZWJvYXJkXSBjbGVh ckNvbnRlbnRzXTsKICAgICAgICAgW1tOU1Bhc3RlYm9hcmQgZ2VuZXJhbFBhc3RlYm9hcmRdIHNl dFN0cmluZzpAInBhc3RlZCBvdmVyIHBocmFzZSIgZm9yVHlwZTpOU1Bhc3RlYm9hcmRUeXBlU3Ry aW5nXTsKICAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAiTmV3IFlvcmsiLCByZXRyaWV2ZVNlbGVj dGlvbkluRWxlbWVudChbd2tWaWV3IHBhZ2VSZWZdLCAidGV4dGFyZWEyIikpOwotICAgICAgICBw ZXJmb3JtTWVudUl0ZW1BdEluZGV4T2ZUeXBlQXN5bmMoW3drVmlldyBhY3Rpb25NZW51XSwgMiwg a1dLQ29udGV4dEFjdGlvbkl0ZW1UYWdQYXN0ZSk7CisgICAgICAgIHBlcmZvcm1NZW51SXRlbUF0 SW5kZXhPZlR5cGVBc3luYyhbd2tWaWV3IF9hY3Rpb25NZW51XSwgMiwga1dLQ29udGV4dEFjdGlv bkl0ZW1UYWdQYXN0ZSk7CiAKICAgICAgICAgLy8gTm93IGNoZWNrIGFuZCBzZWUgaWYgb3VyIHBh c3RlIHN1Y2NlZWRlZCwgYW5kIHJlcGxhY2VkIHRoZSB3aG9sZSBwaHJhc2UuCiAgICAgICAgIHdh dGNoRWRpdGFibGVBcmVhRm9yU3RyaW5nKFt3a1ZpZXcgcGFnZVJlZl0sICJ0ZXh0YXJlYTIiLCAi cGFzdGVkIG92ZXIgcGhyYXNlIHNvbWUgd29yZHMiKTsKQEAgLTYzOCw3ICs2MzgsNyBAQCBURVNU KFdlYktpdDIsIERJU0FCTEVEX0FjdGlvbk1lbnVzVGVzdCkKICAgICBbd2tWaWV3IHJ1bk1lbnVT ZXF1ZW5jZUF0UG9pbnQ6d2luZG93UG9pbnRGb3JUYXJnZXQoVGFyZ2V0VHlwZTo6SW1hZ2UpIHBy ZURpZENsb3NlTWVudUhhbmRsZXI6XigpIHsKICAgICAgICAgRVhQRUNUX0VRKGtXS0FjdGlvbk1l bnVJbWFnZSwgW3drVmlldyBfYWN0aW9uTWVudVJlc3VsdF0udHlwZSk7CiAKLSAgICAgICAgcGVy Zm9ybU1lbnVJdGVtQXRJbmRleE9mVHlwZUFzeW5jKFt3a1ZpZXcgYWN0aW9uTWVudV0sIDAsIGtX S0NvbnRleHRBY3Rpb25JdGVtVGFnQ29weUltYWdlKTsKKyAgICAgICAgcGVyZm9ybU1lbnVJdGVt QXRJbmRleE9mVHlwZUFzeW5jKFt3a1ZpZXcgX2FjdGlvbk1lbnVdLCAwLCBrV0tDb250ZXh0QWN0 aW9uSXRlbVRhZ0NvcHlJbWFnZSk7CiAgICAgICAgIE5TSW1hZ2UgKmltYWdlID0gd2F0Y2hQYXN0 ZWJvYXJkRm9ySW1hZ2UoKTsKIAogICAgICAgICBFWFBFQ1RfRVEoMjE1LCBpbWFnZS5zaXplLndp ZHRoKTsKQEAgLTY1MSw3ICs2NTEsNyBAQCBURVNUKFdlYktpdDIsIERJU0FCTEVEX0FjdGlvbk1l bnVzVGVzdCkKICAgICAgICAgRVhQRUNUX0VRKGtXS0FjdGlvbk1lbnVJbWFnZSwgW3drVmlldyBf YWN0aW9uTWVudVJlc3VsdF0udHlwZSk7CiAKICAgICAgICAgZGlkRmluaXNoRG93bmxvYWQgPSBm YWxzZTsKLSAgICAgICAgcGVyZm9ybU1lbnVJdGVtQXRJbmRleE9mVHlwZUFzeW5jKFt3a1ZpZXcg YWN0aW9uTWVudV0sIDIsIGtXS0NvbnRleHRBY3Rpb25JdGVtVGFnU2F2ZUltYWdlVG9Eb3dubG9h ZHMpOworICAgICAgICBwZXJmb3JtTWVudUl0ZW1BdEluZGV4T2ZUeXBlQXN5bmMoW3drVmlldyBf YWN0aW9uTWVudV0sIDIsIGtXS0NvbnRleHRBY3Rpb25JdGVtVGFnU2F2ZUltYWdlVG9Eb3dubG9h ZHMpOwogICAgICAgICBVdGlsOjpydW4oJmRpZEZpbmlzaERvd25sb2FkKTsKICAgICB9XTsKICAg ICBhY3RpdmVEb3dubG9hZENvbnRleHQuc2hvdWxkQ2hlY2tGb3JJbWFnZSA9IGZhbHNlOwpAQCAt NjY4LDcgKzY2OCw3IEBAIFRFU1QoV2ViS2l0MiwgRElTQUJMRURfQWN0aW9uTWVudXNUZXN0KQog ICAgIFt3a1ZpZXcgcnVuTWVudVNlcXVlbmNlQXRQb2ludDp3aW5kb3dQb2ludEZvclRhcmdldChU YXJnZXRUeXBlOjpWaWRlbykgcHJlRGlkQ2xvc2VNZW51SGFuZGxlcjpeKCkgewogICAgICAgICBF WFBFQ1RfRVEoa1dLQWN0aW9uTWVudVZpZGVvLCBbd2tWaWV3IF9hY3Rpb25NZW51UmVzdWx0XS50 eXBlKTsKIAotICAgICAgICBwZXJmb3JtTWVudUl0ZW1BdEluZGV4T2ZUeXBlQXN5bmMoW3drVmll dyBhY3Rpb25NZW51XSwgMCwga1dLQ29udGV4dEFjdGlvbkl0ZW1UYWdDb3B5VmlkZW9VUkwpOwor ICAgICAgICBwZXJmb3JtTWVudUl0ZW1BdEluZGV4T2ZUeXBlQXN5bmMoW3drVmlldyBfYWN0aW9u TWVudV0sIDAsIGtXS0NvbnRleHRBY3Rpb25JdGVtVGFnQ29weVZpZGVvVVJMKTsKICAgICAgICAg TlNTdHJpbmcgKnZpZGVvVVJMID0gd2F0Y2hQYXN0ZWJvYXJkRm9yU3RyaW5nKCk7CiAgICAgICAg IEVYUEVDVF9XS19TVFJFUShAInRlc3QubXA0IiwgW3ZpZGVvVVJMIGxhc3RQYXRoQ29tcG9uZW50 XSk7CiAgICAgfV07CkBAIC02NzgsMTIgKzY3OCwxMiBAQCBURVNUKFdlYktpdDIsIERJU0FCTEVE X0FjdGlvbk1lbnVzVGVzdCkKICAgICBbd2tWaWV3IHJ1bk1lbnVTZXF1ZW5jZUF0UG9pbnQ6d2lu ZG93UG9pbnRGb3JUYXJnZXQoVGFyZ2V0VHlwZTo6TVNFVmlkZW8pIHByZURpZENsb3NlTWVudUhh bmRsZXI6XigpIHsKICAgICAgICAgRVhQRUNUX0VRKGtXS0FjdGlvbk1lbnVWaWRlbywgW3drVmll dyBfYWN0aW9uTWVudVJlc3VsdF0udHlwZSk7CiAKLSAgICAgICAgcGVyZm9ybU1lbnVJdGVtQXRJ bmRleE9mVHlwZUFzeW5jKFt3a1ZpZXcgYWN0aW9uTWVudV0sIDAsIGtXS0NvbnRleHRBY3Rpb25J dGVtVGFnQ29weVZpZGVvVVJMKTsKKyAgICAgICAgcGVyZm9ybU1lbnVJdGVtQXRJbmRleE9mVHlw ZUFzeW5jKFt3a1ZpZXcgX2FjdGlvbk1lbnVdLCAwLCBrV0tDb250ZXh0QWN0aW9uSXRlbVRhZ0Nv cHlWaWRlb1VSTCk7CiAgICAgICAgIE5TU3RyaW5nICp2aWRlb1VSTCA9IHdhdGNoUGFzdGVib2Fy ZEZvclN0cmluZygpOwogICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJhY3Rpb24tbWVudS10YXJn ZXRzLmh0bWwiLCBbdmlkZW9VUkwgbGFzdFBhdGhDb21wb25lbnRdKTsKIAogICAgICAgICAvLyBB bHNvLCB0aGUgZG93bmxvYWQgbWVudSBpdGVtIHNob3VsZCBiZSBkaXNhYmxlZCBmb3Igbm9uLWRv d25sb2FkYWJsZSB2aWRlby4KLSAgICAgICAgZW5zdXJlTWVudUl0ZW1BdEluZGV4T2ZUeXBlSXNE aXNhYmxlZChbd2tWaWV3IGFjdGlvbk1lbnVdLCAyLCBrV0tDb250ZXh0QWN0aW9uSXRlbVRhZ1Nh dmVWaWRlb1RvRG93bmxvYWRzKTsKKyAgICAgICAgZW5zdXJlTWVudUl0ZW1BdEluZGV4T2ZUeXBl SXNEaXNhYmxlZChbd2tWaWV3IF9hY3Rpb25NZW51XSwgMiwga1dLQ29udGV4dEFjdGlvbkl0ZW1U YWdTYXZlVmlkZW9Ub0Rvd25sb2Fkcyk7CiAgICAgfV07CiAKICAgICAvLyBIVFRQIGxpbmsuCkBA IC03MjEsOCArNzIxLDggQEAgVEVTVChXZWJLaXQyLCBESVNBQkxFRF9BY3Rpb25NZW51c1Rlc3Qp CiAgICAgUmV0YWluUHRyPE5TTWVudUl0ZW0+IGl0ZW0gPSBhZG9wdE5TKFtbTlNNZW51SXRlbSBh bGxvY10gaW5pdFdpdGhUaXRsZTpAIlNvbWUgQWN0aW9uIiBhY3Rpb246QHNlbGVjdG9yKGNvcHk6 KSBrZXlFcXVpdmFsZW50OkAiIl0pOwogICAgIFt3a1ZpZXcgX3NldE92ZXJyaWRlQWN0aW9uTWVu dUl0ZW1zOkBbIGl0ZW0uZ2V0KCkgXV07CiAgICAgW3drVmlldyBydW5NZW51U2VxdWVuY2VBdFBv aW50OndpbmRvd1BvaW50Rm9yVGFyZ2V0KFRhcmdldFR5cGU6OkltYWdlKSBwcmVEaWRDbG9zZU1l bnVIYW5kbGVyOl4oKSB7Ci0gICAgICAgIEVYUEVDVF9FUSgxLCBbd2tWaWV3IGFjdGlvbk1lbnVd Lm51bWJlck9mSXRlbXMpOwotICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJTb21lIEFjdGlvbiIs IFtbd2tWaWV3IGFjdGlvbk1lbnVdIGl0ZW1BdEluZGV4OjBdLnRpdGxlKTsKKyAgICAgICAgRVhQ RUNUX0VRKDEsIFt3a1ZpZXcgX2FjdGlvbk1lbnVdLm51bWJlck9mSXRlbXMpOworICAgICAgICBF WFBFQ1RfV0tfU1RSRVEoQCJTb21lIEFjdGlvbiIsIFtbd2tWaWV3IF9hY3Rpb25NZW51XSBpdGVt QXRJbmRleDowXS50aXRsZSk7CiAgICAgfV07CiAgICAgW3drVmlldyBfc2V0T3ZlcnJpZGVBY3Rp b25NZW51SXRlbXM6bmlsXTsKIApAQCAtNzM2LDcgKzczNiw3IEBAIFRFU1QoV2ViS2l0MiwgRElT QUJMRURfQWN0aW9uTWVudXNUZXN0KQogICAgIC8vIE5vIG1lbnUgc2hvdWxkIGJlIGJ1aWx0IGZv ciB3aGl0ZXNwYWNlIChleGNlcHQgaW4gZWRpdGFibGUgYXJlYXMpLgogICAgIFt3a1ZpZXcgcnVu TWVudVNlcXVlbmNlQXRQb2ludDp3aW5kb3dQb2ludEZvclRhcmdldChUYXJnZXRUeXBlOjpQYWdl V2hpdGVzcGFjZSkgcHJlRGlkQ2xvc2VNZW51SGFuZGxlcjpeKCkgewogICAgICAgICBFWFBFQ1Rf RVEoa1dLQWN0aW9uTWVudU5vbmUsIFt3a1ZpZXcgX2FjdGlvbk1lbnVSZXN1bHRdLnR5cGUpOwot ICAgICAgICBFWFBFQ1RfRVEoMCwgW3drVmlldyBhY3Rpb25NZW51XS5udW1iZXJPZkl0ZW1zKTsK KyAgICAgICAgRVhQRUNUX0VRKDAsIFt3a1ZpZXcgX2FjdGlvbk1lbnVdLm51bWJlck9mSXRlbXMp OwogICAgIH1dOwogfQogCg==