233438 2021-11-22 17:04:13 -0800 Have ScrollAnimator::scrollToPositionWithAnimation() take a clamping argument 2021-11-22 18:29:23 -0800 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser heycam simon.fraser webkit-bug-importer oldest_to_newest 1817366 0 simon.fraser 2021-11-22 17:04:13 -0800 Have ScrollAnimator::scrollToPositionWithAnimation() take a clamping argument 1817367 1 444993 simon.fraser 2021-11-22 17:05:48 -0800 Created attachment 444993 Patch 1817377 2 ews-feeder 2021-11-22 18:28:26 -0800 Committed r286126 (244513@main): <https://commits.webkit.org/244513@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 444993. 1817378 3 webkit-bug-importer 2021-11-22 18:29:23 -0800 <rdar://problem/85687403> 444993 2021-11-22 17:05:48 -0800 2021-11-22 18:28:26 -0800 Patch bug-233438-20211122170547.patch text/plain 8781 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmFjYTYwNGFiZDZhZmRm NDI1NTNkZmFjYmU3Yjg0MDc0OTdhMjk3Mi4uY2JlNzIxNGRkOTdkYTU0YzA5MmQyOTJkOTk5ZDFk ZGI5ZDAzMDgwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIxLTExLTIyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEhhdmUgU2Nyb2xs QW5pbWF0b3I6OnNjcm9sbFRvUG9zaXRpb25XaXRoQW5pbWF0aW9uKCkgdGFrZSBhIGNsYW1waW5n IGFyZ3VtZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMzM0MzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBDcmVhdGUgc3ltbWV0cnkgYmV0d2VlbiBzY3JvbGxUb1Bvc2l0aW9uV2l0aEFuaW1hdGlvbigp IGFuZCBzY3JvbGxUb1Bvc2l0aW9uV2l0aG91dEFuaW1hdGlvbigpCisgICAgICAgIGJ5IGFkZGlu ZyBhIFNjcm9sbENsYW1waW5nIGFyZ3VtZW50IHRvIHRoZSBmb3JtZXIuIE5laXRoZXIgbmVlZCB0 byBiZSB2aXJ0dWFsLgorCisgICAgICAgIFNjcm9sbEFuaW1hdG9yOjpjYW5jZWxBbmltYXRpb25z KCkgZG9lcyBub3QgbmVlZCB0byBiZSB2aXJ0dWFsLgorCisgICAgICAgIFJlbmFtZSBTY3JvbGxh YmxlQXJlYTo6Y29uc3RyYWluU2Nyb2xsUG9zaXRpb24oKSB0byBTY3JvbGxhYmxlQXJlYTo6Y29u c3RyYWluZWRTY3JvbGxQb3NpdGlvbigpCisgICAgICAgIGJlY2F1c2UgaXQganVzdCByZXR1cm5z IGEgbmV3IHBvc2l0aW9uLgorCisgICAgICAgICogcGxhdGZvcm0vS2V5Ym9hcmRTY3JvbGxpbmdB bmltYXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9y Ojp1cGRhdGVLZXlib2FyZFNjcm9sbFBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OktleWJv YXJkU2Nyb2xsaW5nQW5pbWF0b3I6OnN0b3BLZXlib2FyZFNjcm9sbEFuaW1hdGlvbik6CisgICAg ICAgICogcGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Ny b2xsQW5pbWF0b3I6OnNjcm9sbFRvUG9zaXRpb25XaXRoQW5pbWF0aW9uKToKKyAgICAgICAgKFdl YkNvcmU6OlNjcm9sbEFuaW1hdG9yOjphZGp1c3RTY3JvbGxQb3NpdGlvblRvQm91bmRzSWZOZWNl c3NhcnkpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3I6OmFkanVzdFNjcm9sbFBv c2l0aW9uSWZOZWNlc3NhcnkgY29uc3QpOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbEFuaW1h dG9yLmg6CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuY3BwOgorICAgICAgICAo V2ViQ29yZTo6U2Nyb2xsYWJsZUFyZWE6OnNjcm9sbFRvUG9zaXRpb25XaXRoQW5pbWF0aW9uKToK KyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oOgorICAgICAgICAoV2ViQ29yZTo6 U2Nyb2xsYWJsZUFyZWE6OmNvbnN0cmFpbmVkU2Nyb2xsUG9zaXRpb24gY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6U2Nyb2xsYWJsZUFyZWE6OmNvbnN0cmFpblNjcm9sbFBvc2l0aW9uIGNvbnN0 KTogRGVsZXRlZC4KKwogMjAyMS0xMS0yMiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFw cGxlLmNvbT4KIAogICAgICAgICBDbGFyaWZ5IHRoZSBiZWhhdmlvciBvZiBTY3JvbGxBbmltYXRv cjo6c2Nyb2xsKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tleWJvYXJk U2Nyb2xsaW5nQW5pbWF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS2V5Ym9hcmRT Y3JvbGxpbmdBbmltYXRvci5jcHAKaW5kZXggZmQ4MDRhMmU0NmJjYWRiZmVkY2MyODM4ZjVjM2Rl NjE4ZTYxYjM0Yi4uYmQ2NTlhZjM3MjA5YjdmNmY5YWY0YWRjNGNmMGFhMDg1Yzc4ZGEzZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRv ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS2V5Ym9hcmRTY3JvbGxpbmdBbmlt YXRvci5jcHAKQEAgLTEyNCw3ICsxMjQsNyBAQCB2b2lkIEtleWJvYXJkU2Nyb2xsaW5nQW5pbWF0 b3I6OnVwZGF0ZUtleWJvYXJkU2Nyb2xsUG9zaXRpb24oTW9ub3RvbmljVGltZSBjdXJyZQogICAg ICAgICAgICAgZm9yY2Uuc2V0SGVpZ2h0KDApOwogICAgIH0KIAotICAgIFNjcm9sbFBvc2l0aW9u IGlkZWFsUG9zaXRpb24gPSBtX3Njcm9sbEFuaW1hdG9yLnNjcm9sbGFibGVBcmVhKCkuY29uc3Ry YWluU2Nyb2xsUG9zaXRpb24oSW50UG9pbnQobV9jdXJyZW50S2V5Ym9hcmRTY3JvbGwgPyBtX3Nj cm9sbEFuaW1hdG9yLmN1cnJlbnRQb3NpdGlvbigpIDogbV9pZGVhbFBvc2l0aW9uKSk7CisgICAg U2Nyb2xsUG9zaXRpb24gaWRlYWxQb3NpdGlvbiA9IG1fc2Nyb2xsQW5pbWF0b3Iuc2Nyb2xsYWJs ZUFyZWEoKS5jb25zdHJhaW5lZFNjcm9sbFBvc2l0aW9uKEludFBvaW50KG1fY3VycmVudEtleWJv YXJkU2Nyb2xsID8gbV9zY3JvbGxBbmltYXRvci5jdXJyZW50UG9zaXRpb24oKSA6IG1faWRlYWxQ b3NpdGlvbikpOwogICAgIEZsb2F0U2l6ZSBkaXNwbGFjZW1lbnQgPSBtX3Njcm9sbEFuaW1hdG9y LmN1cnJlbnRQb3NpdGlvbigpIC0gaWRlYWxQb3NpdGlvbjsKIAogICAgIGF1dG8gc3ByaW5nRm9y Y2UgPSAtZGlzcGxhY2VtZW50LnNjYWxlZChwYXJhbXMuc3ByaW5nU3RpZmZuZXNzKSAtIG1fdmVs b2NpdHkuc2NhbGVkKHBhcmFtcy5zcHJpbmdEYW1waW5nKTsKQEAgLTMxNyw3ICszMTcsNyBAQCB2 b2lkIEtleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3I6OnN0b3BLZXlib2FyZFNjcm9sbEFuaW1hdGlv bigpCiAgICAgLy8gZm9yIGFuIGluc3RhbnRhbmVvdXMgdGFwLCBtb3ZlIHRoZSBzZXR0bGluZyBw b3NpdGlvbiBvZiB0aGUgc3ByaW5nCiAgICAgLy8gb3V0IHRvIHRoYXQgcG9pbnQuCiAgICAgU2Ny b2xsUG9zaXRpb24gZmFydGhlc3RQb2ludCA9IGZhcnRoZXN0UG9pbnRJbkRpcmVjdGlvbihtX3Nj cm9sbEFuaW1hdG9yLmN1cnJlbnRQb3NpdGlvbigpICsgZGlzcGxhY2VtZW50LCBtX2lkZWFsUG9z aXRpb25Gb3JNaW5pbXVtVHJhdmVsLCBtX2N1cnJlbnRLZXlib2FyZFNjcm9sbC0+ZGlyZWN0aW9u KTsKLSAgICBtX2lkZWFsUG9zaXRpb24gPSBtX3Njcm9sbEFuaW1hdG9yLnNjcm9sbGFibGVBcmVh KCkuY29uc3RyYWluU2Nyb2xsUG9zaXRpb24oZmFydGhlc3RQb2ludCk7CisgICAgbV9pZGVhbFBv c2l0aW9uID0gbV9zY3JvbGxBbmltYXRvci5zY3JvbGxhYmxlQXJlYSgpLmNvbnN0cmFpbmVkU2Ny b2xsUG9zaXRpb24oZmFydGhlc3RQb2ludCk7CiAKICAgICBtX2N1cnJlbnRLZXlib2FyZFNjcm9s bCA9IHN0ZDo6bnVsbG9wdDsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L1Njcm9sbEFuaW1hdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1h dG9yLmNwcAppbmRleCBhYmViYzEzZTA2MWVjYTJhMGVmNWJkZWEyZmY1ZmUwZmMwNjJkZDg2Li5j NDgwNjJmZGEzNTUzMDZmM2Y1NWY2ZmRiMTgyZmMyZmFlNjMxNDdkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3IuY3BwCkBAIC0xMDcsMTMgKzEwNywxNCBAQCBib29s IFNjcm9sbEFuaW1hdG9yOjpzY3JvbGxUb1Bvc2l0aW9uV2l0aG91dEFuaW1hdGlvbihjb25zdCBG bG9hdFBvaW50JiBwb3NpdGlvbgogICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIFNjcm9sbEFu aW1hdG9yOjpzY3JvbGxUb1Bvc2l0aW9uV2l0aEFuaW1hdGlvbihjb25zdCBGbG9hdFBvaW50JiBu ZXdQb3NpdGlvbikKK2Jvb2wgU2Nyb2xsQW5pbWF0b3I6OnNjcm9sbFRvUG9zaXRpb25XaXRoQW5p bWF0aW9uKGNvbnN0IEZsb2F0UG9pbnQmIHBvc2l0aW9uLCBTY3JvbGxDbGFtcGluZyBjbGFtcGlu ZykKIHsKLSAgICBib29sIHBvc2l0aW9uQ2hhbmdlZCA9IG5ld1Bvc2l0aW9uICE9IGN1cnJlbnRQ b3NpdGlvbigpOworICAgIGF1dG8gYWRqdXN0ZWRQb3NpdGlvbiA9IGNsYW1waW5nID09IFNjcm9s bENsYW1waW5nOjpDbGFtcGVkID8gcG9zaXRpb24uY29uc3RyYWluZWRCZXR3ZWVuKHNjcm9sbGFi bGVBcmVhKCkubWluaW11bVNjcm9sbFBvc2l0aW9uKCksIHNjcm9sbGFibGVBcmVhKCkubWF4aW11 bVNjcm9sbFBvc2l0aW9uKCkpIDogcG9zaXRpb247CisgICAgYm9vbCBwb3NpdGlvbkNoYW5nZWQg PSBhZGp1c3RlZFBvc2l0aW9uICE9IGN1cnJlbnRQb3NpdGlvbigpOwogICAgIGlmICghcG9zaXRp b25DaGFuZ2VkICYmICFzY3JvbGxhYmxlQXJlYSgpLnNjcm9sbE9yaWdpbkNoYW5nZWQoKSkKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgcmV0dXJuIG1fc2Nyb2xsQ29udHJvbGxlci5zdGFy dEFuaW1hdGVkU2Nyb2xsVG9EZXN0aW5hdGlvbihvZmZzZXRGcm9tUG9zaXRpb24obV9jdXJyZW50 UG9zaXRpb24pLCBvZmZzZXRGcm9tUG9zaXRpb24obmV3UG9zaXRpb24pKTsKKyAgICByZXR1cm4g bV9zY3JvbGxDb250cm9sbGVyLnN0YXJ0QW5pbWF0ZWRTY3JvbGxUb0Rlc3RpbmF0aW9uKG9mZnNl dEZyb21Qb3NpdGlvbihtX2N1cnJlbnRQb3NpdGlvbiksIG9mZnNldEZyb21Qb3NpdGlvbihhZGp1 c3RlZFBvc2l0aW9uKSk7CiB9CiAKIHZvaWQgU2Nyb2xsQW5pbWF0b3I6OnJldGFyZ2V0UnVubmlu Z0FuaW1hdGlvbihjb25zdCBGbG9hdFBvaW50JiBuZXdQb3NpdGlvbikKQEAgLTMwOSw3ICszMTAs NyBAQCB2b2lkIFNjcm9sbEFuaW1hdG9yOjphZGp1c3RTY3JvbGxQb3NpdGlvblRvQm91bmRzSWZO ZWNlc3NhcnkoKQogICAgIG1fc2Nyb2xsYWJsZUFyZWEuc2V0U2Nyb2xsQ2xhbXBpbmcoU2Nyb2xs Q2xhbXBpbmc6OkNsYW1wZWQpOwogCiAgICAgYXV0byBjdXJyZW50U2Nyb2xsUG9zaXRpb24gPSBt X3Njcm9sbGFibGVBcmVhLnNjcm9sbFBvc2l0aW9uKCk7Ci0gICAgYXV0byBjb25zdHJhaW5lZFBv c2l0aW9uID0gbV9zY3JvbGxhYmxlQXJlYS5jb25zdHJhaW5TY3JvbGxQb3NpdGlvbihjdXJyZW50 U2Nyb2xsUG9zaXRpb24pOworICAgIGF1dG8gY29uc3RyYWluZWRQb3NpdGlvbiA9IG1fc2Nyb2xs YWJsZUFyZWEuY29uc3RyYWluZWRTY3JvbGxQb3NpdGlvbihjdXJyZW50U2Nyb2xsUG9zaXRpb24p OwogICAgIGltbWVkaWF0ZVNjcm9sbEJ5KGNvbnN0cmFpbmVkUG9zaXRpb24gLSBjdXJyZW50U2Ny b2xsUG9zaXRpb24pOwogCiAgICAgbV9zY3JvbGxhYmxlQXJlYS5zZXRTY3JvbGxDbGFtcGluZyhw cmV2aW91c0NsYW1waW5nKTsKQEAgLTMyMCw3ICszMjEsNyBAQCBGbG9hdFBvaW50IFNjcm9sbEFu aW1hdG9yOjphZGp1c3RTY3JvbGxQb3NpdGlvbklmTmVjZXNzYXJ5KGNvbnN0IEZsb2F0UG9pbnQm IHBvcwogICAgIGlmIChtX3Njcm9sbGFibGVBcmVhLnNjcm9sbENsYW1waW5nKCkgPT0gU2Nyb2xs Q2xhbXBpbmc6OlVuY2xhbXBlZCkKICAgICAgICAgcmV0dXJuIHBvc2l0aW9uOwogCi0gICAgcmV0 dXJuIG1fc2Nyb2xsYWJsZUFyZWEuY29uc3RyYWluU2Nyb2xsUG9zaXRpb24oU2Nyb2xsUG9zaXRp b24ocG9zaXRpb24pKTsKKyAgICByZXR1cm4gbV9zY3JvbGxhYmxlQXJlYS5jb25zdHJhaW5lZFNj cm9sbFBvc2l0aW9uKFNjcm9sbFBvc2l0aW9uKHBvc2l0aW9uKSk7CiB9CiAKIHZvaWQgU2Nyb2xs QW5pbWF0b3I6OmltbWVkaWF0ZVNjcm9sbEJ5KGNvbnN0IEZsb2F0U2l6ZSYgZGVsdGEsIFNjcm9s bENsYW1waW5nIGNsYW1waW5nKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v U2Nyb2xsQW5pbWF0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdG9y LmgKaW5kZXggMjI3NDc1N2Q5M2I1N2FlYzljMzJkZjdkMmQwMmEzZWZkMDEzNGM0YS4uZDUyMWVh M2EzNjNhYWViMDFlODdlMjMyZjhmM2NjMjEzM2Y4N2MxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9TY3JvbGxBbmltYXRvci5oCkBAIC03NiwxMyArNzYsMTIgQEAgcHVibGljOgogICAgIC8v IFRoZSBiYXNlIGNsYXNzIGltcGxlbWVudGF0aW9uIGFsd2F5cyBzY3JvbGxzIGltbWVkaWF0ZWx5 LCBuZXZlciBhbmltYXRlcy4KICAgICBib29sIHNpbmdsZUF4aXNTY3JvbGwoU2Nyb2xsRXZlbnRB eGlzLCBmbG9hdCBkZWx0YSwgT3B0aW9uU2V0PFNjcm9sbEJlaGF2aW9yPik7CiAKLSAgICB2aXJ0 dWFsIGJvb2wgc2Nyb2xsVG9Qb3NpdGlvbldpdGhvdXRBbmltYXRpb24oY29uc3QgRmxvYXRQb2lu dCYsIFNjcm9sbENsYW1waW5nID0gU2Nyb2xsQ2xhbXBpbmc6OkNsYW1wZWQpOwotICAgIGJvb2wg c2Nyb2xsVG9Qb3NpdGlvbldpdGhBbmltYXRpb24oY29uc3QgRmxvYXRQb2ludCYpOworICAgIGJv b2wgc2Nyb2xsVG9Qb3NpdGlvbldpdGhvdXRBbmltYXRpb24oY29uc3QgRmxvYXRQb2ludCYsIFNj cm9sbENsYW1waW5nID0gU2Nyb2xsQ2xhbXBpbmc6OkNsYW1wZWQpOworICAgIGJvb2wgc2Nyb2xs VG9Qb3NpdGlvbldpdGhBbmltYXRpb24oY29uc3QgRmxvYXRQb2ludCYsIFNjcm9sbENsYW1waW5n ID0gU2Nyb2xsQ2xhbXBpbmc6OkNsYW1wZWQpOwogCiAgICAgdm9pZCByZXRhcmdldFJ1bm5pbmdB bmltYXRpb24oY29uc3QgRmxvYXRQb2ludCYgbmV3UG9zaXRpb24pOwogCiAgICAgdmlydHVhbCBi b29sIGhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50Jik7Ci0KICAgICB2 aXJ0dWFsIGJvb2wgcHJvY2Vzc1doZWVsRXZlbnRGb3JTY3JvbGxTbmFwKGNvbnN0IFBsYXRmb3Jt V2hlZWxFdmVudCYpIHsgcmV0dXJuIGZhbHNlOyB9CiAKICAgICB2b2lkIHN0b3BLZXlib2FyZFNj cm9sbEFuaW1hdGlvbigpOwpAQCAtOTUsNyArOTQsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBi b29sIGhhbmRsZVRvdWNoRXZlbnQoY29uc3QgUGxhdGZvcm1Ub3VjaEV2ZW50Jik7CiAjZW5kaWYK IAotICAgIHZpcnR1YWwgdm9pZCBjYW5jZWxBbmltYXRpb25zKCk7CisgICAgdm9pZCBjYW5jZWxB bmltYXRpb25zKCk7CiAKICAgICB2aXJ0dWFsIGJvb2wgaXNSdWJiZXJCYW5kSW5Qcm9ncmVzcygp IGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9s bGFibGVBcmVhLmNwcAppbmRleCAxNTVjMDlkMDJjZmRiNDI1YzcxNjk4NzllNjc2YzRkMWU0Mjk4 YjI5Li43YmNjZWJmODBlY2U3ODE0NzAyZmI1MTUxZTRmOTU5NWQ3MWY5OTkyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuY3BwCkBAIC0xNDMsNyArMTQzLDcgQEAg dm9pZCBTY3JvbGxhYmxlQXJlYTo6c2Nyb2xsVG9Qb3NpdGlvbldpdGhBbmltYXRpb24oY29uc3Qg RmxvYXRQb2ludCYgcG9zaXRpb24sIFMKIAogICAgIGJvb2wgc3RhcnRlZEFuaW1hdGlvbiA9IHJl cXVlc3RBbmltYXRlZFNjcm9sbFRvUG9zaXRpb24ocm91bmRlZEludFBvaW50KHBvc2l0aW9uKSwg Y2xhbXBpbmcpOwogICAgIGlmICghc3RhcnRlZEFuaW1hdGlvbikKLSAgICAgICAgc3RhcnRlZEFu aW1hdGlvbiA9IHNjcm9sbEFuaW1hdG9yKCkuc2Nyb2xsVG9Qb3NpdGlvbldpdGhBbmltYXRpb24o cG9zaXRpb24pOworICAgICAgICBzdGFydGVkQW5pbWF0aW9uID0gc2Nyb2xsQW5pbWF0b3IoKS5z Y3JvbGxUb1Bvc2l0aW9uV2l0aEFuaW1hdGlvbihwb3NpdGlvbiwgY2xhbXBpbmcpOwogCiAgICAg aWYgKHN0YXJ0ZWRBbmltYXRpb24pCiAgICAgICAgIHNldFNjcm9sbEFuaW1hdGlvblN0YXR1cyhT Y3JvbGxBbmltYXRpb25TdGF0dXM6OkFuaW1hdGluZyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v U2Nyb2xsYWJsZUFyZWEuaAppbmRleCBjMGI2YTYxZDNhZGM5MDYzNWRiOTVhNjNiZmYwMzkzOTI0 NThjOGQ0Li5hYjc0NWM0YmJhOWYyM2UxOGFiYTNjZjEzNmUzZTkxNTMxMGI5MDUxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmgKQEAgLTIzNiw3ICsyMzYsNyBAQCBw dWJsaWM6CiAgICAgdmlydHVhbCBTY3JvbGxQb3NpdGlvbiBtaW5pbXVtU2Nyb2xsUG9zaXRpb24o KSBjb25zdDsKICAgICB2aXJ0dWFsIFNjcm9sbFBvc2l0aW9uIG1heGltdW1TY3JvbGxQb3NpdGlv bigpIGNvbnN0OwogCi0gICAgU2Nyb2xsUG9zaXRpb24gY29uc3RyYWluU2Nyb2xsUG9zaXRpb24o Y29uc3QgU2Nyb2xsUG9zaXRpb24mIHBvc2l0aW9uKSBjb25zdAorICAgIFNjcm9sbFBvc2l0aW9u IGNvbnN0cmFpbmVkU2Nyb2xsUG9zaXRpb24oY29uc3QgU2Nyb2xsUG9zaXRpb24mIHBvc2l0aW9u KSBjb25zdAogICAgIHsKICAgICAgICAgcmV0dXJuIHBvc2l0aW9uLmNvbnN0cmFpbmVkQmV0d2Vl bihtaW5pbXVtU2Nyb2xsUG9zaXRpb24oKSwgbWF4aW11bVNjcm9sbFBvc2l0aW9uKCkpOwogICAg IH0K