228572 2021-07-28 16:13:34 -0700 REGRESSION(r279564): [GTK] Mouse wheel scrolling scrolls too little (take two) 2021-07-31 08:43:48 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=224302 https://bugs.webkit.org/show_bug.cgi?id=227478 P2 Normal --- 1 mcatanzaro mcatanzaro aperez bugs-noreply clord mcatanzaro mrobinson oldest_to_newest 1780244 0 mcatanzaro 2021-07-28 16:13:34 -0700 This is a repeat of bug #224686, we broke mouse wheel scroll speed again. I've started bisecting and am currently at r279963 as first known bad commit and r279541 as last known good. I see a few scrolling commits within this range, and will probably find the culprit when I continue bisecting tomorrow. 1780439 1 mcatanzaro 2021-07-29 10:50:03 -0700 I'm almost done bisecting and it looks like the bad commit is probably r279564 "[css-scroll-snap] Triggering a layout during scroll causes jittery scrolling on Mac when dragging the scrollbar." Hi Martin, do you have time to take a look? 1780531 2 mrobinson 2021-07-29 13:15:05 -0700 Yeah, I can take a look at this tomorrow or Monday. Thanks for the bisection. 1780739 3 mrobinson 2021-07-30 05:32:30 -0700 This problem shows up when you scroll rapidly with scroll wheel and with smooth scrolling turned on. The issue here seems to be that when ScrollAnimator handles a wheel event, it calculates the destination based on the current position, rather than the current target position for the running animation. r279564 uncovered this issue by fixing a bug in ScrollAnimationSmooth that disregarded the requested position in favor of a bogus one, but also making the scrolling by delta relative to the current position (rather than the desired one). This effectively means that the faster you scroll, the slower WebKit scrolls. This is, to say the least, wrong. 1780745 4 434617 mrobinson 2021-07-30 06:28:27 -0700 Created attachment 434617 Patch 1780747 5 434617 mcatanzaro 2021-07-30 06:32:31 -0700 Comment on attachment 434617 Patch Nice test! 1781075 6 ews-feeder 2021-07-31 08:43:45 -0700 Committed r280515 (240147@main): <https://commits.webkit.org/240147@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 434617. 434617 2021-07-30 06:28:27 -0700 2021-07-31 08:43:47 -0700 Patch bug-228572-20210730152826.patch text/plain 10371 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMTcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjQ1OWEwZTU2YmZjNGU4 N2E3OTEzZjZjOTQzZWE2MjA2NWYwMTJkNy4uMDdjODg0MTI0NGFiNmI1MzcwOWE3YzIxMmY3NDdk OTljNThkYWY1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTA3LTMwICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25Ad2Via2l0Lm9yZz4KKworICAgICAgICBSRUdSRVNTSU9O KHIyNzk1NjQpOiBbR1RLXSBNb3VzZSB3aGVlbCBzY3JvbGxpbmcgc2Nyb2xscyB0b28gbGl0dGxl ICh0YWtlIHR3bykKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIyODU3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRlc3Q6IHBsYXRmb3JtL2d0ay9mYXN0L3Njcm9sbGluZy9zY3JvbGwtd2hlZWwtcmVwZWF0 ZWQtZXZlbnRzLmh0bWwKKworICAgICAgICBXaGVuIHNjcm9sbGluZyBieSBhIGRlbHRhIHdpdGgg U2Nyb2xsQW5pbWF0aW9uU21vb3RoLCBiYXNlIHRoZSB0YXJnZXQgcG9pbnQKKyAgICAgICAgb24g dGhlIGN1cnJlbnQgc2Nyb2xsIHRhcmdldCBpbnN0ZWFkIG9mIG9uIHRoZSBjdXJyZW50IHBvc2l0 aW9uLiBXZSBhbHNvCisgICAgICAgIHBhc3MgdGhlIHBvaW50IHRvIHVwZGF0ZVBlckF4aXNEYXRh IGluc3RlYWQgb2YgdGhlIGRlbHRhIGluIG9yZGVyIHRvIG1ha2UKKyAgICAgICAgaXQgbW9yZSBl eHBsaWNpdCB3aGF0IHRoZSBkZXNpcmVkIGJlaGF2aW9yIGlzIGZvciB0aGlzIG1ldGhvZC4KKwor ICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbEFuaW1hdGlvblNtb290aC5oOiBVcGRhdGUgYXJndW1l bnQgbmFtZS4KKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxBbmltYXRpb25TbW9vdGguY3BwOgor ICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0aW9uU21vb3RoOjpzY3JvbGwpOiBCYXNlIHRo ZSBkZWx0YSBvbiB0aGUgdGFyZ2V0IHBvc2l0aW9uIGFuZAorICAgICAgICBwYXNzIHRoYXQgYXMg dGhlIGFyZ3VtZW50IHRvIHVwZGF0ZVBlckF4aXNEYXRhLiBXaGVuIHNjcm9sbGluZyB0byBhIHBv aW50LCBzaW1wbHkKKyAgICAgICAgcGFzcyB0aGF0IHRvIHVwZGF0ZVBlckF4aXNEYXRhLgorICAg ICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0aW9uU21vb3RoOjp1cGRhdGVQZXJBeGlzRGF0YSk6 IEFjY2VwdCBhIHBvaW50IGluc3RlYWQgb2YgYQorICAgICAgICBkZWx0YSwgd2hpY2ggbWFrZXMg aXQgbW9yZSBvYnZpb3VzIGhvdyB0byB1c2UgdGhpcyBmdW5jdGlvbiBhbmQgYWxsb3dzIGl0IHRv CisgICAgICAgIGJlIHVzZWQgdGhlIHNhbWUgd2F5IGJ5IGJvdGggdmVyc2lvbiBvZiBTY3JvbGxB bmltYXRpb25TbW9vdGg6OnNjcm9sbC4KKwogMjAyMS0wNy0yNiAgTWFydGluIFJvYmluc29uICA8 bXJvYmluc29uQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW2Nzcy1zY3JvbGwtc25hcF0gQ29uc2lk ZXIgYWxsIHNuYXAgYXJlYXMgYXQgYSBnaXZlbiBzbmFwIG9mZnNldCB3aGVuIHNuYXBwaW5nCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRpb25TbW9vdGgu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0aW9uU21vb3RoLmNwcApp bmRleCBhMGNhNGY5NDNlZGI5NzVkNzFkYTE1NGQ2OWNlMTUxZTZmYTFkZDg5Li45NWZlOGJiYWFi MmY1NjI5ZDBlYTYzYmUzODM3ZjMxMWYxZWJjYWViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRpb25TbW9vdGguY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL1Njcm9sbEFuaW1hdGlvblNtb290aC5jcHAKQEAgLTg0LDcgKzg0LDggQEAgYm9v bCBTY3JvbGxBbmltYXRpb25TbW9vdGg6OnNjcm9sbChTY3JvbGxiYXJPcmllbnRhdGlvbiBvcmll bnRhdGlvbiwgU2Nyb2xsR3JhbnUKICAgICAgICAgbWluU2Nyb2xsUG9zaXRpb24gPSBleHRlbnRz Lm1pbmltdW1TY3JvbGxQb3NpdGlvbi55KCk7CiAgICAgICAgIG1heFNjcm9sbFBvc2l0aW9uID0g ZXh0ZW50cy5tYXhpbXVtU2Nyb2xsUG9zaXRpb24ueSgpOwogICAgIH0KLSAgICBib29sIG5lZWRU b1Njcm9sbCA9IHVwZGF0ZVBlckF4aXNEYXRhKG9yaWVudGF0aW9uID09IEhvcml6b250YWxTY3Jv bGxiYXIgPyBtX2hvcml6b250YWxEYXRhIDogbV92ZXJ0aWNhbERhdGEsIGdyYW51bGFyaXR5LCBz dGVwICogbXVsdGlwbGllciwgbWluU2Nyb2xsUG9zaXRpb24sIG1heFNjcm9sbFBvc2l0aW9uKTsK KyAgICBhdXRvJiBkYXRhID0gb3JpZW50YXRpb24gPT0gSG9yaXpvbnRhbFNjcm9sbGJhciA/IG1f aG9yaXpvbnRhbERhdGEgOiBtX3ZlcnRpY2FsRGF0YTsKKyAgICBib29sIG5lZWRUb1Njcm9sbCA9 IHVwZGF0ZVBlckF4aXNEYXRhKGRhdGEsIGdyYW51bGFyaXR5LCBkYXRhLmRlc2lyZWRQb3NpdGlv biArIChzdGVwICogbXVsdGlwbGllciksIG1pblNjcm9sbFBvc2l0aW9uLCBtYXhTY3JvbGxQb3Np dGlvbik7CiAgICAgaWYgKG5lZWRUb1Njcm9sbCAmJiAhaXNBY3RpdmUoKSkgewogICAgICAgICBt X3N0YXJ0VGltZSA9IG9yaWVudGF0aW9uID09IEhvcml6b250YWxTY3JvbGxiYXIgPyBtX2hvcml6 b250YWxEYXRhLnN0YXJ0VGltZSA6IG1fdmVydGljYWxEYXRhLnN0YXJ0VGltZTsKICAgICAgICAg YW5pbWF0aW9uVGltZXJGaXJlZCgpOwpAQCAtOTYsOSArOTcsOSBAQCB2b2lkIFNjcm9sbEFuaW1h dGlvblNtb290aDo6c2Nyb2xsKGNvbnN0IEZsb2F0UG9pbnQmIHBvc2l0aW9uKQogewogICAgIFNj cm9sbEdyYW51bGFyaXR5IGdyYW51bGFyaXR5ID0gU2Nyb2xsQnlQYWdlOwogICAgIGF1dG8gZXh0 ZW50cyA9IG1fc2Nyb2xsRXh0ZW50c0Z1bmN0aW9uKCk7Ci0gICAgYm9vbCBuZWVkVG9TY3JvbGwg PSB1cGRhdGVQZXJBeGlzRGF0YShtX2hvcml6b250YWxEYXRhLCBncmFudWxhcml0eSwgcG9zaXRp b24ueCgpIC0gbV9ob3Jpem9udGFsRGF0YS5jdXJyZW50UG9zaXRpb24sIGV4dGVudHMubWluaW11 bVNjcm9sbFBvc2l0aW9uLngoKSwgZXh0ZW50cy5tYXhpbXVtU2Nyb2xsUG9zaXRpb24ueCgpLCBz bW9vdGhGYWN0b3JGb3JQcm9ncmFtbWF0aWNTY3JvbGwpOworICAgIGJvb2wgbmVlZFRvU2Nyb2xs ID0gdXBkYXRlUGVyQXhpc0RhdGEobV9ob3Jpem9udGFsRGF0YSwgZ3JhbnVsYXJpdHksIHBvc2l0 aW9uLngoKSwgZXh0ZW50cy5taW5pbXVtU2Nyb2xsUG9zaXRpb24ueCgpLCBleHRlbnRzLm1heGlt dW1TY3JvbGxQb3NpdGlvbi54KCksIHNtb290aEZhY3RvckZvclByb2dyYW1tYXRpY1Njcm9sbCk7 CiAgICAgbmVlZFRvU2Nyb2xsIHw9Ci0gICAgICAgIHVwZGF0ZVBlckF4aXNEYXRhKG1fdmVydGlj YWxEYXRhLCBncmFudWxhcml0eSwgcG9zaXRpb24ueSgpIC0gbV92ZXJ0aWNhbERhdGEuY3VycmVu dFBvc2l0aW9uLCBleHRlbnRzLm1pbmltdW1TY3JvbGxQb3NpdGlvbi55KCksIGV4dGVudHMubWF4 aW11bVNjcm9sbFBvc2l0aW9uLnkoKSwgc21vb3RoRmFjdG9yRm9yUHJvZ3JhbW1hdGljU2Nyb2xs KTsKKyAgICAgICAgdXBkYXRlUGVyQXhpc0RhdGEobV92ZXJ0aWNhbERhdGEsIGdyYW51bGFyaXR5 LCBwb3NpdGlvbi55KCksIGV4dGVudHMubWluaW11bVNjcm9sbFBvc2l0aW9uLnkoKSwgZXh0ZW50 cy5tYXhpbXVtU2Nyb2xsUG9zaXRpb24ueSgpLCBzbW9vdGhGYWN0b3JGb3JQcm9ncmFtbWF0aWNT Y3JvbGwpOwogICAgIGlmIChuZWVkVG9TY3JvbGwgJiYgIWlzQWN0aXZlKCkpIHsKICAgICAgICAg bV9zdGFydFRpbWUgPSBtX2hvcml6b250YWxEYXRhLnN0YXJ0VGltZTsKICAgICAgICAgYW5pbWF0 aW9uVGltZXJGaXJlZCgpOwpAQCAtMjg3LDE5ICsyODgsMTcgQEAgc3RhdGljIGlubGluZSB2b2lk IGdldEFuaW1hdGlvblBhcmFtZXRlcnNGb3JHcmFudWxhcml0eShTY3JvbGxHcmFudWxhcml0eSBn cmFudWwKICAgICB9CiB9CiAKLWJvb2wgU2Nyb2xsQW5pbWF0aW9uU21vb3RoOjp1cGRhdGVQZXJB eGlzRGF0YShQZXJBeGlzRGF0YSYgZGF0YSwgU2Nyb2xsR3JhbnVsYXJpdHkgZ3JhbnVsYXJpdHks IGZsb2F0IGRlbHRhLCBmbG9hdCBtaW5TY3JvbGxQb3NpdGlvbiwgZmxvYXQgbWF4U2Nyb2xsUG9z aXRpb24sIGRvdWJsZSBzbW9vdGhGYWN0b3IpCitib29sIFNjcm9sbEFuaW1hdGlvblNtb290aDo6 dXBkYXRlUGVyQXhpc0RhdGEoUGVyQXhpc0RhdGEmIGRhdGEsIFNjcm9sbEdyYW51bGFyaXR5IGdy YW51bGFyaXR5LCBmbG9hdCBuZXdQb3NpdGlvbiwgZmxvYXQgbWluU2Nyb2xsUG9zaXRpb24sIGZs b2F0IG1heFNjcm9sbFBvc2l0aW9uLCBkb3VibGUgc21vb3RoRmFjdG9yKQogewotICAgIGlmICgh ZGF0YS5zdGFydFRpbWUgfHwgIWRlbHRhIHx8IChkZWx0YSA8IDApICE9IChkYXRhLmRlc2lyZWRQ b3NpdGlvbiAtIGRhdGEuY3VycmVudFBvc2l0aW9uIDwgMCkpIHsKKyAgICBpZiAoIWRhdGEuc3Rh cnRUaW1lIHx8IG5ld1Bvc2l0aW9uID09IGRhdGEuY3VycmVudFBvc2l0aW9uKSB7CiAgICAgICAg IGRhdGEuZGVzaXJlZFBvc2l0aW9uID0gZGF0YS5jdXJyZW50UG9zaXRpb247CiAgICAgICAgIGRh dGEuc3RhcnRUaW1lID0geyB9OwogICAgIH0KIAotICAgIGZsb2F0IG5ld1Bvc2l0aW9uID0gZGF0 YS5jdXJyZW50UG9zaXRpb24gKyBkZWx0YTsKICAgICBuZXdQb3NpdGlvbiA9IHN0ZDo6bWF4KHN0 ZDo6bWluKG5ld1Bvc2l0aW9uLCBtYXhTY3JvbGxQb3NpdGlvbiksIG1pblNjcm9sbFBvc2l0aW9u KTsKICAgICBpZiAobmV3UG9zaXRpb24gPT0gZGF0YS5kZXNpcmVkUG9zaXRpb24pCiAgICAgICAg IHJldHVybiBmYWxzZTsKIAotCiAgICAgU2Vjb25kcyBhbmltYXRpb25UaW1lLCByZXBlYXRNaW5p bXVtU3VzdGFpblRpbWUsIGF0dGFja1RpbWUsIHJlbGVhc2VUaW1lLCBtYXhpbXVtQ29hc3RUaW1l OwogICAgIEN1cnZlIGNvYXN0VGltZUN1cnZlOwogICAgIGdldEFuaW1hdGlvblBhcmFtZXRlcnNG b3JHcmFudWxhcml0eShncmFudWxhcml0eSwgYW5pbWF0aW9uVGltZSwgcmVwZWF0TWluaW11bVN1 c3RhaW5UaW1lLCBhdHRhY2tUaW1lLCByZWxlYXNlVGltZSwgY29hc3RUaW1lQ3VydmUsIG1heGlt dW1Db2FzdFRpbWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xs QW5pbWF0aW9uU21vb3RoLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRp b25TbW9vdGguaAppbmRleCAxNDdhY2Y0ZTJiZTJmMjA0NzZiMDIzNzg4YTMyNTEzN2ZjZDVjYzMy Li5mYmY1MzI5YjEwMGMwZDk4OGM2ODIxZDVlOTQ0MjBlMWM1NGY5Y2ZjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRpb25TbW9vdGguaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRpb25TbW9vdGguaApAQCAtOTYsNyArOTYs NyBAQCBwcml2YXRlOgogICAgICAgICBpbnQgdmlzaWJsZUxlbmd0aCB7IDAgfTsKICAgICB9Owog Ci0gICAgYm9vbCB1cGRhdGVQZXJBeGlzRGF0YShQZXJBeGlzRGF0YSYsIFNjcm9sbEdyYW51bGFy aXR5LCBmbG9hdCBkZWx0YSwgZmxvYXQgbWluU2Nyb2xsUG9zaXRpb24sIGZsb2F0IG1heFNjcm9s bFBvc2l0aW9uLCBkb3VibGUgc21vb3RoRmFjdG9yID0gMSk7CisgICAgYm9vbCB1cGRhdGVQZXJB eGlzRGF0YShQZXJBeGlzRGF0YSYsIFNjcm9sbEdyYW51bGFyaXR5LCBmbG9hdCBuZXdQb3NpdGlv biwgZmxvYXQgbWluU2Nyb2xsUG9zaXRpb24sIGZsb2F0IG1heFNjcm9sbFBvc2l0aW9uLCBkb3Vi bGUgc21vb3RoRmFjdG9yID0gMSk7CiAgICAgYm9vbCBhbmltYXRlU2Nyb2xsKFBlckF4aXNEYXRh JiwgTW9ub3RvbmljVGltZSBjdXJyZW50VGltZSk7CiAKICAgICB2b2lkIHJlcXVlc3RBbmltYXRp b25UaW1lckZpcmVkKCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMGNlNTk5MTg5MWE4MzNjMDAyNjYwMWE0MDc0NWU2MWZm ZmRlZWVjNC4uZjRhNDJkZWNjZDVhYTE2YmMyMmU3Mzc4NDYwZDFkZTJkNTkyOGRlMyAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDEzIEBACisyMDIxLTA3LTMwICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25A d2Via2l0Lm9yZz4KKworICAgICAgICBSRUdSRVNTSU9OKHIyNzk1NjQpOiBbR1RLXSBNb3VzZSB3 aGVlbCBzY3JvbGxpbmcgc2Nyb2xscyB0b28gbGl0dGxlICh0YWtlIHR3bykKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODU3MgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL2Zhc3Qv c2Nyb2xsaW5nL3Njcm9sbC13aGVlbC1yZXBlYXRlZC1ldmVudHMtZXhwZWN0ZWQudHh0OiBBZGRl ZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvZmFzdC9zY3JvbGxpbmcvc2Nyb2xsLXdoZWVsLXJl cGVhdGVkLWV2ZW50cy5odG1sOiBBZGRlZC4KKwogMjAyMS0wNy0yMSAgU2lodWkgTGl1ICA8c2lo dWlfbGl1QGFwcGxlLmNvbT4KIAogICAgICAgICBVcGRhdGUgTGF5b3V0VGVzdHMvVGVzdEV4cGVj dGF0aW9ucyBmb3IgaW1wb3J0ZWQgdzNjIEluZGV4ZWREQiB0ZXN0cwpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Zhc3Qvc2Nyb2xsaW5nL3Njcm9sbC13aGVlbC1yZXBlYXRl ZC1ldmVudHMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Zhc3Qvc2Ny b2xsaW5nL3Njcm9sbC13aGVlbC1yZXBlYXRlZC1ldmVudHMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjUzN2UwNjViMTQ2NWYzNWEzN2FjYWI1NTBjNTU5YjRmYjc0NGM3YWMKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvZmFzdC9zY3JvbGxpbmcvc2Nyb2xsLXdo ZWVsLXJlcGVhdGVkLWV2ZW50cy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw1IEBACitQQVNTIE92 ZXJsYXBwaW5nIGFuaW1hdGlvbnMgc2hvdWxkIG5vdCBhZmZlY3Qgc2Nyb2xsIGRlc3RpbmF0aW9u IGR1cmluZyB3aGVlbCBldmVudHMuCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisK K1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Zh c3Qvc2Nyb2xsaW5nL3Njcm9sbC13aGVlbC1yZXBlYXRlZC1ldmVudHMuaHRtbCBiL0xheW91dFRl c3RzL3BsYXRmb3JtL2d0ay9mYXN0L3Njcm9sbGluZy9zY3JvbGwtd2hlZWwtcmVwZWF0ZWQtZXZl bnRzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uMWJlOTU5YzJlYmJlNDRkNDk1YzNlNDRlNDkxNzY1Y2ViMzll MjA5ZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9mYXN0L3Nj cm9sbGluZy9zY3JvbGwtd2hlZWwtcmVwZWF0ZWQtZXZlbnRzLmh0bWwKQEAgLTAsMCArMSw2MSBA QAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPHRpdGxlPlJl cGVhdGVkIHdoZWVsIGV2ZW50cyBzaG91bGQgc2Nyb2xsIHRoZSBzYW1lIHJlZ2FyZGxlc3Mgb2Yg YW5pbWF0aW9uczwvdGl0bGU+CisgICAgICAgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CisgICAg ICAgICAgICBib2R5IHsKKyAgICAgICAgICAgICAgICBoZWlnaHQ6IDEwMDAwcHg7CisgICAgICAg ICAgICB9CisgICAgICAgIDwvc3R5bGU+CisgICAgICAgIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi8u Li9yZXNvdXJjZXMvanMtdGVzdC5qcyI+PC9zY3JpcHQ+CisgICAgICAgIDxzY3JpcHQgc3JjPSIu Li8uLi8uLi8uLi9yZXNvdXJjZXMvdWktaGVscGVyLmpzIj48L3NjcmlwdD4KKyAgICAgICAgPHNj cmlwdD4KKyAgICAgICAgd2luZG93LmpzVGVzdElzQXN5bmMgPSB0cnVlOworCisgICAgICAgIGFz eW5jIGZ1bmN0aW9uIG9uTG9hZCgpCisgICAgICAgIHsKKyAgICAgICAgICAgIGlmICh3aW5kb3cu ZXZlbnRTZW5kZXIgPT0gdW5kZWZpbmVkKSB7CisgICAgICAgICAgICAgICAgZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoJ2NvbnNvbGUnKS5pbm5lclRleHQgPSAiUmVwZWF0ZWQgd2hlZWwgZXZlbnRz IHNob3VsZCBzY3JvbGwgdGhlIHNhbWUgcmVnYXJkbGVzcyBvZiBhbmltYXRpb25zIjsKKyAgICAg ICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIHRyeSB7Cisg ICAgICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oMTAwLCAxMDApOworICAgICAg ICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlRG93bigpOworICAgICAgICAgICAgICAgIGV2ZW50 U2VuZGVyLm1vdXNlVXAoKTsKKworICAgICAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLndhaXRG b3JUYXJnZXRTY3JvbGxBbmltYXRpb25Ub1NldHRsZShkb2N1bWVudC5zY3JvbGxpbmdFbGVtZW50 KTsKKyAgICAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5KDAsIC0xKTsKKyAg ICAgICAgICAgICAgICBhd2FpdCBVSUhlbHBlci53YWl0Rm9yVGFyZ2V0U2Nyb2xsQW5pbWF0aW9u VG9TZXR0bGUoZG9jdW1lbnQuc2Nyb2xsaW5nRWxlbWVudCk7CisgICAgICAgICAgICAgICAgZXZl bnRTZW5kZXIubW91c2VTY3JvbGxCeSgwLCAtMSk7CisgICAgICAgICAgICAgICAgYXdhaXQgVUlI ZWxwZXIud2FpdEZvclRhcmdldFNjcm9sbEFuaW1hdGlvblRvU2V0dGxlKGRvY3VtZW50LnNjcm9s bGluZ0VsZW1lbnQpOworICAgICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnko MCwgLTEpOworICAgICAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLndhaXRGb3JUYXJnZXRTY3Jv bGxBbmltYXRpb25Ub1NldHRsZShkb2N1bWVudC5zY3JvbGxpbmdFbGVtZW50KTsKKyAgICAgICAg ICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5KDAsIC0xKTsKKyAgICAgICAgICAgICAg ICBhd2FpdCBVSUhlbHBlci53YWl0Rm9yVGFyZ2V0U2Nyb2xsQW5pbWF0aW9uVG9TZXR0bGUoZG9j dW1lbnQuc2Nyb2xsaW5nRWxlbWVudCk7CisgICAgICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91 c2VTY3JvbGxCeSgwLCAtMSk7CisgICAgICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIud2FpdEZv clRhcmdldFNjcm9sbEFuaW1hdGlvblRvU2V0dGxlKGRvY3VtZW50LnNjcm9sbGluZ0VsZW1lbnQp OworCisgICAgICAgICAgICAgICAgbGV0IGRlc3RpbmF0aW9uV2l0aFNlcmlhbGl6ZWRBbmltYXRp b25zID0gZG9jdW1lbnQuc2Nyb2xsaW5nRWxlbWVudC5zY3JvbGxUb3A7CisgICAgICAgICAgICAg ICAgZG9jdW1lbnQuc2Nyb2xsaW5nRWxlbWVudC5zY3JvbGxUb3AgPSAwOworCisgICAgICAgICAg ICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeSgwLCAtMSk7CisgICAgICAgICAgICAgICAg ZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeSgwLCAtMSk7CisgICAgICAgICAgICAgICAgZXZlbnRT ZW5kZXIubW91c2VTY3JvbGxCeSgwLCAtMSk7CisgICAgICAgICAgICAgICAgZXZlbnRTZW5kZXIu bW91c2VTY3JvbGxCeSgwLCAtMSk7CisgICAgICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VT Y3JvbGxCeSgwLCAtMSk7CisKKyAgICAgICAgICAgICAgICBhd2FpdCBVSUhlbHBlci53YWl0Rm9y VGFyZ2V0U2Nyb2xsQW5pbWF0aW9uVG9TZXR0bGUoZG9jdW1lbnQuc2Nyb2xsaW5nRWxlbWVudCk7 CisgICAgICAgICAgICAgICAgZXhwZWN0VHJ1ZShkb2N1bWVudC5zY3JvbGxpbmdFbGVtZW50LnNj cm9sbFRvcCA9PSBkZXN0aW5hdGlvbldpdGhTZXJpYWxpemVkQW5pbWF0aW9ucywgIk92ZXJsYXBw aW5nIGFuaW1hdGlvbnMgc2hvdWxkIG5vdCBhZmZlY3Qgc2Nyb2xsIGRlc3RpbmF0aW9uIGR1cmlu ZyB3aGVlbCBldmVudHMuIik7CisgICAgICAgICAgICB9IGNhdGNoIChlKSB7CisgICAgICAgICAg ICAgICAgY29uc29sZS5sb2coZSk7CisgICAgICAgICAgICB9IGZpbmFsbHkgeworICAgICAgICAg ICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgICAg IDwvc2NyaXB0PgorICAgIDwvaGVhZD4KKyAgICA8Ym9keSBvbmxvYWQ9Im9uTG9hZCgpOyI+Cisg ICAgICAgIDxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorICAgIDwvYm9keT4KKzwvaHRtbD4K