233585 2021-11-29 12:05:09 -0800 Revert changes related to using a scroll animator for momentum scrolling 2021-11-29 17:21:23 -0800 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser cmarcelo ews-watchlist fred.wang jamesr luiz simon.fraser thorton tonikitoo webkit-bug-importer oldest_to_newest 1818385 0 simon.fraser 2021-11-29 12:05:09 -0800 Revert changes related to using a scroll animator for momentum scrolling 1818386 1 445321 simon.fraser 2021-11-29 12:08:19 -0800 Created attachment 445321 Patch 1818548 2 ews-feeder 2021-11-29 17:20:16 -0800 Committed r286274 (244635@main): <https://commits.webkit.org/244635@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 445321. 1818550 3 webkit-bug-importer 2021-11-29 17:21:23 -0800 <rdar://problem/85842956> 445321 2021-11-29 12:08:19 -0800 2021-11-29 17:20:18 -0800 Patch bug-233585-20211129120818.patch text/plain 14294 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MjE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjM1MGJkOWUwZTA2MzZj MDJmNTI1M2VhNjcxOTgyNjcwNGQzZjM2OS4uYjMxNWQ2NjEzMGQyYWM3ODI3ZjRiYWQ3MThmM2Iw OGExYjBkN2MxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTExLTI5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJldmVydCBjaGFu Z2VzIHJlbGF0ZWQgdG8gdXNpbmcgYSBzY3JvbGwgYW5pbWF0b3IgZm9yIG1vbWVudHVtIHNjcm9s bGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMz NTg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSXQg dHVybnMgb3V0IHRoYXQgcnVubmluZyBhbiBhbmltYXRpb24gZm9yIHRoZSBtb21lbnR1bSBwaGFz ZSBvZiBhIHNjcm9sbCBpc24ndCB3ZWIKKyAgICAgICAgY29tcGF0aWJsZSwgYWRkcyBhIGJ1bmNo IG9mIGNvbXBsZXhpdHkgYXJvdW5kIGludGVyYWN0aW9ucyB3aXRoIHJ1YmJlcmJhbmRpbmcsIGFu ZAorICAgICAgICBoYXMgaXNzdWVzIHdoZW4gU2Nyb2xsQW5pbWF0aW9uTW9tZW50dW0gYmVoYXZp b3IgZGlmZmVycyBmcm9tIHRoZSBtb21lbnR1bSBldmVudAorICAgICAgICBiZWhhdmlvciBpbiBp dHMgcmVzcG9uc2UgdG8gaW5pdGlhbCB2ZWxvY2l0eS4KKworICAgICAgICBTbyByZXZlcnQgdGhl c2UgY2hhbmdlcyBhZGRlZCBpbiByMjg1Nzg3LCByMjg1Nzk3LCByMjg1OTE3LCByMjg1OTUzLCBy Mjg1OTY0LgorCisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVTY3Jv bGxpbmdOb2RlRGVsZWdhdGVNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVl U2Nyb2xsaW5nTm9kZURlbGVnYXRlTWFjOjpoYW5kbGVXaGVlbEV2ZW50KToKKyAgICAgICAgKiBw bGF0Zm9ybS9TY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5oOgorICAgICAgICAqIHBsYXRmb3Jt L21hYy9TY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5tbToKKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbGluZ0VmZmVjdHNDb250cm9sbGVyOjpoYW5kbGVXaGVlbEV2ZW50KToKKyAgICAgICAgKFdl YkNvcmU6OlNjcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyOjpzdGFydFJ1YmJlckJhbmRBbmltYXRp b24pOgorICAgICAgICAoV2ViQ29yZTo6cGhhc2VUb1N0cmluZyk6IERlbGV0ZWQuCisgICAgICAg IChXZWJDb3JlOjphZGp1c3RlZFZlbG9jaXR5KTogRGVsZXRlZC4KKwogMjAyMS0xMS0yOSAgWW91 ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgQXBwbHkgV2ViUHJlZmVy ZW5jZXMgb24gU2VydmljZVdvcmtlciBzZXR0aW5ncwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVN YWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZVNj cm9sbGluZ05vZGVEZWxlZ2F0ZU1hYy5tbQppbmRleCA4MjlkNjNiMTM5NGE2MGUwMDliYTgxMmYz NTI2MTRkMDZlYTY4MjY0Li5hYTI1Mzk3YjM2ZTllNjE5ODcyM2RhZDM1NTUyN2E0ZTQ1OWE3YzU0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5n VHJlZVNjcm9sbGluZ05vZGVEZWxlZ2F0ZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVEZWxlZ2F0ZU1hYy5tbQpA QCAtMTA2LDYgKzEwNiwxMSBAQCBib29sIFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdh dGVNYWM6OmhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbAogICAgIGlmIChpc0lu VXNlclNjcm9sbCAhPSB3YXNJblVzZXJTY3JvbGwpCiAgICAgICAgIHNjcm9sbGluZ05vZGUoKS5z ZXRVc2VyU2Nyb2xsSW5Qcm9ncmVzcyhpc0luVXNlclNjcm9sbCk7CiAKKyAgICAvLyBQbGF0Zm9y bVdoZWVsRXZlbnRQaGFzZTo6TWF5QmVnaW4gZmlyZXMgd2hlbiB0d28gZmluZ2VycyB0b3VjaCB0 aGUgdHJhY2twYWQsIGFuZCBpcyB1c2VkIHRvIGZsYXNoIG92ZXJsYXkgc2Nyb2xsYmFycy4KKyAg ICAvLyBXZSBrbm93IHdlJ3JlIHNjcm9sbGFibGUgYXQgdGhpcyBwb2ludCwgc28gaGFuZGxlIHRo ZSBldmVudC4KKyAgICBpZiAod2hlZWxFdmVudC5waGFzZSgpID09IFBsYXRmb3JtV2hlZWxFdmVu dFBoYXNlOjpNYXlCZWdpbikKKyAgICAgICAgcmV0dXJuIHRydWU7CisKICAgICByZXR1cm4gbV9z Y3JvbGxDb250cm9sbGVyLmhhbmRsZVdoZWVsRXZlbnQod2hlZWxFdmVudCk7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGluZ0VmZmVjdHNDb250cm9sbGVy LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5o CmluZGV4IGVhOTZlMzM1ZmRkMTMyMGNjMmRiYmVlZmZjYTRiN2ZmYTU3ZGI1YmEuLjM3MjBmOWM1 ZGZiZDA4NmQ2MzQ2ZTMxOWU3OGExNTU0ZmExNjBhYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL1Njcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIuaApAQCAtMjYyLDExICsy NjIsNiBAQCBwcml2YXRlOgogICAgIEZsb2F0U2l6ZSBtX21vbWVudHVtVmVsb2NpdHk7CiAKICAg ICBGbG9hdFNpemUgbV9zY3JvbGxpbmdWZWxvY2l0eUZvclNjcm9sbFNuYXA7Ci0jaWYgIUxPR19E SVNBQkxFRAotICAgIEZsb2F0UG9pbnQgbV9ldmVudERyaXZlblNjcm9sbE1vbWVudHVtU3RhcnRP ZmZzZXQ7Ci0gICAgRmxvYXRQb2ludCBtX2V2ZW50RHJpdmVuU2Nyb2xsT2Zmc2V0OwotICAgIFdh bGxUaW1lIG1fbW9tZW50dW1CZWdhbkV2ZW50VGltZTsKLSNlbmRpZgogCiAgICAgYm9vbCBtX21v bWVudHVtU2Nyb2xsSW5Qcm9ncmVzcyB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2lnbm9yZU1vbWVu dHVtU2Nyb2xscyB7IGZhbHNlIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tYWMvU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tYWMvU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXIubW0KaW5kZXggYTkzZGRkM2U5MjMz OTFmOTkzNjBiZDA5YmU1NzQxYTNmZjliYmNmMy4uODAwY2M1MTEwNzVhYWIwMjA4ZTg5NjczNWEz ZTliZDFlMzAyMjgxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Nj cm9sbGluZ0VmZmVjdHNDb250cm9sbGVyLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21hYy9TY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlci5tbQpAQCAtMzEsNyArMzEsNiBAQAogI2lt cG9ydCAiU2Nyb2xsQW5pbWF0aW9uUnViYmVyQmFuZC5oIgogI2ltcG9ydCAiU2Nyb2xsRXh0ZW50 cy5oIgogI2ltcG9ydCAiU2Nyb2xsYWJsZUFyZWEuaCIKLSNpbXBvcnQgIldoZWVsRXZlbnREZWx0 YUZpbHRlci5oIgogI2ltcG9ydCA8cGFsL3NwaS9tYWMvTlNTY3JvbGxWaWV3U1BJLmg+CiAjaW1w b3J0IDxzeXMvc3lzY3RsLmg+CiAjaW1wb3J0IDxzeXMvdGltZS5oPgpAQCAtMTExLDYzICsxMTAs MTUgQEAgc3RhdGljIHN0ZDo6b3B0aW9uYWw8Qm94U2lkZT4gYWZmZWN0ZWRTaWRlT25Eb21pbmFu dEF4aXMoRmxvYXRTaXplIGRlbHRhKQogICAgIHJldHVybiBTY3JvbGxhYmxlQXJlYTo6dGFyZ2V0 U2lkZUZvclNjcm9sbERlbHRhKGRlbHRhLCBkb21pbmFudEF4aXMpOwogfQogCi0jaWYgIUxPR19E SVNBQkxFRAotc3RhdGljIGNvbnN0IGNoYXIqIHBoYXNlVG9TdHJpbmcoUGxhdGZvcm1XaGVlbEV2 ZW50UGhhc2UgcGhhc2UpCi17Ci0gICAgc3dpdGNoIChwaGFzZSkgewotICAgIGNhc2UgUGxhdGZv cm1XaGVlbEV2ZW50UGhhc2U6Ok5vbmU6IHJldHVybiAibm9uZSI7Ci0gICAgY2FzZSBQbGF0Zm9y bVdoZWVsRXZlbnRQaGFzZTo6QmVnYW46IHJldHVybiAiYmVnYW4iOwotICAgIGNhc2UgUGxhdGZv cm1XaGVlbEV2ZW50UGhhc2U6OlN0YXRpb25hcnk6IHJldHVybiAic3RhdGlvbmFyeSI7Ci0gICAg Y2FzZSBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZTo6Q2hhbmdlZDogcmV0dXJuICJjaGFuZ2VkIjsK LSAgICBjYXNlIFBsYXRmb3JtV2hlZWxFdmVudFBoYXNlOjpFbmRlZDogcmV0dXJuICJlbmRlZCI7 Ci0gICAgY2FzZSBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZTo6Q2FuY2VsbGVkOiByZXR1cm4gImNh bmNlbGxlZCI7Ci0gICAgY2FzZSBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZTo6TWF5QmVnaW46IHJl dHVybiAibWF5QmVnaW4iOwotICAgIH0KLSAgICByZXR1cm4gIiI7Ci19Ci0jZW5kaWYKLQotc3Rh dGljIEZsb2F0U2l6ZSBhZGp1c3RlZFZlbG9jaXR5KEZsb2F0U2l6ZSB2ZWxvY2l0eSkKLXsKLSAg ICBhdXRvIGFwcGx5Q3VydmUgPSBeKGZsb2F0IG9yaWdpbmFsVmFsdWUpIHsKLSAgICAgICAgaWYg KCFvcmlnaW5hbFZhbHVlKQotICAgICAgICAgICAgcmV0dXJuIG9yaWdpbmFsVmFsdWU7Ci0KLSAg ICAgICAgZmxvYXQgdmFsdWUgPSBmYWJzKG9yaWdpbmFsVmFsdWUpOwotICAgICAgICBmbG9hdCBw b3dlckxvdyA9IDYuNyAqIHBvdyh2YWx1ZSwgLS4xNjYpOwotICAgICAgICBmbG9hdCBwb3dlckhp Z2ggPSAzNi4zICogcG93KHZhbHVlLCAtLjM5Mik7Ci0gICAgICAgIGNvbnN0IGZsb2F0IHRyYW5z aXRpb25WZWxvY2l0eSA9IDIwMDA7Ci0KLSAgICAgICAgYXV0byBpbnRlcnBvbGF0ZSA9IF4oZmxv YXQgdjAsIGZsb2F0IHYxLCBmbG9hdCB0KSB7Ci0gICAgICAgICAgICByZXR1cm4gKDEgLSB0KSAq IHYwICsgdCAqIHYxOwotICAgICAgICB9OwotICAgICAgICAKLSAgICAgICAgZmxvYXQgbXVsdGlw bGllciA9IGludGVycG9sYXRlKHBvd2VyTG93LCBwb3dlckhpZ2gsIHN0ZDo6bWluKHZhbHVlLCB0 cmFuc2l0aW9uVmVsb2NpdHkpIC8gdHJhbnNpdGlvblZlbG9jaXR5KTsKLSAgICAgICAgcmV0dXJu IGNvcHlzaWduKHZhbHVlICogbXVsdGlwbGllciwgb3JpZ2luYWxWYWx1ZSk7Ci0gICAgfTsKLQot ICAgIHJldHVybiB7IGFwcGx5Q3VydmUodmVsb2NpdHkud2lkdGgoKSksIGFwcGx5Q3VydmUodmVs b2NpdHkuaGVpZ2h0KCkpIH07Ci19Ci0KIGJvb2wgU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXI6 OmhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZW50KQog ewogICAgIGlmIChwcm9jZXNzV2hlZWxFdmVudEZvclNjcm9sbFNuYXAod2hlZWxFdmVudCkpCiAg ICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgaWYgKHdoZWVsRXZlbnQucGhhc2UoKSA9PSBQbGF0 Zm9ybVdoZWVsRXZlbnRQaGFzZTo6TWF5QmVnaW4gfHwgd2hlZWxFdmVudC5waGFzZSgpID09IFBs YXRmb3JtV2hlZWxFdmVudFBoYXNlOjpDYW5jZWxsZWQpIHsKLSAgICAgICAgaWYgKG1vbWVudHVt U2Nyb2xsaW5nQW5pbWF0b3JFbmFibGVkKCkpIHsKLSAgICAgICAgICAgIExPRyhTY3JvbGxBbmlt YXRpb25zLCAiRXZlbnQgKCVzLCAlcyk6IHN0b3BwaW5nIGFuaW1hdGVkIHNjcm9sbCIsIHBoYXNl VG9TdHJpbmcod2hlZWxFdmVudC5waGFzZSgpKSwgcGhhc2VUb1N0cmluZyh3aGVlbEV2ZW50Lm1v bWVudHVtUGhhc2UoKSkpOwotICAgICAgICAgICAgc3RvcEFuaW1hdGVkU2Nyb2xsKCk7Ci0gICAg ICAgIH0KLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQorICAgIGlmICh3aGVlbEV2ZW50LnBo YXNlKCkgPT0gUGxhdGZvcm1XaGVlbEV2ZW50UGhhc2U6Ok1heUJlZ2luIHx8IHdoZWVsRXZlbnQu cGhhc2UoKSA9PSBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZTo6Q2FuY2VsbGVkKQorICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKICAgICBpZiAod2hlZWxFdmVudC5waGFzZSgpID09IFBsYXRmb3JtV2hl ZWxFdmVudFBoYXNlOjpCZWdhbikgewotICAgICAgICBpZiAobW9tZW50dW1TY3JvbGxpbmdBbmlt YXRvckVuYWJsZWQoKSkgewotICAgICAgICAgICAgTE9HKFNjcm9sbEFuaW1hdGlvbnMsICJFdmVu dCAoJXMsICVzKTogc3RvcHBpbmcgYW5pbWF0ZWQgc2Nyb2xsIiwgcGhhc2VUb1N0cmluZyh3aGVl bEV2ZW50LnBoYXNlKCkpLCBwaGFzZVRvU3RyaW5nKHdoZWVsRXZlbnQubW9tZW50dW1QaGFzZSgp KSk7Ci0gICAgICAgICAgICBzdG9wQW5pbWF0ZWRTY3JvbGwoKTsKLSAgICAgICAgfQotCiAgICAg ICAgIC8vIEZJWE1FOiBUcnlpbmcgdG8gZGVjaWRlIGlmIGEgZ2VzdHVyZSBpcyBob3Jpem9udGFs IG9yIHZlcnRpY2FsIGF0IHRoZSAiYmVnYW4iIHBoYXNlIGlzIHZlcnkgZXJyb3ItcHJvbmUuCiAg ICAgICAgIGF1dG8gaG9yaXpvbnRhbFNpZGUgPSBTY3JvbGxhYmxlQXJlYTo6dGFyZ2V0U2lkZUZv clNjcm9sbERlbHRhKC13aGVlbEV2ZW50LmRlbHRhKCksIFNjcm9sbEV2ZW50QXhpczo6SG9yaXpv bnRhbCk7CiAgICAgICAgIGlmIChob3Jpem9udGFsU2lkZSAmJiBtX2NsaWVudC5pc1Bpbm5lZE9u U2lkZSgqaG9yaXpvbnRhbFNpZGUpICYmICFzaG91bGRSdWJiZXJCYW5kT25TaWRlKCpob3Jpem9u dGFsU2lkZSkpCkBAIC0xOTksMjQgKzE1MCw2IEBAIGJvb2wgU2Nyb2xsaW5nRWZmZWN0c0NvbnRy b2xsZXI6OmhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlCiAg ICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIAotI2lmICFMT0dfRElTQUJMRUQKLSAgICBpZiAo d2hlZWxFdmVudC5tb21lbnR1bVBoYXNlKCkgPT0gUGxhdGZvcm1XaGVlbEV2ZW50UGhhc2U6OkJl Z2FuKQotICAgICAgICBtX21vbWVudHVtQmVnYW5FdmVudFRpbWUgPSB3aGVlbEV2ZW50LnRpbWVz dGFtcCgpOwotI2VuZGlmCi0KLSAgICBpZiAod2hlZWxFdmVudC5tb21lbnR1bVBoYXNlKCkgPT0g UGxhdGZvcm1XaGVlbEV2ZW50UGhhc2U6OkVuZGVkICYmIG1vbWVudHVtU2Nyb2xsaW5nQW5pbWF0 b3JFbmFibGVkKCkpIHsKLSNpZiAhTE9HX0RJU0FCTEVECi0gICAgICAgIGF1dG8gdGltZVNpbmNl U3RhcnQgPSB3aGVlbEV2ZW50LnRpbWVzdGFtcCgpIC0gbV9tb21lbnR1bUJlZ2FuRXZlbnRUaW1l OwotICAgICAgICBhdXRvIGRpc3RhbmNlID0gbV9ldmVudERyaXZlblNjcm9sbE9mZnNldCAtIG1f ZXZlbnREcml2ZW5TY3JvbGxNb21lbnR1bVN0YXJ0T2Zmc2V0OwotI2VuZGlmCi0gICAgICAgIC8v IEZJWE1FOiBXZSBjYW4ndCBkaXN0aW5ndWlzaCBiZXR3ZWVuIHRoZSBuYXR1cmFsIGVuZCBvZiBh IG1vbWVudHVtIHNlcXVlbmNlLCBhbmQgYSB0d28tZmluZ2VyIHRhcCBvbiB0aGUgdHJhY2twYWQg KHJkYXI6Ly84NTQxNDIzOCksCi0gICAgICAgIC8vIHNvIHdlIGFsd2F5cyBoYXZlIHRvIGVuZCB0 aGUgYW5pbWF0aW9uIGhlcmUuCi0gICAgICAgIExPRyhTY3JvbGxBbmltYXRpb25zLCAiRXZlbnQg KCVzLCAlcyk6IHN0b3BwaW5nIGV2ZW50IHNjcm9sbCBkdXJhdGlvbiAlLjJmbXMgZGlzdGFuY2Ug JS4yZiAlLjJmIiwKLSAgICAgICAgICAgIHBoYXNlVG9TdHJpbmcod2hlZWxFdmVudC5waGFzZSgp KSwgcGhhc2VUb1N0cmluZyh3aGVlbEV2ZW50Lm1vbWVudHVtUGhhc2UoKSksIHRpbWVTaW5jZVN0 YXJ0Lm1pbGxpc2Vjb25kcygpLAotICAgICAgICAgICAgZmFicyhkaXN0YW5jZS53aWR0aCgpKSwg ZmFicyhkaXN0YW5jZS5oZWlnaHQoKSkpOwotICAgICAgICBzdG9wQW5pbWF0ZWROb25SdWJiZXJi YW5kaW5nU2Nyb2xsKCk7Ci0gICAgfQotCiAgICAgYm9vbCBpc01vbWVudHVtU2Nyb2xsRXZlbnQg PSAod2hlZWxFdmVudC5tb21lbnR1bVBoYXNlKCkgIT0gUGxhdGZvcm1XaGVlbEV2ZW50UGhhc2U6 Ok5vbmUpOwogICAgIGlmIChtX2lnbm9yZU1vbWVudHVtU2Nyb2xscyAmJiAoaXNNb21lbnR1bVNj cm9sbEV2ZW50IHx8IG1faXNBbmltYXRpbmdSdWJiZXJCYW5kKSkgewogICAgICAgICBpZiAod2hl ZWxFdmVudC5tb21lbnR1bVBoYXNlKCkgPT0gUGxhdGZvcm1XaGVlbEV2ZW50UGhhc2U6OkVuZGVk KSB7CkBAIC0yNDQsMjUgKzE3Nyw4IEBAIGJvb2wgU2Nyb2xsaW5nRWZmZWN0c0NvbnRyb2xsZXI6 OmhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlCiAgICAgZGVs dGEgPSBkZWx0YUFsaWduZWRUb0RvbWluYW50QXhpcyhkZWx0YSk7CiAKICAgICBhdXRvIG1vbWVu dHVtUGhhc2UgPSB3aGVlbEV2ZW50Lm1vbWVudHVtUGhhc2UoKTsKLSAgICBpZiAoIW1fbW9tZW50 dW1TY3JvbGxJblByb2dyZXNzICYmIChtb21lbnR1bVBoYXNlID09IFBsYXRmb3JtV2hlZWxFdmVu dFBoYXNlOjpCZWdhbiB8fCBtb21lbnR1bVBoYXNlID09IFBsYXRmb3JtV2hlZWxFdmVudFBoYXNl OjpDaGFuZ2VkKSkgeworICAgIGlmICghbV9tb21lbnR1bVNjcm9sbEluUHJvZ3Jlc3MgJiYgKG1v bWVudHVtUGhhc2UgPT0gUGxhdGZvcm1XaGVlbEV2ZW50UGhhc2U6OkJlZ2FuIHx8IG1vbWVudHVt UGhhc2UgPT0gUGxhdGZvcm1XaGVlbEV2ZW50UGhhc2U6OkNoYW5nZWQpKQogICAgICAgICBtX21v bWVudHVtU2Nyb2xsSW5Qcm9ncmVzcyA9IHRydWU7Ci0gICAgICAgIGlmIChtb21lbnR1bVNjcm9s bGluZ0FuaW1hdG9yRW5hYmxlZCgpKSB7Ci0gICAgICAgICAgICBzdGFydE1vbWVudHVtU2Nyb2xs V2l0aEluaXRpYWxWZWxvY2l0eShtX2NsaWVudC5zY3JvbGxPZmZzZXQoKSwgLWFkanVzdGVkVmVs b2NpdHkod2hlZWxFdmVudC5zY3JvbGxpbmdWZWxvY2l0eSgpKSwgLXdoZWVsRXZlbnQuZGVsdGEo KSwgW10oY29uc3QgRmxvYXRQb2ludCYgdGFyZ2V0T2Zmc2V0KSB7IHJldHVybiB0YXJnZXRPZmZz ZXQ7IH0pOwotI2lmICFMT0dfRElTQUJMRUQKLSAgICAgICAgICAgIG1fZXZlbnREcml2ZW5TY3Jv bGxPZmZzZXQgPSBtX2NsaWVudC5zY3JvbGxPZmZzZXQoKTsKLSAgICAgICAgICAgIG1fZXZlbnRE cml2ZW5TY3JvbGxNb21lbnR1bVN0YXJ0T2Zmc2V0ID0gbV9ldmVudERyaXZlblNjcm9sbE9mZnNl dDsKLSNlbmRpZgotICAgICAgICB9Ci0gICAgfQotCi0gICAgaWYgKG1vbWVudHVtUGhhc2UgPT0g UGxhdGZvcm1XaGVlbEV2ZW50UGhhc2U6OkNoYW5nZWQgJiYgbW9tZW50dW1TY3JvbGxpbmdBbmlt YXRvckVuYWJsZWQoKSkgewotI2lmICFMT0dfRElTQUJMRUQKLSAgICAgICAgbV9ldmVudERyaXZl blNjcm9sbE9mZnNldCAtPSB3aGVlbEV2ZW50LmRlbHRhKCk7Ci0jZW5kaWYKLSAgICAgICAgTE9H KFNjcm9sbEFuaW1hdGlvbnMsICJFdmVudCAoJXMsICVzKTogaWdub3JpbmcgLSB3b3VsZCBoYXZl IHNjcm9sbGVkIHRvICUuMmYsJS4yZiIsIHBoYXNlVG9TdHJpbmcod2hlZWxFdmVudC5waGFzZSgp KSwgcGhhc2VUb1N0cmluZyh3aGVlbEV2ZW50Lm1vbWVudHVtUGhhc2UoKSksCi0gICAgICAgICAg ICBtX2V2ZW50RHJpdmVuU2Nyb2xsT2Zmc2V0LngoKSwgbV9ldmVudERyaXZlblNjcm9sbE9mZnNl dC55KCkpOwotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9CiAKICAgICBib29sIHNob3VsZFN0 cmV0Y2ggPSBmYWxzZTsKICAgICBhdXRvIHRpbWVEZWx0YSA9IHdoZWVsRXZlbnQudGltZXN0YW1w KCkgLSBtX2xhc3RNb21lbnR1bVNjcm9sbFRpbWVzdGFtcDsKQEAgLTQ3NywxMSArMzkzLDYgQEAg dm9pZCBTY3JvbGxpbmdFZmZlY3RzQ29udHJvbGxlcjo6c3RvcFJ1YmJlckJhbmRpbmcoKQogCiBi b29sIFNjcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyOjpzdGFydFJ1YmJlckJhbmRBbmltYXRpb24o Y29uc3QgRmxvYXRQb2ludCYgdGFyZ2V0T2Zmc2V0LCBjb25zdCBGbG9hdFNpemUmIGluaXRpYWxW ZWxvY2l0eSwgY29uc3QgRmxvYXRTaXplJiBpbml0aWFsT3ZlcnNjcm9sbCkKIHsKLSAgICBpZiAo aXM8U2Nyb2xsQW5pbWF0aW9uTW9tZW50dW0+KG1fY3VycmVudEFuaW1hdGlvbikgJiYgbV9jdXJy ZW50QW5pbWF0aW9uLT5pc0FjdGl2ZSgpKSB7Ci0gICAgICAgIExPR19XSVRIX1NUUkVBTShTY3Jv bGxBbmltYXRpb25zLCBzdHJlYW0gPDwgIlNjcm9sbGluZ0VmZmVjdHNDb250cm9sbGVyOjpzdGFy dFJ1YmJlckJhbmRBbmltYXRpb24oKSAtIG1vbWVudHVtIGFuaW1hdGlvbiBpcyBwcmVzZW50Iik7 Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9Ci0KICAgICBpZiAobV9jdXJyZW50QW5pbWF0 aW9uKQogICAgICAgICBtX2N1cnJlbnRBbmltYXRpb24tPnN0b3AoKTsKIApkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDRkMzU1 YzIxMWI5OWQ1MWMxYzVkNDczZmU2ZWJhYzJlMzM1NzBiY2QuLjkzMmRhYjc5ZTI4NWY3NTYyMzYx ZDcyMGNmYTQyNjRiOTY5YjY1Y2MgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZwor KysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMS0xMS0yOSAg U2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZlcnQg Y2hhbmdlcyByZWxhdGVkIHRvIHVzaW5nIGEgc2Nyb2xsIGFuaW1hdG9yIGZvciBtb21lbnR1bSBz Y3JvbGxpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzMzU4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFdlIGNhbiBrZWVwIHRoZSB0ZXN0cyBidXQgdGhleSBkb24ndCBuZWVkIHRvIGNoYW5nZSB0aGUg c2V0dGluZyBhbnkgbW9yZS4KKworICAgICAgICAqIGZhc3Qvc2Nyb2xsaW5nL21hYy9tb21lbnR1 bS1hbmltYXRvci1lbmQtZXZlbnQtc3RvcHMuaHRtbDoKKyAgICAgICAgKiBmYXN0L3Njcm9sbGlu Zy9tYWMvbW9tZW50dW0tYW5pbWF0b3ItaW4tb3ZlcmZsb3cuaHRtbDoKKyAgICAgICAgKiBmYXN0 L3Njcm9sbGluZy9tYWMvbW9tZW50dW0tYW5pbWF0b3ItbWF5YmVnaW4tc3RvcHMuaHRtbDoKKyAg ICAgICAgKiBmYXN0L3Njcm9sbGluZy9tYWMvbW9tZW50dW0tYW5pbWF0b3IuaHRtbDoKKyAgICAg ICAgKiBwbGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMTAtMjcgIFNl cmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CiAKICAgICAgICAgW2Nzcy1m bGV4Ym94XSBEbyBub3Qgc2hyaW5rIHRhYmxlcyBiZWxsb3cgdGhlaXIgaW50cmluc2ljIHNpemVz CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9tYWMvbW9tZW50dW0tYW5p bWF0b3ItZW5kLWV2ZW50LXN0b3BzLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9t YWMvbW9tZW50dW0tYW5pbWF0b3ItZW5kLWV2ZW50LXN0b3BzLmh0bWwKaW5kZXggM2ZhM2E4OGFk MDJlOTBkMWU1M2I2NjdhN2E0Y2NjM2FmNDY0MzZjNi4uYzViYjIyNDczM2JmYTY0OGY5YWRiZmU2 OGVkMmRlMGFhZDM2M2EwOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcv bWFjL21vbWVudHVtLWFuaW1hdG9yLWVuZC1ldmVudC1zdG9wcy5odG1sCisrKyBiL0xheW91dFRl c3RzL2Zhc3Qvc2Nyb2xsaW5nL21hYy9tb21lbnR1bS1hbmltYXRvci1lbmQtZXZlbnQtc3RvcHMu aHRtbApAQCAtMSw0ICsxLDQgQEAKLTwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtpdC10ZXN0LXJ1 bm5lciBbIE1vbWVudHVtU2Nyb2xsaW5nQW5pbWF0b3JFbmFibGVkPXRydWUgXSAtLT4KKzwhRE9D VFlQRSBodG1sPgogPGh0bWw+CiA8aGVhZD4KICAgICA8c3R5bGU+CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9mYXN0L3Njcm9sbGluZy9tYWMvbW9tZW50dW0tYW5pbWF0b3ItaW4tb3ZlcmZsb3cu aHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL21hYy9tb21lbnR1bS1hbmltYXRvci1p bi1vdmVyZmxvdy5odG1sCmluZGV4IGY0OTViYzNhMDg1MzE4ODg0NDY1MmYzN2U3YTI2ZDhiNDJl YTQyNjkuLjdlMjc2NDUxYjI2OWM3YjU5ZGZhN2ZhNjg4ZDc1ZjViOGQxNTM4MTYgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL21hYy9tb21lbnR1bS1hbmltYXRvci1pbi1v dmVyZmxvdy5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL21hYy9tb21lbnR1 bS1hbmltYXRvci1pbi1vdmVyZmxvdy5odG1sCkBAIC0xLDQgKzEsNCBAQAotPCFET0NUWVBFIGh0 bWw+IDwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgTW9tZW50dW1TY3JvbGxpbmdBbmltYXRvckVu YWJsZWQ9dHJ1ZSBBc3luY092ZXJmbG93U2Nyb2xsaW5nRW5hYmxlZD10cnVlIF0gLS0+Cis8IURP Q1RZUEUgaHRtbD4gPCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyBBc3luY092ZXJmbG93U2Nyb2xs aW5nRW5hYmxlZD10cnVlIF0gLS0+CiA8aHRtbD4KIDxoZWFkPgogICAgIDxzdHlsZT4KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL21hYy9tb21lbnR1bS1hbmltYXRvci1t YXliZWdpbi1zdG9wcy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvbWFjL21vbWVu dHVtLWFuaW1hdG9yLW1heWJlZ2luLXN0b3BzLmh0bWwKaW5kZXggNjg5ODg1ZGU5MTJhMGE2Mjhl NDA2Y2I0NTk4MTUwYTEyZjEwYTlhZi4uYTY2NjI4NDQ3YTVjN2NhMDMyMTE3ZDBjODNhNWVhOWZj MjI4ZGZiNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvbWFjL21vbWVu dHVtLWFuaW1hdG9yLW1heWJlZ2luLXN0b3BzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9z Y3JvbGxpbmcvbWFjL21vbWVudHVtLWFuaW1hdG9yLW1heWJlZ2luLXN0b3BzLmh0bWwKQEAgLTEs NCArMSw0IEBACi08IURPQ1RZUEUgaHRtbD4gPCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyBNb21l bnR1bVNjcm9sbGluZ0FuaW1hdG9yRW5hYmxlZD10cnVlIF0gLS0+Cis8IURPQ1RZUEUgaHRtbD4K IDxodG1sPgogPGhlYWQ+CiAgICAgPHN0eWxlPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9zY3JvbGxpbmcvbWFjL21vbWVudHVtLWFuaW1hdG9yLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0 L3Njcm9sbGluZy9tYWMvbW9tZW50dW0tYW5pbWF0b3IuaHRtbAppbmRleCAwODllZmMxNDcxZGQ3 MTgzOGEyZTJkZDAxNDkzZjNmYmQ4Y2U3YzdkLi5kNzA3NzQ1NzY2ZTliYTFlNWRlYzA4MzdhZjFl NGM5NWEyOTVlYjZkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9tYWMv bW9tZW50dW0tYW5pbWF0b3IuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9t YWMvbW9tZW50dW0tYW5pbWF0b3IuaHRtbApAQCAtMSw0ICsxLDQgQEAKLTwhRE9DVFlQRSBodG1s PiA8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIE1vbWVudHVtU2Nyb2xsaW5nQW5pbWF0b3JFbmFi bGVkPXRydWUgXSAtLT4KKzwhRE9DVFlQRSBodG1sPgogPGh0bWw+CiA8aGVhZD4KICAgICA8c3R5 bGU+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3Rh dGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMKaW5k ZXggZDZjZWQ4NjBkZjFhZTE0YzY3MjA5YWMxMTQxOTA0ZmNhMzkwZTQ1YS4uYjcyODg1NWEwODli MmQzMGExODYyOWVlYWFkODEyNGZkOTcwMzk1NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxh dGZvcm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3Jt L21hYy13azIvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMTU1NSw3ICsxNTU1LDYgQEAgd2Via2l0Lm9y Zy9iLzIyODUyOCBbIEJpZ1N1ciBEZWJ1ZyBhcm02NCBdIGZhc3QvdGV4dC9lbW9qaS1vdmVybGFw Lmh0bWwgWyBQYXNzIEkKIFsgTW9udGVyZXkgYXJtNjQgXSBmYXN0L3RleHQvY2FudmFzLWNvbG9y LWZvbnRzL3N0cm9rZS1ncmFkaWVudC1DT0xSLTUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQog CiB3ZWJraXQub3JnL2IvMjI4NTkxIGZhc3Qvc2Nyb2xsaW5nL21hYy9wcm9ncmFtbWF0aWMtc2Ny b2xsLW92ZXJyaWRlcy1ydWJiZXJiYW5kLmh0bWwgWyBQYXNzIEZhaWx1cmUgXQotd2Via2l0Lm9y Zy9iLzIzMzIzNCBmYXN0L3Njcm9sbGluZy9tYWMvbW9tZW50dW0tYW5pbWF0b3ItaW4tb3ZlcmZs b3cuaHRtbCBbIEZhaWx1cmUgXQogCiB3ZWJraXQub3JnL2IvMjI5MTU2IFsgQmlnU3VyKyBdIHdl YnJ0Yy92aWRlby1hZGRUcmFjay5odG1sIFsgUGFzcyBGYWlsdXJlIF0KIAo=