234495 2021-12-19 16:20:27 -0800 Remove macOS-specific code from ScrollAnimator::handleWheelEvent() 2021-12-20 19:59:00 -0800 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED DUPLICATE 231238 P2 Normal --- 1 simon.fraser simon.fraser cdumez changseok esprehn+autocc ews-watchlist glenn kondapallykalyan mifenton pdr simon.fraser oldest_to_newest 1825500 0 simon.fraser 2021-12-19 16:20:27 -0800 Remove macOS-specific code from ScrollAnimator::handleWheelEvent() 1825501 1 447566 simon.fraser 2021-12-19 16:20:46 -0800 Created attachment 447566 Patch for EWS 1825851 2 simon.fraser 2021-12-20 19:59:00 -0800 *** This bug has been marked as a duplicate of bug 231238 *** 447566 2021-12-19 16:20:46 -0800 2021-12-19 18:07:18 -0800 Patch for EWS bug-234495-20211219162045.patch text/plain 9333 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MjQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTA0OWQ0ZWFjZDY1ZjA2 ZTllZTk5Y2Y3MTY2MWQzYzVmODU4NTEyNC4uMzJjYTY1YTcxZDE0YjMxZGE5NzE0NTI3ZWNlYjVj ZGIyNjliYzkyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTEyLTE5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBtYWNP Uy1zcGVjaWZpYyBjb2RlIGZyb20gU2Nyb2xsQW5pbWF0b3I6OmhhbmRsZVdoZWVsRXZlbnQoKQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0NDk1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgd3JpdGUgbWUu Li4KKworICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlNjcm9sbEFuaW1hdG9yOjpoYW5kbGVXaGVlbEV2ZW50KToKKyAgICAgICAgKFdlYkNv cmU6OlNjcm9sbEFuaW1hdG9yOjpoYW5kbGVTdGVwcGVkU2Nyb2xsaW5nKToKKyAgICAgICAgKiBw bGF0Zm9ybS9TY3JvbGxBbmltYXRvci5oOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbGFibGVB cmVhLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxhYmxlQXJlYTo6aGFzU3RlcHBlZFNjcm9s bGluZyBjb25zdCk6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLmg6 CisgICAgICAgICogcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tOgorICAgICAgICAo V2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3JNYWM6OmhhbmRsZVdoZWVsRXZlbnQpOgorICAgICAgICAo V2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3JNYWM6OnNob3VsZEZvcndhcmRXaGVlbEV2ZW50c1RvUGFy ZW50IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5o OgorCiAyMDIxLTEyLTE5ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgog CiAgICAgICAgIFJlbW92ZSBFdmVudEhhbmRsZXI6OnNjcm9sbERpc3RhbmNlKCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmNwcAppbmRleCBkYjliM2FmYjFmYWUwYmZm NWJmOWExZWQxNTJiNDIyYTRhZmRjOTg0Li5kMTMyYWJhZmMwODk2NTU1OTM2NzFiZDZlNjFlMDkw MzFkNWEyNGUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmlt YXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3IuY3Bw CkBAIC0xNTgsOSArMTU4LDkgQEAgdm9pZCBTY3JvbGxBbmltYXRvcjo6cmVzbmFwQWZ0ZXJMYXlv dXQoKQogICAgIG1fc2Nyb2xsQ29udHJvbGxlci5yZXNuYXBBZnRlckxheW91dCgpOwogfQogCi1i b29sIFNjcm9sbEFuaW1hdG9yOjpoYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxF dmVudCYgZSkKK2Jvb2wgU2Nyb2xsQW5pbWF0b3I6OmhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxh dGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZW50KQogewotICAgIGlmIChwcm9jZXNzV2hlZWxFdmVu dEZvclNjcm9sbFNuYXAoZSkpCisgICAgaWYgKHByb2Nlc3NXaGVlbEV2ZW50Rm9yU2Nyb2xsU25h cCh3aGVlbEV2ZW50KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAjaWYgUExBVEZPUk0oQ09D T0EpCkBAIC0xNjksMTkgKzE2OSwyMiBAQCBib29sIFNjcm9sbEFuaW1hdG9yOjpoYW5kbGVXaGVl bEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgZSkKICAgICAvLwogICAgIC8vIFdlIHJl Y2VpdmUgYXQgbGVhc3Qgb25lIFBsYXRmb3JtV2hlZWxFdmVudFBoYXNlOjpNYXlCZWdpbiB3aGVu IHN0YXJ0aW5nIG1haW4tdGhyZWFkIHNjcm9sbGluZyAoc2VlIEZyYW1lVmlldzo6d2hlZWxFdmVu dCksIHdoaWNoIGNhbgogICAgIC8vIGZvb2wgdGhlIHNjcm9sbGluZyB0aHJlYWQgaW50byBhdHRl bXB0aW5nIHRvIGhhbmRsZSB0aGUgc2Nyb2xsLCB1bmxlc3Mgd2UgdHJlYXQgdGhlIGV2ZW50IGFz IGhhbmRsZWQgaGVyZS4KLSAgICBpZiAoZS5waGFzZSgpID09IFBsYXRmb3JtV2hlZWxFdmVudFBo YXNlOjpNYXlCZWdpbikKKyAgICBpZiAod2hlZWxFdmVudC5waGFzZSgpID09IFBsYXRmb3JtV2hl ZWxFdmVudFBoYXNlOjpNYXlCZWdpbikKICAgICAgICAgcmV0dXJuIHRydWU7CiAjZW5kaWYKIAot I2lmIFBMQVRGT1JNKE1BQykKLSAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGJlIGFibGUgdG8gcmVt b3ZlIHRoaXMgY29kZSwgYnV0IE1hYydzIGhhbmRsZVdoZWVsRXZlbnQgcmVsaWVzIG9uIHRoaXMg c29tZWhvdy4KLSAgICBTY3JvbGxiYXIqIGhvcml6b250YWxTY3JvbGxiYXIgPSBtX3Njcm9sbGFi bGVBcmVhLmhvcml6b250YWxTY3JvbGxiYXIoKTsKLSAgICBTY3JvbGxiYXIqIHZlcnRpY2FsU2Ny b2xsYmFyID0gbV9zY3JvbGxhYmxlQXJlYS52ZXJ0aWNhbFNjcm9sbGJhcigpOworICAgIHJldHVy biBtX3Njcm9sbENvbnRyb2xsZXIuaGFuZGxlV2hlZWxFdmVudCh3aGVlbEV2ZW50KTsKK30KKwor Ym9vbCBTY3JvbGxBbmltYXRvcjo6aGFuZGxlU3RlcHBlZFNjcm9sbGluZyhjb25zdCBQbGF0Zm9y bVdoZWVsRXZlbnQmIHdoZWVsRXZlbnQpCit7CisgICAgYXV0byogaG9yaXpvbnRhbFNjcm9sbGJh ciA9IG1fc2Nyb2xsYWJsZUFyZWEuaG9yaXpvbnRhbFNjcm9sbGJhcigpOworICAgIGF1dG8qIHZl cnRpY2FsU2Nyb2xsYmFyID0gbV9zY3JvbGxhYmxlQXJlYS52ZXJ0aWNhbFNjcm9sbGJhcigpOwog CiAgICAgLy8gQWNjZXB0IHRoZSBldmVudCBpZiB3ZSBoYXZlIGEgc2Nyb2xsYmFyIGluIHRoYXQg ZGlyZWN0aW9uIGFuZCBjYW4gc3RpbGwKICAgICAvLyBzY3JvbGwgYW55IGZ1cnRoZXIuCi0gICAg ZmxvYXQgZGVsdGFYID0gaG9yaXpvbnRhbFNjcm9sbGJhciA/IGUuZGVsdGFYKCkgOiAwOwotICAg IGZsb2F0IGRlbHRhWSA9IHZlcnRpY2FsU2Nyb2xsYmFyID8gZS5kZWx0YVkoKSA6IDA7CisgICAg ZmxvYXQgZGVsdGFYID0gaG9yaXpvbnRhbFNjcm9sbGJhciA/IHdoZWVsRXZlbnQuZGVsdGFYKCkg OiAwOworICAgIGZsb2F0IGRlbHRhWSA9IHZlcnRpY2FsU2Nyb2xsYmFyID8gd2hlZWxFdmVudC5k ZWx0YVkoKSA6IDA7CiAKICAgICBib29sIGhhbmRsZWQgPSBmYWxzZTsKIApAQCAtMTk0LDExICsx OTcsMTEgQEAgYm9vbCBTY3JvbGxBbmltYXRvcjo6aGFuZGxlV2hlZWxFdmVudChjb25zdCBQbGF0 Zm9ybVdoZWVsRXZlbnQmIGUpCiAgICAgICAgIGhhbmRsZWQgPSB0cnVlOwogCiAgICAgICAgIE9w dGlvblNldDxTY3JvbGxCZWhhdmlvcj4gYmVoYXZpb3IgPSB7IFNjcm9sbEJlaGF2aW9yOjpSZXNw ZWN0U2Nyb2xsU25hcCB9OwotICAgICAgICBpZiAoZS5oYXNQcmVjaXNlU2Nyb2xsaW5nRGVsdGFz KCkpCisgICAgICAgIGlmICh3aGVlbEV2ZW50Lmhhc1ByZWNpc2VTY3JvbGxpbmdEZWx0YXMoKSkK ICAgICAgICAgICAgIGJlaGF2aW9yLmFkZChTY3JvbGxCZWhhdmlvcjo6TmV2ZXJBbmltYXRlKTsK IAogICAgICAgICBpZiAoZGVsdGFZKSB7Ci0gICAgICAgICAgICBpZiAoZS5ncmFudWxhcml0eSgp ID09IFNjcm9sbEJ5UGFnZVdoZWVsRXZlbnQpCisgICAgICAgICAgICBpZiAod2hlZWxFdmVudC5n cmFudWxhcml0eSgpID09IFNjcm9sbEJ5UGFnZVdoZWVsRXZlbnQpCiAgICAgICAgICAgICAgICAg ZGVsdGFZID0gc3RkOjpjb3B5c2lnbihTY3JvbGxiYXI6OnBhZ2VTdGVwRGVsdGEobV9zY3JvbGxh YmxlQXJlYS52aXNpYmxlSGVpZ2h0KCkpLCBkZWx0YVkpOwogCiAgICAgICAgICAgICBhdXRvIHNj cm9sbERlbHRhID0gdmVydGljYWxTY3JvbGxiYXItPnBpeGVsU3RlcCgpICogLWRlbHRhWTsgLy8g V2hlZWwgZGVsdGFzIGFyZSByZXZlcnNlZCBmcm9tIHNjcm9sbGluZyBkaXJlY3Rpb24uCkBAIC0y MDYsNyArMjA5LDcgQEAgYm9vbCBTY3JvbGxBbmltYXRvcjo6aGFuZGxlV2hlZWxFdmVudChjb25z dCBQbGF0Zm9ybVdoZWVsRXZlbnQmIGUpCiAgICAgICAgIH0KIAogICAgICAgICBpZiAoZGVsdGFY KSB7Ci0gICAgICAgICAgICBpZiAoZS5ncmFudWxhcml0eSgpID09IFNjcm9sbEJ5UGFnZVdoZWVs RXZlbnQpCisgICAgICAgICAgICBpZiAod2hlZWxFdmVudC5ncmFudWxhcml0eSgpID09IFNjcm9s bEJ5UGFnZVdoZWVsRXZlbnQpCiAgICAgICAgICAgICAgICAgZGVsdGFYID0gc3RkOjpjb3B5c2ln bihTY3JvbGxiYXI6OnBhZ2VTdGVwRGVsdGEobV9zY3JvbGxhYmxlQXJlYS52aXNpYmxlV2lkdGgo KSksIGRlbHRhWCk7CiAKICAgICAgICAgICAgIGF1dG8gc2Nyb2xsRGVsdGEgPSBob3Jpem9udGFs U2Nyb2xsYmFyLT5waXhlbFN0ZXAoKSAqIC1kZWx0YVg7IC8vIFdoZWVsIGRlbHRhcyBhcmUgcmV2 ZXJzZWQgZnJvbSBzY3JvbGxpbmcgZGlyZWN0aW9uLgpAQCAtMjE0LDkgKzIxNyw2IEBAIGJvb2wg U2Nyb2xsQW5pbWF0b3I6OmhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50 JiBlKQogICAgICAgICB9CiAgICAgfQogICAgIHJldHVybiBoYW5kbGVkOwotI2Vsc2UKLSAgICBy ZXR1cm4gbV9zY3JvbGxDb250cm9sbGVyLmhhbmRsZVdoZWVsRXZlbnQoZSk7Ci0jZW5kaWYKIH0K IAogdm9pZCBTY3JvbGxBbmltYXRvcjo6c3RvcEtleWJvYXJkU2Nyb2xsQW5pbWF0aW9uKCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRvci5oCmluZGV4IDg0YmM2MjQzZGFkZmRl NzU1MDAwZjcxNjU3MGM5MDgzNTFlN2E2YjMuLmQzZjAwNWY5ZWNlMjEzNWJmNzg4Nzc0NzA2YzRj ZTRmNGRkZDQzYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFu aW1hdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3IuaApA QCAtMTI0LDYgKzEyNCw5IEBAIHB1YmxpYzoKIAogICAgIFNjcm9sbEFuaW1hdGlvblN0YXR1cyBz ZXJ2aWNlU2Nyb2xsQW5pbWF0aW9uKE1vbm90b25pY1RpbWUpOwogCitwcm90ZWN0ZWQ6CisgICAg Ym9vbCBoYW5kbGVTdGVwcGVkU2Nyb2xsaW5nKGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYpOwor CiBwcml2YXRlOgogICAgIHZvaWQgbm90aWZ5UG9zaXRpb25DaGFuZ2VkKGNvbnN0IEZsb2F0U2l6 ZSYgZGVsdGEpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxh YmxlQXJlYS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaAppbmRl eCAxYWNkZjU1YmJlZjNkM2ZhNTk0MmE0ZWZhNmJkY2JmYjNjZmFhYjA4Li5hMzZlMTk4YzY5NWIx Yjg0NjVhYzA1MGZlMWMzNGE2OGUxZTk4NWFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Nj cm9sbGFibGVBcmVhLmgKQEAgLTExMSw2ICsxMTEsOSBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2 b2lkIGRpZEVuZFNjcm9sbCgpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBkaWRVcGRhdGVTY3JvbGwo KSB7IH0KICNlbmRpZgorICAgIAorICAgIC8vICJTdGVwcGVkIHNjcm9sbGluZyIgaXMgdXNlZCBi eSBSZW5kZXJMaXN0Qm94OyBpdCBpbXBsaWVzIHRoYXQgc2Nyb2xsYmFyLT5waXhlbFN0ZXAoKSBp cyBub3QgMSBhbmQgbmV2ZXIgaGFzIHJ1YmJlcmJhbmRpbmcuCisgICAgdmlydHVhbCBib29sIGhh c1N0ZXBwZWRTY3JvbGxpbmcoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogCiAgICAgU2Nyb2xs Q2xhbXBpbmcgc2Nyb2xsQ2xhbXBpbmcoKSBjb25zdCB7IHJldHVybiBtX3Njcm9sbENsYW1waW5n OyB9CiAgICAgdm9pZCBzZXRTY3JvbGxDbGFtcGluZyhTY3JvbGxDbGFtcGluZyBjbGFtcGluZykg eyBtX3Njcm9sbENsYW1waW5nID0gY2xhbXBpbmc7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLmgKaW5kZXggNjRhZTUyYzI1NWFlM2U4ZjJjYWE3 YzE5MjExMjRmN2JkMTUwZTIyMi4uOTY4MjJkMTg4M2M2ZjQ1M2NlNjdjMjMwNWU5NTA3YjFhNTZh YTVlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1h dG9yTWFjLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9y TWFjLmgKQEAgLTQzLDcgKzQzLDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgflNjcm9sbEFuaW1h dG9yTWFjKCk7CiAKIHByaXZhdGU6Ci0gICAgYm9vbCBzaG91bGRGb3J3YXJkV2hlZWxFdmVudHNU b1BhcmVudChjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmKSBjb25zdDsKICAgICBib29sIGhhbmRs ZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JikgZmluYWw7CiAKICAgICB2b2lk IGhhbmRsZVdoZWVsRXZlbnRQaGFzZShQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZSkgZmluYWw7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMu bW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW0KaW5k ZXggMzg5Y2JkNmVkZWIxOGE2MDMzNGNmMzMxZmExYTQ4ODkyN2NhODY0ZC4uNjYwZDkzMmQwMGUz YzI3OGY1MzYyZjNiYjg1ZDEyNTk4YTc1YmEzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbQpAQCAtODUsMTQgKzg1LDYgQEAgdm9pZCBT Y3JvbGxBbmltYXRvck1hYzo6aGFuZGxlV2hlZWxFdmVudFBoYXNlKFBsYXRmb3JtV2hlZWxFdmVu dFBoYXNlIHBoYXNlKQogICAgICAgICBtX3Njcm9sbGFibGVBcmVhLnNjcm9sbGJhcnNDb250cm9s bGVyKCkubWF5QmVnaW5TY3JvbGxHZXN0dXJlKCk7CiB9CiAKLWJvb2wgU2Nyb2xsQW5pbWF0b3JN YWM6OnNob3VsZEZvcndhcmRXaGVlbEV2ZW50c1RvUGFyZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxF dmVudCYgd2hlZWxFdmVudCkgY29uc3QKLXsKLSAgICBpZiAoc3RkOjphYnMod2hlZWxFdmVudC5k ZWx0YVkoKSkgPj0gc3RkOjphYnMod2hlZWxFdmVudC5kZWx0YVgoKSkpCi0gICAgICAgIHJldHVy biAhYWxsb3dzVmVydGljYWxTdHJldGNoaW5nKHdoZWVsRXZlbnQpOwotCi0gICAgcmV0dXJuICFh bGxvd3NIb3Jpem9udGFsU3RyZXRjaGluZyh3aGVlbEV2ZW50KTsKLX0KLSAgICAKIGJvb2wgU2Ny b2xsQW5pbWF0b3JNYWM6OmhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50 JiB3aGVlbEV2ZW50KQogewogICAgIG1fc2Nyb2xsYWJsZUFyZWEuc2Nyb2xsYmFyc0NvbnRyb2xs ZXIoKS5zZXRTY3JvbGxiYXJBbmltYXRpb25zVW5zdXNwZW5kZWRCeVVzZXJJbnRlcmFjdGlvbih0 cnVlKTsKQEAgLTEwMiwxMyArOTQsOSBAQCBib29sIFNjcm9sbEFuaW1hdG9yTWFjOjpoYW5kbGVX aGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgd2hlZWxFdmVudCkKIAogICAgIG1f c2Nyb2xsQ29udHJvbGxlci51cGRhdGVHZXN0dXJlSW5Qcm9ncmVzc1N0YXRlKHdoZWVsRXZlbnQp OwogCi0gICAgLy8gRklYTUU6IFRoaXMgaXMgc29tZXdoYXQgcm91bmRhYm91dCBoYWNrIHRvIGFs bG93IGZvcndhcmRpbmcgd2hlZWwgZXZlbnRzCi0gICAgLy8gdXAgdG8gdGhlIHBhcmVudCBzY3Jv bGxhYmxlIGFyZWEuIEl0IHRha2VzIGFkdmFudGFnZSBvZiB0aGUgZmFjdCB0aGF0Ci0gICAgLy8g dGhlIGJhc2UgY2xhc3MgaW1wbGVtZW50YXRpb24gb2YgaGFuZGxlV2hlZWxFdmVudCB3aWxsIG5v dCBhY2NlcHQgdGhlCi0gICAgLy8gd2hlZWwgZXZlbnQgaWYgdGhlcmUgaXMgbm93aGVyZSB0byBz Y3JvbGwuCi0gICAgaWYgKHNob3VsZEZvcndhcmRXaGVlbEV2ZW50c1RvUGFyZW50KHdoZWVsRXZl bnQpKSB7Ci0gICAgICAgIGJvb2wgZGlkSGFuZGxlRXZlbnQgPSBTY3JvbGxBbmltYXRvcjo6aGFu ZGxlV2hlZWxFdmVudCh3aGVlbEV2ZW50KTsKLSAgICAgICAgaWYgKGRpZEhhbmRsZUV2ZW50IHx8 ICghd2hlZWxFdmVudC5kZWx0YVgoKSAmJiAhd2hlZWxFdmVudC5kZWx0YVkoKSkpCisgICAgaWYg KG1fc2Nyb2xsYWJsZUFyZWEuaGFzU3RlcHBlZFNjcm9sbGluZygpKSB7CisgICAgICAgIGJvb2wg ZGlkSGFuZGxlRXZlbnQgPSBoYW5kbGVTdGVwcGVkU2Nyb2xsaW5nKHdoZWVsRXZlbnQpOworICAg ICAgICBpZiAoZGlkSGFuZGxlRXZlbnQgfHwgd2hlZWxFdmVudC5kZWx0YSgpLmlzWmVybygpKQog ICAgICAgICAgICAgaGFuZGxlV2hlZWxFdmVudFBoYXNlKHdoZWVsRXZlbnQucGhhc2UoKSk7CiAg ICAgICAgIHJldHVybiBkaWRIYW5kbGVFdmVudDsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxpc3RCb3guaAppbmRleCBjNjcwOWEzYzJmMmRkMTQ4OTU3ZDQ3NGU0ZjFkMjU4 YWRjZWYzY2FlLi5kNzQ4ZDBmODQ5MDQ0OWJjOGM2ZmIxNGE5NmNhZmY4ZTgyZTZjMDg2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmgKQEAgLTExMSw2ICsxMTEsOCBA QCBwcml2YXRlOgogICAgIGJvb2wgbm9kZUF0UG9pbnQoY29uc3QgSGl0VGVzdFJlcXVlc3QmLCBI aXRUZXN0UmVzdWx0JiwgY29uc3QgSGl0VGVzdExvY2F0aW9uJiBsb2NhdGlvbkluQ29udGFpbmVy LCBjb25zdCBMYXlvdXRQb2ludCYgYWNjdW11bGF0ZWRPZmZzZXQsIEhpdFRlc3RBY3Rpb24pIG92 ZXJyaWRlOwogCiAgICAgLy8gU2Nyb2xsYWJsZUFyZWEgaW50ZXJmYWNlLgorICAgIGJvb2wgaGFz U3RlcHBlZFNjcm9sbGluZygpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIHRydWU7IH0KKwogICAgIHZv aWQgc2V0U2Nyb2xsT2Zmc2V0KGNvbnN0IFNjcm9sbE9mZnNldCYpIGZpbmFsOwogCiAgICAgU2Ny b2xsUG9zaXRpb24gc2Nyb2xsUG9zaXRpb24oKSBjb25zdCBmaW5hbDsK