215486 2020-08-13 19:07:22 -0700 (WK2 only) Gamepad mapping stops being reported as “standard” in new tabs 2020-08-13 22:01:55 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson thorton oldest_to_newest 1680189 0 beidson 2020-08-13 19:07:22 -0700 (WK2 only) gamepad mapping stops being reported as “standard” in new tabs There was code for gamepad events to separate "full gamepaddata" and "condensed gamepaddata" for IPC efficiency that was causing this. In reality, that code was a premature optimization. The button and axis data from a standard gamepad is larger than the mapping and id data. Let's just always send all data across the pipe. <rdar://problem/66946505> 1680191 1 406564 beidson 2020-08-13 19:12:01 -0700 Created attachment 406564 Patch 1680216 2 ews-feeder 2020-08-13 22:01:55 -0700 Committed r265644: <https://trac.webkit.org/changeset/265644> All reviewed patches have been landed. Closing bug and clearing flags on attachment 406564. 406564 2020-08-13 19:12:01 -0700 2020-08-13 22:01:55 -0700 Patch bug-215486-20200813191200.patch text/plain 12161 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1NjEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJiMzU1N2UxZTBlNGVhMjlh Mjg4NWFlYmUyMDk4ZDViODU2MDZkMTYuLjdkMzQ1NjQ0Y2Y2YzY0ZDE4YzQ1NWY2Yjk5NWNlYzUw MTk3MjUwZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMjAtMDgtMTMgIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIChXSzIgb25seSkgZ2FtZXBhZCBt YXBwaW5nIHN0b3BzIGJlaW5nIHJlcG9ydGVkIGFzIOKAnHN0YW5kYXJk4oCdIGluIG5ldyB0YWJz LgorICAgICAgICByZGFyOi8vcHJvYmxlbS82Njk0NjUwNSBhbmQgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTQ4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIENvdmVyZWQgYnkgbmV3IEFQSSB0ZXN0LgorICAgICAgICAK KyAgICAgICAgR2V0IHJpZCBvZiB0aGUgcHJlbWF0dXJlIG9wdGltaXphdGlvbiB0aGF0IHdhcyAi ZnVsbCBnYW1lcGFkZGF0YSIgdnMgImNvbmRlbnNlZCBnYW1lcGFkZGF0YSIKKyAgICAgICAgCisg ICAgICAgIEluIHByYWN0aWNlLCB0aGUgYWN0dWFsIGJ1dHRvbiBhbmQgYXhpcyB2YWx1ZXMgYXJl IGxhcmdlciB0aGFuIHRoZSBtYXBwaW5nIGFuZCBpZCwgc28KKyAgICAgICAgbm90IG11Y2ggSVBD IHdhcyBiZWluZyBzYXZlZC4KKworICAgICAgICAqIFNoYXJlZC9HYW1lcGFkL0dhbWVwYWREYXRh LmNwcDoKKyAgICAgICAgKiBTaGFyZWQvR2FtZXBhZC9HYW1lcGFkRGF0YS5oOgorCisgICAgICAg ICogVUlQcm9jZXNzL0dhbWVwYWQvVUlHYW1lcGFkLmNwcDoKKyAgICAgICAgKFdlYktpdDo6VUlH YW1lcGFkOjpnYW1lcGFkRGF0YSBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OlVJR2FtZXBhZDo6 Y29uZGVuc2VkR2FtZXBhZERhdGEgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpV SUdhbWVwYWQ6OmZ1bGxHYW1lcGFkRGF0YSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogVUlQ cm9jZXNzL0dhbWVwYWQvVUlHYW1lcGFkLmg6CisKKyAgICAgICAgKiBVSVByb2Nlc3MvR2FtZXBh ZC9VSUdhbWVwYWRQcm92aWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlVJR2FtZXBhZFByb3Zp ZGVyOjpzbmFwc2hvdEdhbWVwYWRzKToKKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNz UG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpnYW1lcGFkQ29ubmVj dGVkKToKKwogMjAyMC0wOC0xMyAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+ CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNjU1MjAuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1NoYXJlZC9HYW1lcGFkL0dhbWVwYWREYXRhLmNwcCBiL1NvdXJjZS9XZWJL aXQvU2hhcmVkL0dhbWVwYWQvR2FtZXBhZERhdGEuY3BwCmluZGV4IDVlNjE5ZjRhZjIzNTczYzJi MDNkZGZjODY0MGMzNzc0YmRiYjYzMGUuLjRkYTRjMDE4MGUwNGFlMTU0YjE5OTkxNWIwZjZiMTM3 ZWUxMzE3OTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0dhbWVwYWQvR2FtZXBh ZERhdGEuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0dhbWVwYWQvR2FtZXBhZERhdGEu Y3BwCkBAIC0zNSwxNCArMzUsNiBAQCB1c2luZyBXZWJDb3JlOjpTaGFyZWRHYW1lcGFkVmFsdWU7 CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1HYW1lcGFkRGF0YTo6R2FtZXBhZERhdGEodW5zaWdu ZWQgaW5kZXgsIGNvbnN0IFZlY3RvcjxTaGFyZWRHYW1lcGFkVmFsdWU+JiBheGlzVmFsdWVzLCBj b25zdCBWZWN0b3I8U2hhcmVkR2FtZXBhZFZhbHVlPiYgYnV0dG9uVmFsdWVzLCBNb25vdG9uaWNU aW1lIGxhc3RVcGRhdGVUaW1lKQotICAgIDogbV9pbmRleChpbmRleCkKLSAgICAsIG1fYXhpc1Zh bHVlcyhXVEY6Om1hcChheGlzVmFsdWVzLCBbXShjb25zdCBhdXRvJiB2YWx1ZSkgeyByZXR1cm4g dmFsdWUudmFsdWUoKTsgfSkpCi0gICAgLCBtX2J1dHRvblZhbHVlcyhXVEY6Om1hcChidXR0b25W YWx1ZXMsIFtdKGNvbnN0IGF1dG8mIHZhbHVlKSB7IHJldHVybiB2YWx1ZS52YWx1ZSgpOyB9KSkK LSAgICAsIG1fbGFzdFVwZGF0ZVRpbWUobGFzdFVwZGF0ZVRpbWUpCi17Ci19Ci0KIEdhbWVwYWRE YXRhOjpHYW1lcGFkRGF0YSh1bnNpZ25lZCBpbmRleCwgY29uc3QgU3RyaW5nJiBpZCwgY29uc3Qg U3RyaW5nJiBtYXBwaW5nLCBjb25zdCBWZWN0b3I8U2hhcmVkR2FtZXBhZFZhbHVlPiYgYXhpc1Zh bHVlcywgY29uc3QgVmVjdG9yPFNoYXJlZEdhbWVwYWRWYWx1ZT4mIGJ1dHRvblZhbHVlcywgTW9u b3RvbmljVGltZSBsYXN0VXBkYXRlVGltZSkKICAgICA6IG1faW5kZXgoaW5kZXgpCiAgICAgLCBt X2lkKGlkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvR2FtZXBhZC9HYW1lcGFk RGF0YS5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvR2FtZXBhZC9HYW1lcGFkRGF0YS5oCmluZGV4 IGI0MmUxZTFkM2RiZTAyMDk3NTA4ZDM5ODVmNWI2MWMzMmI3MDZlNWEuLjc5OTJjMTgwYTUzMDlh YWEzYjIwNjU5MDEyNDJhMmE5ZGQyYmM0ODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hh cmVkL0dhbWVwYWQvR2FtZXBhZERhdGEuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9HYW1l cGFkL0dhbWVwYWREYXRhLmgKQEAgLTQ2LDcgKzQ2LDYgQEAgcHVibGljOgogICAgIHsKICAgICB9 CiAKLSAgICBHYW1lcGFkRGF0YSh1bnNpZ25lZCBpbmRleCwgY29uc3QgVmVjdG9yPFdlYkNvcmU6 OlNoYXJlZEdhbWVwYWRWYWx1ZT4mIGF4aXNWYWx1ZXMsIGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpT aGFyZWRHYW1lcGFkVmFsdWU+JiBidXR0b25WYWx1ZXMsIE1vbm90b25pY1RpbWUgbGFzdFVwZGF0 ZVRpbWUpOwogICAgIEdhbWVwYWREYXRhKHVuc2lnbmVkIGluZGV4LCBjb25zdCBTdHJpbmcmIGlk LCBjb25zdCBTdHJpbmcmIG1hcHBpbmcsIGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpTaGFyZWRHYW1l cGFkVmFsdWU+JiBheGlzVmFsdWVzLCBjb25zdCBWZWN0b3I8V2ViQ29yZTo6U2hhcmVkR2FtZXBh ZFZhbHVlPiYgYnV0dG9uVmFsdWVzLCBNb25vdG9uaWNUaW1lIGxhc3RVcGRhdGVUaW1lKTsKIAog ICAgIHZvaWQgZW5jb2RlKElQQzo6RW5jb2RlciYpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvR2FtZXBhZC9VSUdhbWVwYWQuY3BwIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvR2FtZXBhZC9VSUdhbWVwYWQuY3BwCmluZGV4IGJhZWU5N2E1YjgwODFiNTZlNTZh NDVkNGU1MjY3ODMxM2E4MGE3MjguLjI4ZGNiYmY0MjE3ZTUzMjNhYzkzYzhjYTBkMDhmODZkMTQ3 OGViZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0dhbWVwYWQvVUlHYW1l cGFkLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HYW1lcGFkL1VJR2FtZXBhZC5j cHAKQEAgLTU3LDEyICs1Nyw3IEBAIHZvaWQgVUlHYW1lcGFkOjp1cGRhdGVGcm9tUGxhdGZvcm1H YW1lcGFkKFdlYkNvcmU6OlBsYXRmb3JtR2FtZXBhZCYgcGxhdGZvcm1HYW1lCiAgICAgbV9sYXN0 VXBkYXRlVGltZSA9IHBsYXRmb3JtR2FtZXBhZC5sYXN0VXBkYXRlVGltZSgpOwogfQogCi1HYW1l cGFkRGF0YSBVSUdhbWVwYWQ6OmNvbmRlbnNlZEdhbWVwYWREYXRhKCkgY29uc3QKLXsKLSAgICBy ZXR1cm4geyBtX2luZGV4LCBtX2F4aXNWYWx1ZXMsIG1fYnV0dG9uVmFsdWVzLCBtX2xhc3RVcGRh dGVUaW1lIH07Ci19Ci0KLUdhbWVwYWREYXRhIFVJR2FtZXBhZDo6ZnVsbEdhbWVwYWREYXRhKCkg Y29uc3QKK0dhbWVwYWREYXRhIFVJR2FtZXBhZDo6Z2FtZXBhZERhdGEoKSBjb25zdAogewogICAg IHJldHVybiB7IG1faW5kZXgsIG1faWQsIG1fbWFwcGluZywgbV9heGlzVmFsdWVzLCBtX2J1dHRv blZhbHVlcywgbV9sYXN0VXBkYXRlVGltZSB9OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvR2FtZXBhZC9VSUdhbWVwYWQuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0dhbWVwYWQvVUlHYW1lcGFkLmgKaW5kZXggZTIyYjU0ZmMwMWM2YjU1MWU1ZTViNWExODFmZmI5 OTEwZGNlNjFhZC4uZGI2MTZiYTBlMDZjZjkzMWMxYjZhNDIwMTlmMzJjYzgwYjViMDgyNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvR2FtZXBhZC9VSUdhbWVwYWQuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9HYW1lcGFkL1VJR2FtZXBhZC5oCkBAIC00Nyw4ICs0 Nyw3IEBAIHB1YmxpYzoKIAogICAgIHVuc2lnbmVkIGluZGV4KCkgY29uc3QgeyByZXR1cm4gbV9p bmRleDsgfQogCi0gICAgR2FtZXBhZERhdGEgY29uZGVuc2VkR2FtZXBhZERhdGEoKSBjb25zdDsK LSAgICBHYW1lcGFkRGF0YSBmdWxsR2FtZXBhZERhdGEoKSBjb25zdDsKKyAgICBHYW1lcGFkRGF0 YSBnYW1lcGFkRGF0YSgpIGNvbnN0OwogCiAgICAgdm9pZCB1cGRhdGVGcm9tUGxhdGZvcm1HYW1l cGFkKFdlYkNvcmU6OlBsYXRmb3JtR2FtZXBhZCYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9HYW1lcGFkL1VJR2FtZXBhZFByb3ZpZGVyLmNwcCBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0dhbWVwYWQvVUlHYW1lcGFkUHJvdmlkZXIuY3BwCmluZGV4IDU5YTY4ZWU0 YmI4ODE3Mjg5ZjU1OWUxOGE0MTVmNTlhOTYxNTQxMDMuLmQ5OGM1Mzk1ZWUxMmM0ZjU3ODMwOTNj Nzg0MzEzNjg3MWY0MzZlMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0dh bWVwYWQvVUlHYW1lcGFkUHJvdmlkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0dhbWVwYWQvVUlHYW1lcGFkUHJvdmlkZXIuY3BwCkBAIC0xOTksNyArMTk5LDcgQEAgVmVjdG9y PEdhbWVwYWREYXRhPiBVSUdhbWVwYWRQcm92aWRlcjo6c25hcHNob3RHYW1lcGFkcygpCiAKICAg ICBmb3IgKGF1dG8mIGdhbWVwYWQgOiBtX2dhbWVwYWRzKSB7CiAgICAgICAgIGlmIChnYW1lcGFk KQotICAgICAgICAgICAgZ2FtZXBhZERhdGFzLnVuY2hlY2tlZEFwcGVuZChnYW1lcGFkLT5jb25k ZW5zZWRHYW1lcGFkRGF0YSgpKTsKKyAgICAgICAgICAgIGdhbWVwYWREYXRhcy51bmNoZWNrZWRB cHBlbmQoZ2FtZXBhZC0+Z2FtZXBhZERhdGEoKSk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAg IGdhbWVwYWREYXRhcy51bmNoZWNrZWRBcHBlbmQoeyB9KTsKICAgICB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKaW5kZXggNmQ2YjM0ZDdhZmRmNGNlNjQwNTlj MDZmZDFjODhkNTBhYzY4NmM3Ni4uNzRhMzU3Nzg2NmRjZjMwNGIyNTc1NTUyOWJkNDlmYWNiYzFl MDM3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcApAQCAt MTk4MSw3ICsxOTgxLDcgQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6cHJvY2Vzc1N0b3BwZWRVc2lu Z0dhbWVwYWRzKFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcykKIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6 OmdhbWVwYWRDb25uZWN0ZWQoY29uc3QgVUlHYW1lcGFkJiBnYW1lcGFkLCBFdmVudE1ha2VzR2Ft ZXBhZHNWaXNpYmxlIGV2ZW50VmlzaWJpbGl0eSkKIHsKICAgICBmb3IgKGF1dG8mIHByb2Nlc3Mg OiBtX3Byb2Nlc3Nlc1VzaW5nR2FtZXBhZHMpCi0gICAgICAgIHByb2Nlc3MtPnNlbmQoTWVzc2Fn ZXM6OldlYlByb2Nlc3M6OkdhbWVwYWRDb25uZWN0ZWQoZ2FtZXBhZC5mdWxsR2FtZXBhZERhdGEo KSwgZXZlbnRWaXNpYmlsaXR5KSwgMCk7CisgICAgICAgIHByb2Nlc3MtPnNlbmQoTWVzc2FnZXM6 OldlYlByb2Nlc3M6OkdhbWVwYWRDb25uZWN0ZWQoZ2FtZXBhZC5nYW1lcGFkRGF0YSgpLCBldmVu dFZpc2liaWxpdHkpLCAwKTsKIH0KIAogdm9pZCBXZWJQcm9jZXNzUG9vbDo6Z2FtZXBhZERpc2Nv bm5lY3RlZChjb25zdCBVSUdhbWVwYWQmIGdhbWVwYWQpCmRpZmYgLS1naXQgYS9Ub29scy9DaGFu Z2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZGQ4MDg4ZGNlN2E3ZDhhOWE2ZDZhNThjZjcy ZTU0NGRmMmJkODVmNS4uMzBkYzFlZWFmMTgwMDlmY2JkMTE1OTExODVhMmQ0OWMzOTdkNjIxZCAx MDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDEyIEBACisyMDIwLTA4LTEzICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4K KworICAgICAgICAoV0syIG9ubHkpIGdhbWVwYWQgbWFwcGluZyBzdG9wcyBiZWluZyByZXBvcnRl ZCBhcyDigJxzdGFuZGFyZOKAnSBpbiBuZXcgdGFicy4KKyAgICAgICAgcmRhcjovL3Byb2JsZW0v NjY5NDY1MDUgYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTU0 ODYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRl c3RXZWJLaXRBUEkvVGVzdHMvbWFjL0hJREdhbWVwYWRzLm1tOgorCiAyMDIwLTA4LTEzICBBYWth c2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBbZXdzXSB0ZXN0IG5h bWVzIGluIGV3cyBub3RpZmljYXRpb24gZW1haWwgc2hvdWxkIGJlIGluIHNvcnRlZCBvcmRlcgpk aWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvSElER2FtZXBhZHMubW0g Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9ISURHYW1lcGFkcy5tbQppbmRleCA0NmY1 NWFiYzAyOTM2MzkwNjU0MjJjNDBmYWUzYmZkNjUxYThiMzc1Li4wMTc5Y2RjYTk3NTJkODFjN2Q2 MWQ0M2Q5ZGVkYmYxNTBkYmUxNGJjIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL21hYy9ISURHYW1lcGFkcy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL21h Yy9ISURHYW1lcGFkcy5tbQpAQCAtMjA5LDYgKzIwOSw3IEBAIHZhciBnYW1lcGFkcyA9IG5hdmln YXRvci5nZXRHYW1lcGFkcygpOwogcmVzdWx0LmdhbWVwYWRDb3VudCA9IGdhbWVwYWRzLmxlbmd0 aDsKIHJlc3VsdC5nYW1lcGFkQnV0dG9ucyA9IG5ldyBBcnJheTsKIHJlc3VsdC5nYW1lcGFkQXhl cyA9IG5ldyBBcnJheTsKK3Jlc3VsdC5nYW1lcGFkTWFwcGluZyA9IG5ldyBBcnJheTsKIAogZm9y ICh2YXIgaSA9IDA7IGkgPCBnYW1lcGFkcy5sZW5ndGg7ICsraSkgewogICAgIHJlc3VsdC5nYW1l cGFkQnV0dG9uc1tpXSA9IG5ldyBBcnJheTsKQEAgLTIxOCw2ICsyMTksOCBAQCBmb3IgKHZhciBp ID0gMDsgaSA8IGdhbWVwYWRzLmxlbmd0aDsgKytpKSB7CiAgICAgcmVzdWx0LmdhbWVwYWRBeGVz W2ldID0gbmV3IEFycmF5OwogICAgIGZvciAodmFyIGogPSAwOyBqIDwgZ2FtZXBhZHNbaV0uYXhl cy5sZW5ndGg7ICsraikKICAgICAgICAgcmVzdWx0LmdhbWVwYWRBeGVzW2ldW2pdID0gZ2FtZXBh ZHNbaV0uYXhlc1tqXTsKKworICAgIHJlc3VsdC5nYW1lcGFkTWFwcGluZ1tpXSA9IGdhbWVwYWRz W2ldLm1hcHBpbmc7CiB9CiAKIHJldHVybiByZXN1bHQ7CkBAIC01MTcsNiArNTIwLDcgQEAgVEVT VChHYW1lcGFkLCBMb2dpdGVjaEJhc2ljKQogICAgIC8vIG5lZWRzIHRvIGNvbnZpbmNlIGl0IHRv IG1vbml0b3IgZ2FtZXBhZCBkZXZpY2VzCiAgICAgW1t3ZWJWaWV3IHdpbmRvd10gcmVzaWduS2V5 V2luZG93XTsKICAgICBbW3dlYlZpZXcgd2luZG93XSBtYWtlS2V5V2luZG93XTsKKyAgICBbW3dl YlZpZXcgd2luZG93XSBtYWtlRmlyc3RSZXNwb25kZXI6d2ViVmlldy5nZXQoKV07CiAKICAgICAv LyBDb25uZWN0IGEgZ2FtZXBhZCBhbmQgbWFrZSBpdCB2aXNpYmxlIHRvIHRoZSBwYWdlCiAgICAg YXV0byBnYW1lcGFkMSA9IG1ha2VVbmlxdWU8VmlydHVhbEdhbWVwYWQ+KFZpcnR1YWxHYW1lcGFk Ojpsb2dpdGVjaEYzMTBNYXBwaW5nKCkpOwpAQCAtNTY2LDYgKzU3MCw4NiBAQCBURVNUKEdhbWVw YWQsIExvZ2l0ZWNoQmFzaWMpCiAgICAgZGlkUmVjZWl2ZU1lc3NhZ2UgPSB0cnVlOwogfQogCitU RVNUKEdhbWVwYWQsIEZ1bGxJbmZvQWZ0ZXJDb25uZWN0aW9uKQoreworICAgIGF1dG8ga2V5V2lu ZG93U3dpenpsZXIgPSBtYWtlVW5pcXVlPEluc3RhbmNlTWV0aG9kU3dpenpsZXI+KFtOU0FwcGxp Y2F0aW9uIGNsYXNzXSwgQHNlbGVjdG9yKGtleVdpbmRvdyksIHJlaW50ZXJwcmV0X2Nhc3Q8SU1Q PihnZXRLZXlXaW5kb3dGb3JUZXN0aW5nKSk7CisKKyAgICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBh ZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIGF1dG8g bWVzc2FnZUhhbmRsZXIgPSBhZG9wdE5TKFtbR2FtZXBhZE1lc3NhZ2VIYW5kbGVyIGFsbG9jXSBp bml0XSk7CisgICAgW1tjb25maWd1cmF0aW9uIHVzZXJDb250ZW50Q29udHJvbGxlcl0gYWRkU2Ny aXB0TWVzc2FnZUhhbmRsZXI6bWVzc2FnZUhhbmRsZXIuZ2V0KCkgbmFtZTpAImdhbWVwYWQiXTsK KworICAgIGF1dG8gc2NoZW1lSGFuZGxlciA9IGFkb3B0TlMoW1tUZXN0VVJMU2NoZW1lSGFuZGxl ciBhbGxvY10gaW5pdF0pOworICAgIFtjb25maWd1cmF0aW9uIHNldFVSTFNjaGVtZUhhbmRsZXI6 c2NoZW1lSGFuZGxlci5nZXQoKSBmb3JVUkxTY2hlbWU6QCJnYW1lcGFkIl07CisKKyAgICBbc2No ZW1lSGFuZGxlciBzZXRTdGFydFVSTFNjaGVtZVRhc2tIYW5kbGVyOl4oV0tXZWJWaWV3ICosIGlk PFdLVVJMU2NoZW1lVGFzaz4gdGFzaykgeworICAgICAgICBhdXRvIHJlc3BvbnNlID0gYWRvcHRO UyhbW05TVVJMUmVzcG9uc2UgYWxsb2NdIGluaXRXaXRoVVJMOnRhc2sucmVxdWVzdC5VUkwgTUlN RVR5cGU6QCJ0ZXh0L2h0bWwiIGV4cGVjdGVkQ29udGVudExlbmd0aDowIHRleHRFbmNvZGluZ05h bWU6bmlsXSk7CisgICAgICAgIFt0YXNrIGRpZFJlY2VpdmVSZXNwb25zZTpyZXNwb25zZS5nZXQo KV07CisgICAgICAgIFt0YXNrIGRpZFJlY2VpdmVEYXRhOltOU0RhdGEgZGF0YVdpdGhCeXRlczpt YWluQnl0ZXMgbGVuZ3RoOnN0cmxlbihtYWluQnl0ZXMpXV07CisgICAgICAgIFt0YXNrIGRpZEZp bmlzaF07CisgICAgfV07CisKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbVGVzdFdLV2Vi VmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25m aWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICBrZXlXaW5kb3dGb3JUZXN0aW5n ID0gW3dlYlZpZXcgd2luZG93XTsKKyAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZFJlcXVl c3Q6W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImdh bWVwYWQ6Ly9ob3N0L21haW4uaHRtbCJdXV07CisKKyAgICBbW3dlYlZpZXcgd2luZG93XSBtYWtl Rmlyc3RSZXNwb25kZXI6d2ViVmlldy5nZXQoKV07CisKKyAgICAvLyBSZXNpZ25pbmcvcmVpbnN0 YXRpbmcgdGhlIGtleSB3aW5kb3cgc3RhdGUgdHJpZ2dlcnMgdGhlICJrZXkgd2luZG93IGRpZCBj aGFuZ2UiIG5vdGlmaWNhdGlvbiB0aGF0IFdLV2ViVmlldyBjdXJyZW50bHkKKyAgICAvLyBuZWVk cyB0byBjb252aW5jZSBpdCB0byBtb25pdG9yIGdhbWVwYWQgZGV2aWNlcworICAgIFtbd2ViVmll dyB3aW5kb3ddIHJlc2lnbktleVdpbmRvd107CisgICAgW1t3ZWJWaWV3IHdpbmRvd10gbWFrZUtl eVdpbmRvd107CisKKyAgICAvLyBDb25uZWN0IGEgZ2FtZXBhZCBhbmQgbWFrZSBpdCB2aXNpYmxl IHRvIHRoZSBwYWdlCisgICAgYXV0byBnYW1lcGFkMSA9IG1ha2VVbmlxdWU8VmlydHVhbEdhbWVw YWQ+KFZpcnR1YWxHYW1lcGFkOjpsb2dpdGVjaEYzMTBNYXBwaW5nKCkpOworICAgIHdoaWxlIChb d2ViVmlldy5nZXQoKS5jb25maWd1cmF0aW9uLnByb2Nlc3NQb29sIF9udW1iZXJPZkNvbm5lY3Rl ZEdhbWVwYWRzRm9yVGVzdGluZ10gIT0gMXUpCisgICAgICAgIFV0aWw6OnNsZWVwKDAuMDEpOwor CisgICAgZ2FtZXBhZDEtPnNldEJ1dHRvblZhbHVlKDAsIDEuMCk7CisgICAgZ2FtZXBhZDEtPnB1 Ymxpc2hSZXBvcnQoKTsKKworICAgIC8vIFdhaXQgdW50aWwgdGhlIHBhZ2Ugc2VlcyB0aGUgZ2Ft ZXBhZAorICAgIHdoaWxlIChtZXNzYWdlSGFuZGxlci5nZXQoKS5tZXNzYWdlcy5zaXplKCkgPCAx KSB7CisgICAgICAgIGRpZFJlY2VpdmVNZXNzYWdlID0gZmFsc2U7CisgICAgICAgIFV0aWw6OnJ1 bigmZGlkUmVjZWl2ZU1lc3NhZ2UpOworICAgIH0KKworICAgIGJvb2wgZG9uZSA9IGZhbHNlOwor ICAgIGF1dG8gcmVzdWx0QmxvY2sgPSBbJl0gKGlkIHJlc3VsdCwgTlNFcnJvciAqZXJyb3IpIHsK KyAgICAgICAgRVhQRUNUX05VTEwoZXJyb3IpOworICAgICAgICBFWFBFQ1RfVFJVRShbcmVzdWx0 W0AiZ2FtZXBhZENvdW50Il0gaXNFcXVhbFRvTnVtYmVyOkAoMSldKTsKKyAgICAgICAgRVhQRUNU X1RSVUUoW3Jlc3VsdFtAImdhbWVwYWRNYXBwaW5nIl1bMF0gaXNFcXVhbFRvU3RyaW5nOkAic3Rh bmRhcmQiXSk7CisgICAgICAgIGRvbmUgPSB0cnVlOworICAgIH07CisKKyAgICAvLyBWZXJpZnkg dGhlIGdhbWVwYWQgaGFzIHRoZSBleHBlY3RlZCBtYXBwaW5nLgorICAgIFt3ZWJWaWV3IGNhbGxB c3luY0phdmFTY3JpcHQ6QChwb2xsR2FtZXBhZFN0YXRlRnVuY3Rpb24pIGFyZ3VtZW50czpuaWwg aW5GcmFtZTpuaWwgaW5Db250ZW50V29ybGQ6V0tDb250ZW50V29ybGQucGFnZVdvcmxkIGNvbXBs ZXRpb25IYW5kbGVyOnJlc3VsdEJsb2NrXTsKKyAgICBVdGlsOjpydW4oJmRvbmUpOworICAgIGRv bmUgPSBmYWxzZTsKKworICAgIC8vIE1ha2UgYSBzZWNvbmQgd2ViIHZpZXcgdG8gbWFrZSB0aGUg c2FtZSBnYW1lcGFkIHZpc2libGUgdG8gaXQuCisgICAgYXV0byB3ZWJWaWV3MiA9IGFkb3B0TlMo W1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAw LCA2MDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIGtleVdpbmRv d0ZvclRlc3RpbmcgPSBbd2ViVmlldzIgd2luZG93XTsKKyAgICBbd2ViVmlldzIgc3luY2hyb25v dXNseUxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdp dGhTdHJpbmc6QCJnYW1lcGFkOi8vaG9zdC9tYWluLmh0bWwiXV1dOworICAgIFtbd2ViVmlldzIg d2luZG93XSBtYWtlRmlyc3RSZXNwb25kZXI6d2ViVmlldzIuZ2V0KCldOworCisgICAgLy8gVGhl IGdhbWVwYWQgaXMgYWxyZWFkeSBjb25uZWN0ZWQsIGJ1dCB0aGlzIG5ldyB3ZWIgdmlldyBjYW4n dCBzZWUgaXQuCisgICAgLy8gUHJlc3MgYnV0dG9ucyB0byBtYWtlIGl0IHZpc2libGUuCisgICAg Z2FtZXBhZDEtPnNldEJ1dHRvblZhbHVlKDEsIDEuMCk7CisgICAgZ2FtZXBhZDEtPnB1Ymxpc2hS ZXBvcnQoKTsKKworICAgIC8vIFRoZSBnYW1lcGFkIGlzIGFscmVhZHkgY29ubmVjdGVkLCBidXQg dGhpcyBuZXcgd2ViIHZpZXcgY2FuJ3Qgc2VlIGl0LgorICAgIC8vIFByZXNzIGJ1dHRvbnMgdG8g bWFrZSBpdCB2aXNpYmxlLgorICAgIHdoaWxlIChtZXNzYWdlSGFuZGxlci5nZXQoKS5tZXNzYWdl cy5zaXplKCkgPCAyKSB7CisgICAgICAgIGRpZFJlY2VpdmVNZXNzYWdlID0gZmFsc2U7CisgICAg ICAgIFV0aWw6OnJ1bigmZGlkUmVjZWl2ZU1lc3NhZ2UpOworICAgIH0KKworICAgIC8vIFZlcmlm eSB0aGUgZ2FtZXBhZCBoYXMgdGhlIGV4cGVjdGVkIG1hcHBpbmcgaW4gdGhlIHNlY29uZCB3ZWIg dmlldy4KKyAgICBbd2ViVmlldzIgY2FsbEFzeW5jSmF2YVNjcmlwdDpAKHBvbGxHYW1lcGFkU3Rh dGVGdW5jdGlvbikgYXJndW1lbnRzOm5pbCBpbkZyYW1lOm5pbCBpbkNvbnRlbnRXb3JsZDpXS0Nv bnRlbnRXb3JsZC5wYWdlV29ybGQgY29tcGxldGlvbkhhbmRsZXI6cmVzdWx0QmxvY2tdOworICAg IFV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworfQorCiAKIH0gLy8gbmFtZXNw YWNlIFRlc3RXZWJLaXRBUEkKIAo=