232794 2021-11-06 21:00:59 -0700 Implement UIScriptController.sendEventStream() on macOS for wheel events 2021-11-07 20:44:36 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=232805 InRadar P2 Normal --- 1 simon.fraser simon.fraser simon.fraser thorton webkit-bug-importer oldest_to_newest 1812455 0 simon.fraser 2021-11-06 21:00:59 -0700 Implement UIScriptController.sendEventStream() on macOS for wheel events 1812457 1 443499 simon.fraser 2021-11-06 21:09:03 -0700 Created attachment 443499 Patch 1812479 2 ews-feeder 2021-11-07 08:07:28 -0800 Committed r285390 (243947@main): <https://commits.webkit.org/243947@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 443499. 1812531 3 simon.fraser 2021-11-07 20:44:18 -0800 Followup in bug 232805. 1812532 4 webkit-bug-importer 2021-11-07 20:44:36 -0800 <rdar://problem/85138510> 443499 2021-11-06 21:09:03 -0700 2021-11-07 08:07:28 -0800 Patch bug-232794-20211106210902.patch text/plain 18552 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1Mzg4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYWJlYzhlMWRlMDBkNTc2ODc4OTYyN2Y1MGI1ODM2ZGMz OGZjYzRjYy4uM2VjNWI4YzVkOWYxMzJkOTlhNzA5NDVjMjQ2OTc1ZDUxN2ZkYThjNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDIxLTExLTA2ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgor CisgICAgICAgIEltcGxlbWVudCBVSVNjcmlwdENvbnRyb2xsZXIuc2VuZEV2ZW50U3RyZWFtKCkg b24gbWFjT1MgZm9yIHdoZWVsIGV2ZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjMyNzk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1v bWVudHVtUGhhc2VzKCkgaXMgcHJvYmxlbWF0aWMgZm9yIHRpbWluZy1zZW5zaXRpdmUKKyAgICAg ICAgc2Nyb2xsaW5nIGJlaGF2aW9ycyBiZWNhdXNlIHRoZSB0aW1lc3RhbXBzIHVzZWQgYXJlIG5v dCB1bmRlciBzY3JpcHQgY29udHJvbC4gSXQncyBhbHNvCisgICAgICAgIGEgcmF0aGVyIHVud2ll bGR5IEFQSS4KKyAgICAgICAgCisgICAgICAgIFRvIG1ha2Ugd2hlZWwgZXZlbnQgdGVzdGluZyBl YXNpZXIsIGltcGxlbWVudCBlbm91Z2ggb2YgVUlTY3JpcHRDb250cm9sbGVyLnNlbmRFdmVudFN0 cmVhbSgpCisgICAgICAgIG9uIG1hY09TIHRoYXQgaXQgY2FuIGdlbmVyYXRlIGEgc2VyaWVzIG9m IHdoZWVsIGV2ZW50cyB3aXRoIHByZWRpY2FibGUgdGltZXN0YW1wcworICAgICAgICAoY3VycmVu dGx5IGhhcmRjb2RlZCB0byBiZSAxNi42bXMgYXBhcnQpLgorCisgICAgICAgICogV2ViS2l0VGVz dFJ1bm5lci9FdmVudFNlbmRlclByb3h5Lmg6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9t YWMvRXZlbnRTZW5kZXJQcm94eS5tbToKKyAgICAgICAgKFdUUjo6Y2dTY3JvbGxQaGFzZUZyb21Q aGFzZSk6CisgICAgICAgIChXVFI6OmNnR2VzdHVyZVBoYXNlRnJvbVN0cmluZyk6CisgICAgICAg IChXVFI6OkV2ZW50U2VuZGVyUHJveHk6OnNlbmRXaGVlbEV2ZW50KToKKyAgICAgICAgKiBXZWJL aXRUZXN0UnVubmVyL21hYy9VSVNjcmlwdENvbnRyb2xsZXJNYWMuaDoKKyAgICAgICAgKiBXZWJL aXRUZXN0UnVubmVyL21hYy9VSVNjcmlwdENvbnRyb2xsZXJNYWMubW06CisgICAgICAgIChXVFI6 OmV2ZW50UGhhc2VGcm9tU3RyaW5nKToKKyAgICAgICAgKFdUUjo6VUlTY3JpcHRDb250cm9sbGVy TWFjOjpzZW5kRXZlbnRTdHJlYW0pOgorCiAyMDIxLTExLTA2ICBEYXZpZCBLaWx6ZXIgIDxkZGtp bHplckBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIGVtcHR5IGRpcmVjdG9yaWVzIGZyb20g ZnJvbSBzdm4ud2Via2l0Lm9yZyByZXBvc2l0b3J5IGFzIG9mIHIyODUzNTcKZGlmZiAtLWdpdCBh L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvRXZlbnRTZW5kZXJQcm94eS5oIGIvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9FdmVudFNlbmRlclByb3h5LmgKaW5kZXggMmM3OTVhZmZiMDU5YWFjNzk0MDZi ZWIyMjJkYjlkZjFlOWViMmE3NS4uZDM0YTg2ZDQyNmI2M2EzZDU1MmQwMmJlYmU3ZjQyZGZiMWY2 YzA1YiAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9FdmVudFNlbmRlclByb3h5 LmgKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9FdmVudFNlbmRlclByb3h5LmgKQEAgLTYw LDYgKzYwLDggQEAgcHVibGljOgogICAgIHZvaWQgbW91c2VGb3JjZUNsaWNrKCk7CiAgICAgdm9p ZCBzdGFydEFuZENhbmNlbE1vdXNlRm9yY2VDbGljaygpOwogICAgIHZvaWQgbW91c2VNb3ZlVG8o ZG91YmxlIHgsIGRvdWJsZSB5LCBXS1N0cmluZ1JlZiBwb2ludGVyVHlwZSA9IG51bGxwdHIpOwor ICAgIAorICAgIC8vIExlZ2FjeSB3aGVlbCBldmVudHMuCiAgICAgdm9pZCBtb3VzZVNjcm9sbEJ5 KGludCB4LCBpbnQgeSk7CiAgICAgdm9pZCBtb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50 dW1QaGFzZXMoaW50IHgsIGludCB5LCBpbnQgcGhhc2UsIGludCBtb21lbnR1bSk7CiAjaWYgUExB VEZPUk0oR1RLKQpAQCAtNjcsNiArNjksMjEgQEAgcHVibGljOgogI2VuZGlmCiAgICAgdm9pZCBj b250aW51b3VzTW91c2VTY3JvbGxCeShpbnQgeCwgaW50IHksIGJvb2wgcGFnZWQpOwogCisjaWYg UExBVEZPUk0oTUFDKQorICAgIGVudW0gY2xhc3MgV2hlZWxFdmVudFBoYXNlIDogdWludDhfdCB7 CisgICAgICAgIE5vbmUsCisgICAgICAgIEJlZ2FuLAorICAgICAgICBDaGFuZ2VkLAorICAgICAg ICBFbmRlZCwKKyAgICAgICAgQ2FuY2VsbGVkLAorICAgICAgICBNYXlCZWdpbiwKKyAgICB9Owor ICAgIAorICAgIHVzaW5nIEV2ZW50VGltZXN0YW1wID0gdWludDY0X3Q7IC8vIG1hY2hfYWJzb2x1 dGVfdGltZSB1bml0cy4KKworICAgIHZvaWQgc2VuZFdoZWVsRXZlbnQoRXZlbnRUaW1lc3RhbXAs IGRvdWJsZSBnbG9iYWxYLCBkb3VibGUgZ2xvYmFsWSwgZG91YmxlIGRlbHRhWCwgZG91YmxlIGRl bHRhWSwgV2hlZWxFdmVudFBoYXNlLCBXaGVlbEV2ZW50UGhhc2UgbW9tZW50dW1QaGFzZSk7Cisj ZW5kaWYKKwogICAgIHZvaWQgbGVhcEZvcndhcmQoaW50IG1pbGxpc2Vjb25kcyk7CiAKICAgICB2 b2lkIGtleURvd24oV0tTdHJpbmdSZWYga2V5LCBXS0V2ZW50TW9kaWZpZXJzLCB1bnNpZ25lZCBs b2NhdGlvbik7CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL21hYy9FdmVudFNl bmRlclByb3h5Lm1tIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9tYWMvRXZlbnRTZW5kZXJQcm94 eS5tbQppbmRleCA1ZDExZTJmZjg2YzkxM2M5MmIxYzg3NDk2MTdmMGY2OGMwNzIzYTM1Li5mN2E1 MzVkOTI4YTIwMDNiMzUyNGVjNjczZDEyZjhiMGFmMDViYjk5IDEwMDY0NAotLS0gYS9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL21hYy9FdmVudFNlbmRlclByb3h5Lm1tCisrKyBiL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvbWFjL0V2ZW50U2VuZGVyUHJveHkubW0KQEAgLTc1Myw2ICs3NTMsNzYgQEAg dm9pZCBFdmVudFNlbmRlclByb3h5Ojptb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1Q aGFzZXMoaW50IHgsIGludCB5LCBpbnQKICAgICB9CiB9CiAKKworc3RhdGljIENHU2Nyb2xsUGhh c2UgY2dTY3JvbGxQaGFzZUZyb21QaGFzZShFdmVudFNlbmRlclByb3h5OjpXaGVlbEV2ZW50UGhh c2UgcGhhc2UpCit7CisgICAgc3dpdGNoIChwaGFzZSkgeworICAgIGNhc2UgRXZlbnRTZW5kZXJQ cm94eTo6V2hlZWxFdmVudFBoYXNlOjpOb25lOgorICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8 Q0dTY3JvbGxQaGFzZT4oMCk7CisgICAgY2FzZSBFdmVudFNlbmRlclByb3h5OjpXaGVlbEV2ZW50 UGhhc2U6OkJlZ2FuOgorICAgICAgICByZXR1cm4ga0NHU2Nyb2xsUGhhc2VCZWdhbjsKKyAgICBj YXNlIEV2ZW50U2VuZGVyUHJveHk6OldoZWVsRXZlbnRQaGFzZTo6Q2hhbmdlZDoKKyAgICAgICAg cmV0dXJuIGtDR1Njcm9sbFBoYXNlQ2hhbmdlZDsKKyAgICBjYXNlIEV2ZW50U2VuZGVyUHJveHk6 OldoZWVsRXZlbnRQaGFzZTo6RW5kZWQ6CisgICAgICAgIHJldHVybiBrQ0dTY3JvbGxQaGFzZUVu ZGVkOworICAgIGNhc2UgRXZlbnRTZW5kZXJQcm94eTo6V2hlZWxFdmVudFBoYXNlOjpDYW5jZWxs ZWQ6CisgICAgICAgIHJldHVybiBrQ0dTY3JvbGxQaGFzZUNhbmNlbGxlZDsKKyAgICBjYXNlIEV2 ZW50U2VuZGVyUHJveHk6OldoZWVsRXZlbnRQaGFzZTo6TWF5QmVnaW46CisgICAgICAgIHJldHVy biBrQ0dTY3JvbGxQaGFzZU1heUJlZ2luOworICAgIH0KKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8Q0dTY3JvbGxQaGFzZT4oMCk7Cit9CisKK3N0YXRp YyBDR0dlc3R1cmVQaGFzZSBjZ0dlc3R1cmVQaGFzZUZyb21TdHJpbmcoRXZlbnRTZW5kZXJQcm94 eTo6V2hlZWxFdmVudFBoYXNlIHBoYXNlKQoreworICAgIHN3aXRjaCAocGhhc2UpIHsKKyAgICBj YXNlIEV2ZW50U2VuZGVyUHJveHk6OldoZWVsRXZlbnRQaGFzZTo6Tm9uZToKKyAgICAgICAgcmV0 dXJuIGtDR0dlc3R1cmVQaGFzZU5vbmU7CisgICAgY2FzZSBFdmVudFNlbmRlclByb3h5OjpXaGVl bEV2ZW50UGhhc2U6OkJlZ2FuOgorICAgICAgICByZXR1cm4ga0NHR2VzdHVyZVBoYXNlQmVnYW47 CisgICAgY2FzZSBFdmVudFNlbmRlclByb3h5OjpXaGVlbEV2ZW50UGhhc2U6OkNoYW5nZWQ6Cisg ICAgICAgIHJldHVybiBrQ0dHZXN0dXJlUGhhc2VDaGFuZ2VkOworICAgIGNhc2UgRXZlbnRTZW5k ZXJQcm94eTo6V2hlZWxFdmVudFBoYXNlOjpFbmRlZDoKKyAgICAgICAgcmV0dXJuIGtDR0dlc3R1 cmVQaGFzZUVuZGVkOworICAgIGNhc2UgRXZlbnRTZW5kZXJQcm94eTo6V2hlZWxFdmVudFBoYXNl OjpDYW5jZWxsZWQ6CisgICAgICAgIHJldHVybiBrQ0dHZXN0dXJlUGhhc2VDYW5jZWxsZWQ7Cisg ICAgY2FzZSBFdmVudFNlbmRlclByb3h5OjpXaGVlbEV2ZW50UGhhc2U6Ok1heUJlZ2luOgorICAg ICAgICByZXR1cm4ga0NHR2VzdHVyZVBoYXNlTWF5QmVnaW47CisgICAgfQorCisgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIGtDR0dlc3R1cmVQaGFzZU5vbmU7Cit9CisKK3Zv aWQgRXZlbnRTZW5kZXJQcm94eTo6c2VuZFdoZWVsRXZlbnQoRXZlbnRUaW1lc3RhbXAgdGltZXN0 YW1wLCBkb3VibGUgd2luZG93WCwgZG91YmxlIHdpbmRvd1ksIGRvdWJsZSBkZWx0YVgsIGRvdWJs ZSBkZWx0YVksIFdoZWVsRXZlbnRQaGFzZSBwaGFzZSwgV2hlZWxFdmVudFBoYXNlIG1vbWVudHVt UGhhc2UpCit7CisgICAgY29uc3RleHByIHVpbnQzMl90IHdoZWVsQ291bnQgPSAyOworICAgIGF1 dG8gY2dTY3JvbGxFdmVudCA9IGFkb3B0Q0YoQ0dFdmVudENyZWF0ZVNjcm9sbFdoZWVsRXZlbnQy KG51bGxwdHIsIGtDR1Njcm9sbEV2ZW50VW5pdFBpeGVsLCB3aGVlbENvdW50LCBkZWx0YVksIGRl bHRhWCwgMCkpOworICAgIENHRXZlbnRTZXRUaW1lc3RhbXAoY2dTY3JvbGxFdmVudC5nZXQoKSwg dGltZXN0YW1wKTsKKworICAgIC8vIFNldCB0aGUgQ0dFdmVudCBsb2NhdGlvbiBpbiBmbGlwcGVk IGNvb3JkcyByZWxhdGl2ZSB0byB0aGUgZmlyc3Qgc2NyZWVuLCB3aGljaAorICAgIC8vIGNvbXBl bnNhdGVzIGZvciB0aGUgYmVoYXZpb3Igb2YgK1tOU0V2ZW50IGV2ZW50V2l0aENHRXZlbnQ6XSB3 aGVuIHRoZSBldmVudCBoYXMKKyAgICAvLyBubyBhc3NvY2lhdGVkIHdpbmRvdy4gU2VlIDxyZGFy Oi8vcHJvYmxlbS8xNzE4MDU5MT4uCisgICAgQ0dQb2ludCBmbGlwcGVkV2luZG93TW91c2VQb3Np dGlvbiA9IENHUG9pbnRNYWtlKHdpbmRvd1gsIFtbW05TU2NyZWVuIHNjcmVlbnNdIG9iamVjdEF0 SW5kZXg6MF0gZnJhbWVdLnNpemUuaGVpZ2h0IC0gd2luZG93WSk7CisgICAgQ0dFdmVudFNldExv Y2F0aW9uKGNnU2Nyb2xsRXZlbnQuZ2V0KCksIGZsaXBwZWRXaW5kb3dNb3VzZVBvc2l0aW9uKTsK KworICAgIENHRXZlbnRTZXRJbnRlZ2VyVmFsdWVGaWVsZChjZ1Njcm9sbEV2ZW50LmdldCgpLCBr Q0dTY3JvbGxXaGVlbEV2ZW50SXNDb250aW51b3VzLCAxKTsKKyAgICBDR0V2ZW50U2V0SW50ZWdl clZhbHVlRmllbGQoY2dTY3JvbGxFdmVudC5nZXQoKSwga0NHU2Nyb2xsV2hlZWxFdmVudFNjcm9s bFBoYXNlLCBjZ1Njcm9sbFBoYXNlRnJvbVBoYXNlKHBoYXNlKSk7CisgICAgQ0dFdmVudFNldElu dGVnZXJWYWx1ZUZpZWxkKGNnU2Nyb2xsRXZlbnQuZ2V0KCksIGtDR1Njcm9sbFdoZWVsRXZlbnRN b21lbnR1bVBoYXNlLCBjZ0dlc3R1cmVQaGFzZUZyb21TdHJpbmcobW9tZW50dW1QaGFzZSkpOwor CisgICAgTlNFdmVudCogZXZlbnQgPSBbTlNFdmVudCBldmVudFdpdGhDR0V2ZW50OmNnU2Nyb2xs RXZlbnQuZ2V0KCldOworICAgIC8vIE91ciBldmVudCBzaG91bGQgaGF2ZSB0aGUgY29ycmVjdCBz ZXR0aW5nczoKKyAgICBpZiAoTlNWaWV3ICp0YXJnZXRWaWV3ID0gW21fdGVzdENvbnRyb2xsZXIt Pm1haW5XZWJWaWV3KCktPnBsYXRmb3JtVmlldygpIGhpdFRlc3Q6W2V2ZW50IGxvY2F0aW9uSW5X aW5kb3ddXSkgeworICAgICAgICBbTlNBcHAgX3NldEN1cnJlbnRFdmVudDpldmVudF07CisgICAg ICAgIFt0YXJnZXRWaWV3IHNjcm9sbFdoZWVsOmV2ZW50XTsKKyAgICAgICAgW05TQXBwIF9zZXRD dXJyZW50RXZlbnQ6bmlsXTsKKyAgICB9IGVsc2UgeworICAgICAgICBOU1BvaW50IHdpbmRvd0xv Y2F0aW9uID0gW2V2ZW50IGxvY2F0aW9uSW5XaW5kb3ddOworICAgICAgICBXVEZMb2dBbHdheXMo IkV2ZW50U2VuZGVyUHJveHk6OnNlbmRXaGVlbEV2ZW50IGZhaWxlZCB0byBmaW5kIHRoZSB0YXJn ZXQgdmlldyBhdCAlZiwlZlxuIiwgd2luZG93TG9jYXRpb24ueCwgd2luZG93TG9jYXRpb24ueSk7 CisgICAgfQorfQorCiAjaWYgRU5BQkxFKE1BQ19HRVNUVVJFX0VWRU5UUykKIAogdm9pZCBFdmVu dFNlbmRlclByb3h5OjpzY2FsZUdlc3R1cmVTdGFydChkb3VibGUgc2NhbGUpCmRpZmYgLS1naXQg YS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL21hYy9VSVNjcmlwdENvbnRyb2xsZXJNYWMuaCBiL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvbWFjL1VJU2NyaXB0Q29udHJvbGxlck1hYy5oCmluZGV4IDBj ODYzMTllYjMwYTBjMzk3NTIxMjJhMWI1NjdhNjllNTBiMDQ0YWQuLjIwMDQ0Nzc0ZjM4ZDlhNTVm MGQ5MjhkNTVkNjNkYjRlZDkzZmRjM2YgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvbWFjL1VJU2NyaXB0Q29udHJvbGxlck1hYy5oCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvbWFjL1VJU2NyaXB0Q29udHJvbGxlck1hYy5oCkBAIC02Myw2ICs2Myw4IEBAIHByaXZhdGU6 CiAgICAgdm9pZCBjaG9vc2VNZW51QWN0aW9uKEpTU3RyaW5nUmVmLCBKU1ZhbHVlUmVmKSBvdmVy cmlkZTsKIAogICAgIHZvaWQgYWN0aXZhdGVBdFBvaW50KGxvbmcgeCwgbG9uZyB5LCBKU1ZhbHVl UmVmIGNhbGxiYWNrKSBvdmVycmlkZTsKKyAgICAKKyAgICB2b2lkIHNlbmRFdmVudFN0cmVhbShK U1N0cmluZ1JlZiwgSlNWYWx1ZVJlZikgb3ZlcnJpZGU7CiAKICAgICBOU1RhYmxlVmlldyAqZGF0 YUxpc3RTdWdnZXN0aW9uc1RhYmxlVmlldygpIGNvbnN0OwogfTsKZGlmZiAtLWdpdCBhL1Rvb2xz L1dlYktpdFRlc3RSdW5uZXIvbWFjL1VJU2NyaXB0Q29udHJvbGxlck1hYy5tbSBiL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvbWFjL1VJU2NyaXB0Q29udHJvbGxlck1hYy5tbQppbmRleCA3MjQ1OGQ3 MjUxNjU1NGQ5MjU0NWE3Mjk2OWM1YTUzNDgxZGIyYWEwLi43YTI1NGRlODUzZmMyMjEyODdmZTQx MTg3Mzc1NjZjMmNiZWU2MzhiIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL21h Yy9VSVNjcmlwdENvbnRyb2xsZXJNYWMubW0KKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9t YWMvVUlTY3JpcHRDb250cm9sbGVyTWFjLm1tCkBAIC00NCw2ICs0NCw3IEBACiAjaW1wb3J0IDxK YXZhU2NyaXB0Q29yZS9PcGFxdWVKU1N0cmluZy5oPgogI2ltcG9ydCA8V2ViS2l0L1dLV2ViVmll d1ByaXZhdGUuaD4KICNpbXBvcnQgPFdlYktpdC9XS1dlYlZpZXdQcml2YXRlRm9yVGVzdGluZy5o PgorI2ltcG9ydCA8bWFjaC9tYWNoX3RpbWUuaD4KICNpbXBvcnQgPHd0Zi9CbG9ja1B0ci5oPgog I2ltcG9ydCA8d3RmL1dvcmtRdWV1ZS5oPgogCkBAIC0zMDcsNCArMzA4LDExMyBAQCB2b2lkIFVJ U2NyaXB0Q29udHJvbGxlck1hYzo6c2V0U3BlbGxDaGVja2VyUmVzdWx0cyhKU1ZhbHVlUmVmIHJl c3VsdHMpCiAgICAgW1tMYXlvdXRUZXN0U3BlbGxDaGVja2VyIGNoZWNrZXJdIHNldFJlc3VsdHNG cm9tSlNWYWx1ZTpyZXN1bHRzIGluQ29udGV4dDptX2NvbnRleHQtPmpzQ29udGV4dCgpXTsKIH0K IAorc3RhdGljIE5TU3RyaW5nKiBjb25zdCBUb3BMZXZlbEV2ZW50SW5mb0tleSA9IEAiZXZlbnRz IjsKK3N0YXRpYyBOU1N0cmluZyogY29uc3QgRXZlbnRUeXBlS2V5ID0gQCJ0eXBlIjsKK3N0YXRp YyBOU1N0cmluZyogY29uc3QgVmlld1JlbGF0aXZlWFBvc2l0aW9uS2V5ID0gQCJ2aWV3WCI7Citz dGF0aWMgTlNTdHJpbmcqIGNvbnN0IFZpZXdSZWxhdGl2ZVlQb3NpdGlvbktleSA9IEAidmlld1ki Oworc3RhdGljIE5TU3RyaW5nKiBjb25zdCBEZWx0YVhLZXkgPSBAImRlbHRhWCI7CitzdGF0aWMg TlNTdHJpbmcqIGNvbnN0IERlbHRhWUtleSA9IEAiZGVsdGFZIjsKK3N0YXRpYyBOU1N0cmluZyog Y29uc3QgUGhhc2VLZXkgPSBAInBoYXNlIjsKK3N0YXRpYyBOU1N0cmluZyogY29uc3QgTW9tZW50 dW1QaGFzZUtleSA9IEAibW9tZW50dW1QaGFzZSI7CisKK3N0YXRpYyBFdmVudFNlbmRlclByb3h5 OjpXaGVlbEV2ZW50UGhhc2UgZXZlbnRQaGFzZUZyb21TdHJpbmcoTlNTdHJpbmcgKnBoYXNlU3Ry KQoreworICAgIGlmIChbcGhhc2VTdHIgaXNFcXVhbFRvU3RyaW5nOkAiYmVnYW4iXSkKKyAgICAg ICAgcmV0dXJuIEV2ZW50U2VuZGVyUHJveHk6OldoZWVsRXZlbnRQaGFzZTo6QmVnYW47CisgICAg aWYgKFtwaGFzZVN0ciBpc0VxdWFsVG9TdHJpbmc6QCJjaGFuZ2VkIl0pCisgICAgICAgIHJldHVy biBFdmVudFNlbmRlclByb3h5OjpXaGVlbEV2ZW50UGhhc2U6OkNoYW5nZWQ7CisgICAgaWYgKFtw aGFzZVN0ciBpc0VxdWFsVG9TdHJpbmc6QCJlbmRlZCJdKQorICAgICAgICByZXR1cm4gRXZlbnRT ZW5kZXJQcm94eTo6V2hlZWxFdmVudFBoYXNlOjpFbmRlZDsKKyAgICBpZiAoW3BoYXNlU3RyIGlz RXF1YWxUb1N0cmluZzpAImNhbmNlbGxlZCJdKQorICAgICAgICByZXR1cm4gRXZlbnRTZW5kZXJQ cm94eTo6V2hlZWxFdmVudFBoYXNlOjpDYW5jZWxsZWQ7CisgICAgaWYgKFtwaGFzZVN0ciBpc0Vx dWFsVG9TdHJpbmc6QCJtYXliZWdpbiJdKQorICAgICAgICByZXR1cm4gRXZlbnRTZW5kZXJQcm94 eTo6V2hlZWxFdmVudFBoYXNlOjpNYXlCZWdpbjsKKworICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgp OworICAgIHJldHVybiBFdmVudFNlbmRlclByb3h5OjpXaGVlbEV2ZW50UGhhc2U6Ok5vbmU7Cit9 CisKK3ZvaWQgVUlTY3JpcHRDb250cm9sbGVyTWFjOjpzZW5kRXZlbnRTdHJlYW0oSlNTdHJpbmdS ZWYgZXZlbnRzSlNPTiwgSlNWYWx1ZVJlZiBjYWxsYmFjaykKK3sKKyAgICBhdXRvKiBldmVudFNl bmRlciA9IFRlc3RDb250cm9sbGVyOjpzaW5nbGV0b24oKS5ldmVudFNlbmRlclByb3h5KCk7Cisg ICAgaWYgKCFldmVudFNlbmRlcikgeworICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAg ICAgICAgcmV0dXJuOworICAgIH0KKworICAgIHVuc2lnbmVkIGNhbGxiYWNrSUQgPSBtX2NvbnRl eHQtPnByZXBhcmVGb3JBc3luY1Rhc2soY2FsbGJhY2ssIENhbGxiYWNrVHlwZU5vblBlcnNpc3Rl bnQpOworCisgICAgYXV0byBqc29uU3RyaW5nID0gZXZlbnRzSlNPTi0+c3RyaW5nKCk7CisgICAg YXV0byBldmVudEluZm8gPSBkeW5hbWljX29iamNfY2FzdDxOU0RpY3Rpb25hcnk+KFtOU0pTT05T ZXJpYWxpemF0aW9uIEpTT05PYmplY3RXaXRoRGF0YTpbKE5TU3RyaW5nICopanNvblN0cmluZyBk YXRhVXNpbmdFbmNvZGluZzpOU1VURjhTdHJpbmdFbmNvZGluZ10gb3B0aW9uczpOU0pTT05SZWFk aW5nTXV0YWJsZUNvbnRhaW5lcnMgfCBOU0pTT05SZWFkaW5nTXV0YWJsZUxlYXZlcyBlcnJvcjpu aWxdKTsKKyAgICBpZiAoIWV2ZW50SW5mbyB8fCAhW2V2ZW50SW5mbyBpc0tpbmRPZkNsYXNzOltO U0RpY3Rpb25hcnkgY2xhc3NdXSkgeworICAgICAgICBXVEZMb2dBbHdheXMoIkpTT04gaXMgbm90 IGNvbnZlcnRpYmxlIHRvIGEgZGljdGlvbmFyeSIpOworICAgICAgICByZXR1cm47CisgICAgfQor CisgICAgYXV0byAqd2ViVmlldyA9IHRoaXMtPndlYlZpZXcoKTsKKworICAgIGRvdWJsZSBjdXJy ZW50Vmlld1JlbGF0aXZlWCA9IDA7CisgICAgZG91YmxlIGN1cnJlbnRWaWV3UmVsYXRpdmVZID0g MDsKKworICAgIGNvbnN0ZXhwciB1aW50NjRfdCBuYW5vc2Vjb25kc1BlclNlY29uZCA9IDFlOTsK KyAgICBjb25zdGV4cHIgdWludDY0X3QgbmFub3NlY29uZHNFdmVudEludGVydmFsID0gbmFub3Nl Y29uZHNQZXJTZWNvbmQgLyA2MDsKKworICAgIGF1dG8gY3VycmVudFRpbWUgPSBtYWNoX2Fic29s dXRlX3RpbWUoKTsKKworICAgIGZvciAoTlNNdXRhYmxlRGljdGlvbmFyeSAqZXZlbnQgaW4gZXZl bnRJbmZvW1RvcExldmVsRXZlbnRJbmZvS2V5XSkgeworCisgICAgICAgIGlkIGV2ZW50VHlwZSA9 IGV2ZW50W0V2ZW50VHlwZUtleV07CisgICAgICAgIGlmICghZXZlbnRbRXZlbnRUeXBlS2V5XSkg eworICAgICAgICAgICAgV1RGTG9nQWx3YXlzKCJNaXNzaW5nIGV2ZW50IHR5cGUiKTsKKyAgICAg ICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICBpZiAoW2V2ZW50VHlw ZSBpc0VxdWFsVG9TdHJpbmc6QCJ3aGVlbCJdKSB7CisgICAgICAgICAgICBhdXRvIHBoYXNlID0g RXZlbnRTZW5kZXJQcm94eTo6V2hlZWxFdmVudFBoYXNlOjpOb25lOworICAgICAgICAgICAgYXV0 byBtb21lbnR1bVBoYXNlID0gRXZlbnRTZW5kZXJQcm94eTo6V2hlZWxFdmVudFBoYXNlOjpOb25l OworCisgICAgICAgICAgICBpZiAoIWV2ZW50W1BoYXNlS2V5XSAmJiAhZXZlbnRbTW9tZW50dW1Q aGFzZUtleV0pIHsKKyAgICAgICAgICAgICAgICBXVEZMb2dBbHdheXMoIkV2ZW50IG11c3Qgc3Bl Y2lmeSBwaGFzZSBvciBtb21lbnR1bVBoYXNlIik7CisgICAgICAgICAgICAgICAgYnJlYWs7Cisg ICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGlmIChpZCBwaGFzZVN0cmluZyA9IGV2ZW50W1Bo YXNlS2V5XSkKKyAgICAgICAgICAgICAgICBwaGFzZSA9IGV2ZW50UGhhc2VGcm9tU3RyaW5nKHBo YXNlU3RyaW5nKTsKKworICAgICAgICAgICAgaWYgKGlkIHBoYXNlU3RyaW5nID0gZXZlbnRbTW9t ZW50dW1QaGFzZUtleV0pCisgICAgICAgICAgICAgICAgbW9tZW50dW1QaGFzZSA9IGV2ZW50UGhh c2VGcm9tU3RyaW5nKHBoYXNlU3RyaW5nKTsKKworICAgICAgICAgICAgQVNTRVJUX0lNUExJRVMo cGhhc2UgPT0gRXZlbnRTZW5kZXJQcm94eTo6V2hlZWxFdmVudFBoYXNlOjpOb25lLCBtb21lbnR1 bVBoYXNlICE9IEV2ZW50U2VuZGVyUHJveHk6OldoZWVsRXZlbnRQaGFzZTo6Tm9uZSk7CisgICAg ICAgICAgICBBU1NFUlRfSU1QTElFUyhtb21lbnR1bVBoYXNlID09IEV2ZW50U2VuZGVyUHJveHk6 OldoZWVsRXZlbnRQaGFzZTo6Tm9uZSwgcGhhc2UgIT0gRXZlbnRTZW5kZXJQcm94eTo6V2hlZWxF dmVudFBoYXNlOjpOb25lKTsKKworICAgICAgICAgICAgaWYgKGV2ZW50W1ZpZXdSZWxhdGl2ZVhQ b3NpdGlvbktleV0pCisgICAgICAgICAgICAgICAgY3VycmVudFZpZXdSZWxhdGl2ZVggPSBbZXZl bnRbVmlld1JlbGF0aXZlWFBvc2l0aW9uS2V5XSBmbG9hdFZhbHVlXTsKKworICAgICAgICAgICAg aWYgKGV2ZW50W1ZpZXdSZWxhdGl2ZVlQb3NpdGlvbktleV0pCisgICAgICAgICAgICAgICAgY3Vy cmVudFZpZXdSZWxhdGl2ZVkgPSBbZXZlbnRbVmlld1JlbGF0aXZlWVBvc2l0aW9uS2V5XSBmbG9h dFZhbHVlXTsKKworICAgICAgICAgICAgZG91YmxlIGRlbHRhWCA9IDA7CisgICAgICAgICAgICBk b3VibGUgZGVsdGFZID0gMDsKKworICAgICAgICAgICAgaWYgKGV2ZW50W0RlbHRhWEtleV0pCisg ICAgICAgICAgICAgICAgZGVsdGFYID0gW2V2ZW50W0RlbHRhWEtleV0gZmxvYXRWYWx1ZV07CisK KyAgICAgICAgICAgIGlmIChldmVudFtEZWx0YVlLZXldKQorICAgICAgICAgICAgICAgIGRlbHRh WSA9IFtldmVudFtEZWx0YVlLZXldIGZsb2F0VmFsdWVdOworCisgICAgICAgICAgICBhdXRvIHdp bmRvd1BvaW50ID0gW3dlYlZpZXcgY29udmVydFBvaW50OkNHUG9pbnRNYWtlKGN1cnJlbnRWaWV3 UmVsYXRpdmVYLCBjdXJyZW50Vmlld1JlbGF0aXZlWSkgdG9WaWV3Om5pbF07CisgICAgICAgICAg ICBldmVudFNlbmRlci0+c2VuZFdoZWVsRXZlbnQoY3VycmVudFRpbWUsIHdpbmRvd1BvaW50Lngs IHdpbmRvd1BvaW50LnksIGRlbHRhWCwgZGVsdGFZLCBwaGFzZSwgbW9tZW50dW1QaGFzZSk7Cisg ICAgICAgIH0KKworICAgICAgICBjdXJyZW50VGltZSArPSBuYW5vc2Vjb25kc0V2ZW50SW50ZXJ2 YWw7CisgICAgfQorCisgICAgV29ya1F1ZXVlOjptYWluKCkuZGlzcGF0Y2goW3RoaXMsIHN0cm9u Z1RoaXMgPSBSZWYgeyAqdGhpcyB9LCBjYWxsYmFja0lEXSB7CisgICAgICAgIGlmICghbV9jb250 ZXh0KQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBtX2NvbnRleHQtPmFzeW5jVGFza0Nv bXBsZXRlKGNhbGxiYWNrSUQpOworICAgIH0pOworfQorCisKIH0gLy8gbmFtZXNwYWNlIFdUUgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CmluZGV4IGE4YTMzZmVkMTIyN2NkYzZjNDU0ODNiODkxMjliNWNlY2JiYWEzZWEuLmYyMTRhMGI2 YTJmNzFlMGViYjVhNjhkZGEzOTczNTM0OTkzZThiY2EgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAor MjAyMS0xMS0wNiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAg ICAgICBJbXBsZW1lbnQgVUlTY3JpcHRDb250cm9sbGVyLnNlbmRFdmVudFN0cmVhbSgpIG9uIG1h Y09TIGZvciB3aGVlbCBldmVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzMjc5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1 bVBoYXNlcygpIGlzIHByb2JsZW1hdGljIGZvciB0aW1pbmctc2Vuc2l0aXZlCisgICAgICAgIHNj cm9sbGluZyBiZWhhdmlvcnMgYmVjYXVzZSB0aGUgdGltZXN0YW1wcyB1c2VkIGFyZSBub3QgdW5k ZXIgc2NyaXB0IGNvbnRyb2wuIEl0J3MgYWxzbworICAgICAgICBhIHJhdGhlciB1bndpZWxkeSBB UEkuCisgICAgICAgIAorICAgICAgICBUbyBtYWtlIHdoZWVsIGV2ZW50IHRlc3RpbmcgZWFzaWVy LCBpbXBsZW1lbnQgZW5vdWdoIG9mIFVJU2NyaXB0Q29udHJvbGxlci5zZW5kRXZlbnRTdHJlYW0o KQorICAgICAgICBvbiBtYWNPUyB0aGF0IGl0IGNhbiBnZW5lcmF0ZSBhIHNlcmllcyBvZiB3aGVl bCBldmVudHMgd2l0aCBwcmVkaWNhYmxlIHRpbWVzdGFtcHMKKyAgICAgICAgKGN1cnJlbnRseSBo YXJkY29kZWQgdG8gYmUgMTYuNm1zIGFwYXJ0KS4KKworICAgICAgICAqIGZhc3Qvc2Nyb2xsaW5n L21hYy9tb21lbnR1bS1ldmVudC1zZXF1ZW5jZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAg ICAqIGZhc3Qvc2Nyb2xsaW5nL21hYy9tb21lbnR1bS1ldmVudC1zZXF1ZW5jZS5odG1sOiBBZGRl ZC4KKyAgICAgICAgKiByZXNvdXJjZXMvdWktaGVscGVyLmpzOgorICAgICAgICAod2luZG93LlVJ SGVscGVyLmFzeW5jIG1vdXNlV2hlZWxTZXF1ZW5jZS5hd2FpdC5uZXcuUHJvbWlzZSk6CisgICAg ICAgICh3aW5kb3cuVUlIZWxwZXIuYXN5bmMgbW91c2VXaGVlbFNlcXVlbmNlKToKKwogMjAyMS0x MS0wNiAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92 ZSBlbXB0eSBkaXJlY3RvcmllcyBmcm9tIGZyb20gc3ZuLndlYmtpdC5vcmcgcmVwb3NpdG9yeSBh cyBvZiByMjg1MzU3CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9tYWMv bW9tZW50dW0tZXZlbnQtc2VxdWVuY2UtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9z Y3JvbGxpbmcvbWFjL21vbWVudHVtLWV2ZW50LXNlcXVlbmNlLWV4cGVjdGVkLnR4dApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi45N2QwMzM4OGZmNDA1NDZmZWY1NWMwYTM1YWFiZTZmODMxOTgyMTcyCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvbWFjL21vbWVudHVtLWV2ZW50LXNl cXVlbmNlLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDUgQEAKK1BBU1Mgd2luZG93LnNjcm9sbFkg aXMgNDYKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQor CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9tYWMvbW9tZW50dW0tZXZl bnQtc2VxdWVuY2UuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL21hYy9tb21lbnR1 bS1ldmVudC1zZXF1ZW5jZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjdkMjg1YTYzNDFiNDBmNjc3ZjAzZWYz OTcxMWQ2MDljMzkxN2M3OWUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3Nj cm9sbGluZy9tYWMvbW9tZW50dW0tZXZlbnQtc2VxdWVuY2UuaHRtbApAQCAtMCwwICsxLDg4IEBA Cis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+CisgICAgPHN0eWxlPgorICAgICAgICBi b2R5IHsKKyAgICAgICAgICAgIGhlaWdodDogMjAwMHB4OworICAgICAgICAgICAgd2lkdGg6IDIw MCU7CisgICAgICAgIH0KKyAgICA8L3N0eWxlPgorICAgIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9y ZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSIuLi8u Li8uLi9yZXNvdXJjZXMvdWktaGVscGVyLmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0PgorICAg ICAgICB2YXIganNUZXN0SXNBc3luYyA9IHRydWU7CisgICAgICAgIAorICAgICAgICBhc3luYyBm dW5jdGlvbiB0ZXN0RXZlbnRTZXF1ZW5jZSgpCisgICAgICAgIHsKKyAgICAgICAgICAgIGNvbnN0 IHdoZWVsRXZlbnRTcXVlbmNlID0geworICAgICAgICAgICAgICAgICJldmVudHMiIDogWworICAg ICAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgICAgICAidHlwZSIgOiAid2hl ZWwiLAorICAgICAgICAgICAgICAgICAgICAgICAgInZpZXdYIiA6IDEwMCwKKyAgICAgICAgICAg ICAgICAgICAgICAgICJ2aWV3WSIgOiAxMDAsCisgICAgICAgICAgICAgICAgICAgICAgICAiZGVs dGFYIiA6IDAsCisgICAgICAgICAgICAgICAgICAgICAgICAiZGVsdGFZIiA6IC0xMCwgLy8gTm90 ZSB0aGF0IHRoaXMgZGVsdGEgaXMgY3VycmVudGx5IGlnbm9yZWQuCisgICAgICAgICAgICAgICAg ICAgICAgICAicGhhc2UiIDogImJlZ2FuIgorICAgICAgICAgICAgICAgICAgICB9LAorICAgICAg ICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgICAgICAidHlwZSIgOiAid2hlZWwi LAorICAgICAgICAgICAgICAgICAgICAgICAgImRlbHRhWCIgOiAwLAorICAgICAgICAgICAgICAg ICAgICAgICAgImRlbHRhWSIgOiAtMTAsCisgICAgICAgICAgICAgICAgICAgICAgICAicGhhc2Ui IDogImNoYW5nZWQiCisgICAgICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgICAg IHsKKyAgICAgICAgICAgICAgICAgICAgICAgICJ0eXBlIiA6ICJ3aGVlbCIsCisgICAgICAgICAg ICAgICAgICAgICAgICAiZGVsdGFYIiA6IDAsCisgICAgICAgICAgICAgICAgICAgICAgICAiZGVs dGFZIiA6IC04LAorICAgICAgICAgICAgICAgICAgICAgICAgInBoYXNlIiA6ICJjaGFuZ2VkIgor ICAgICAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgICAgICB7CisgICAgICAgICAg ICAgICAgICAgICAgICAidHlwZSIgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAgICAgICAg ImRlbHRhWCIgOiAwLAorICAgICAgICAgICAgICAgICAgICAgICAgImRlbHRhWSIgOiAwLAorICAg ICAgICAgICAgICAgICAgICAgICAgInBoYXNlIiA6ICJlbmRlZCIKKyAgICAgICAgICAgICAgICAg ICAgfSwKKyAgICAgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICAgICAgInR5 cGUiIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICJkZWx0YVgiIDogMCwKKyAg ICAgICAgICAgICAgICAgICAgICAgICJkZWx0YVkiIDogLTEwLAorICAgICAgICAgICAgICAgICAg ICAgICAgIm1vbWVudHVtUGhhc2UiIDogImJlZ2FuIgorICAgICAgICAgICAgICAgICAgICB9LAor ICAgICAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgICAgICAidHlwZSIgOiAi d2hlZWwiLAorICAgICAgICAgICAgICAgICAgICAgICAgImRlbHRhWCIgOiAwLAorICAgICAgICAg ICAgICAgICAgICAgICAgImRlbHRhWSIgOiAtMTIsCisgICAgICAgICAgICAgICAgICAgICAgICAi bW9tZW50dW1QaGFzZSIgOiAiY2hhbmdlZCIKKyAgICAgICAgICAgICAgICAgICAgfSwKKyAgICAg ICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICAgICAgInR5cGUiIDogIndoZWVs IiwKKyAgICAgICAgICAgICAgICAgICAgICAgICJkZWx0YVgiIDogMCwKKyAgICAgICAgICAgICAg ICAgICAgICAgICJkZWx0YVkiIDogLTYsCisgICAgICAgICAgICAgICAgICAgICAgICAibW9tZW50 dW1QaGFzZSIgOiAiY2hhbmdlZCIKKyAgICAgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAg ICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICAgICAgInR5cGUiIDogIndoZWVsIiwKKyAg ICAgICAgICAgICAgICAgICAgICAgICJtb21lbnR1bVBoYXNlIiA6ICJlbmRlZCIKKyAgICAgICAg ICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIF0KKyAgICAgICAgICAgIH07CisKKyAgICAg ICAgICAgIGF3YWl0IFVJSGVscGVyLm1vdXNlV2hlZWxTZXF1ZW5jZSh3aGVlbEV2ZW50U3F1ZW5j ZSk7CisgICAgICAgICAgICBzaG91bGRCZSgnd2luZG93LnNjcm9sbFknLCAnNDYnKTsKKyAgICAg ICAgfQorCisgICAgICAgIGFzeW5jIGZ1bmN0aW9uIHNjcm9sbFRlc3QoKQorICAgICAgICB7Cisg ICAgICAgICAgICBhd2FpdCB0ZXN0RXZlbnRTZXF1ZW5jZSgpOworICAgICAgICAgICAgZmluaXNo SlNUZXN0KCk7CisgICAgICAgIH0KKworICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcign bG9hZCcsICgpID0+IHsKKyAgICAgICAgICAgIHNldFRpbWVvdXQoc2Nyb2xsVGVzdCwgMCk7Cisg ICAgICAgIH0sIGZhbHNlKTsKKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorICAgIDxz Y3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4K KzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3Jlc291cmNlcy91aS1o ZWxwZXIuanMgYi9MYXlvdXRUZXN0cy9yZXNvdXJjZXMvdWktaGVscGVyLmpzCmluZGV4IDBkZTc3 ODkwNjMzZjEzOGQ4YzhmZGUxMDA4YmQyM2Q0NTBmMWM1NzcuLjg2NDc5ZmViMDY1MWJmZTY3MjYz N2U1ZDQ5ODkxZmRkMDE3YTY3OGMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3Jlc291cmNlcy91 aS1oZWxwZXIuanMKKysrIGIvTGF5b3V0VGVzdHMvcmVzb3VyY2VzL3VpLWhlbHBlci5qcwpAQCAt MTA4LDYgKzEwOCwyOCBAQCB3aW5kb3cuVUlIZWxwZXIgPSBjbGFzcyBVSUhlbHBlciB7CiAgICAg ICAgIGF3YWl0IFVJSGVscGVyLmFuaW1hdGlvbkZyYW1lKCk7CiAgICAgfQogCisgICAgc3RhdGlj IGFzeW5jIG1vdXNlV2hlZWxTZXF1ZW5jZShldmVudFN0cmVhbSkKKyAgICB7CisgICAgICAgIGlm ICghdGhpcy5pc1dlYktpdDIoKSkgeworICAgICAgICAgICAgY29uc29sZS5sb2coJ1VJSGVscGVy Lm1vdXNlV2hlZWxTZXF1ZW5jZSgpIGRvZXMgbm90IHdvcmsgaW4gRHVtcFJlbmRlclRyZWUnKQor ICAgICAgICAgICAgcmV0dXJuIFByb21pc2UucmVzb2x2ZSgpOworICAgICAgICB9CisKKyAgICAg ICAgZXZlbnRTZW5kZXIubW9uaXRvcldoZWVsRXZlbnRzKCk7CisgICAgICAgIGNvbnN0IGV2ZW50 U3RyZWFtQXNTdHJpbmcgPSBKU09OLnN0cmluZ2lmeShldmVudFN0cmVhbSk7CisgICAgICAgIGF3 YWl0IG5ldyBQcm9taXNlKHJlc29sdmUgPT4geworICAgICAgICAgICAgdGVzdFJ1bm5lci5ydW5V SVNjcmlwdChgCisgICAgICAgICAgICAgICAgKGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAg ICAgICB1aUNvbnRyb2xsZXIuc2VuZEV2ZW50U3RyZWFtKFxgJHtldmVudFN0cmVhbUFzU3RyaW5n fVxgLCAoKSA9PiB7CisgICAgICAgICAgICAgICAgICAgICAgICB1aUNvbnRyb2xsZXIudWlTY3Jp cHRDb21wbGV0ZSgpOworICAgICAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgICAgICB9 KSgpOworICAgICAgICAgICAgYCwgcmVzb2x2ZSk7CisgICAgICAgIH0pOworCisgICAgICAgIGF3 YWl0IFVJSGVscGVyLndhaXRGb3JTY3JvbGxDb21wbGV0aW9uKCk7CisgICAgfQorCiAgICAgc3Rh dGljIGFzeW5jIHdhaXRGb3JTY3JvbGxDb21wbGV0aW9uKCkKICAgICB7CiAgICAgICAgIHJldHVy biBuZXcgUHJvbWlzZShyZXNvbHZlID0+IHsK