231336 2021-10-06 15:52:47 -0700 Rename the AnimatedScroll enum to ScrollIsAnimated for consistency 2021-10-06 20:55:17 -0700 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser cdumez changseok cmarcelo esprehn+autocc ews-watchlist fred.wang glenn kangil.han kondapallykalyan pdr simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1801392 0 simon.fraser 2021-10-06 15:52:47 -0700 Rename the AnimatedScroll enum to ScrollIsAnimated for consistency 1801393 1 440448 simon.fraser 2021-10-06 15:53:41 -0700 Created attachment 440448 Patch 1801483 2 ews-feeder 2021-10-06 20:54:09 -0700 Committed r283698 (242624@main): <https://commits.webkit.org/242624@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440448. 1801484 3 webkit-bug-importer 2021-10-06 20:55:17 -0700 <rdar://problem/83965277> 440448 2021-10-06 15:53:41 -0700 2021-10-06 20:54:11 -0700 Patch bug-231336-20211006155340.patch text/plain 8651 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNjQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWY4NzYwNzhhNjI1MjBh MmM3MWEyZjFkNzJmMDNlOWE3NmEwNjJlNi4uZjdhYTI2ZjY1ODZhYTlmMmNiOWMyYjI1ZjE2ODkx YWI4YjMyYWY0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIxLTEwLTA2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSB0aGUg QW5pbWF0ZWRTY3JvbGwgZW51bSB0byBTY3JvbGxJc0FuaW1hdGVkIGZvciBjb25zaXN0ZW5jeQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxMzM2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxsIHRoZSBv dGhlciBzY3JvbGwtcmVsYXRlZCBlbnVtcyBzdGFydCB3aXRoICJTY3JvbGwiIHNvIHJlbmFtZSBB bmltYXRlZFNjcm9sbCB0bworICAgICAgICBTY3JvbGxJc0FuaW1hdGVkIHRvIG1hdGNoLCBhbmQg U2Nyb2xsSXNBbmltYXRlZDo6WWVzIGFuZCBTY3JvbGxJc0FuaW1hdGVkOjpObyBiZWNvbWUgbW9y ZQorICAgICAgICByZWFkYWJsZS4KKworICAgICAgICAqIGRvbS9FbGVtZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkVsZW1lbnQ6OnNjcm9sbFRvKToKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1l bnQ6OnNldFNjcm9sbExlZnQpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6c2V0U2Nyb2xs VG9wKToKKyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpE T01XaW5kb3c6OnNjcm9sbFRvIGNvbnN0KToKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnNldFNjcm9sbFBvc2l0aW9uKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9TY3JvbGxUeXBlcy5oOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsUG9z aXRpb25DaGFuZ2VPcHRpb25zOjpjcmVhdGVQcm9ncmFtbWF0aWNXaXRoT3B0aW9ucyk6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxheWVyOjpzY3JvbGxSZWN0VG9WaXNpYmxlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy TGF5ZXJTY3JvbGxhYmxlQXJlYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllclNj cm9sbGFibGVBcmVhOjpzY3JvbGxUb09mZnNldCk6CisKIDIwMjEtMTAtMDYgIFNpbW9uIEZyYXNl ciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBm aXguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9kb20vRWxlbWVudC5jcHAKaW5kZXggZWFkNzI2N2E2OWU3N2YwOTg5ZWVhMTdlZDRj ZTMyM2Y1OGE0ZjVjNi4uYzlmZWRjODE3Zjk1YjZhNTczNDIxZjA2MDIzYmIwOGQzNTJmYmM0MiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9FbGVtZW50LmNwcApAQCAtMTAzNiw3ICsxMDM2LDcgQEAgdm9pZCBFbGVtZW50 OjpzY3JvbGxUbyhjb25zdCBTY3JvbGxUb09wdGlvbnMmIG9wdGlvbnMsIFNjcm9sbENsYW1waW5n IGNsYW1waW5nLAogICAgICAgICBjbGFtcFRvSW50ZWdlcihzY3JvbGxUb09wdGlvbnMudG9wLnZh bHVlKCkgKiByZW5kZXJlci0+c3R5bGUoKS5lZmZlY3RpdmVab29tKCkpCiAgICAgKTsKIAotICAg IGF1dG8gYW5pbWF0ZWQgPSB1c2VTbW9vdGhTY3JvbGxpbmcoc2Nyb2xsVG9PcHRpb25zLmJlaGF2 aW9yLnZhbHVlX29yKFNjcm9sbEJlaGF2aW9yOjpBdXRvKSwgdGhpcykgPyBBbmltYXRlZFNjcm9s bDo6WWVzIDogQW5pbWF0ZWRTY3JvbGw6Ok5vOworICAgIGF1dG8gYW5pbWF0ZWQgPSB1c2VTbW9v dGhTY3JvbGxpbmcoc2Nyb2xsVG9PcHRpb25zLmJlaGF2aW9yLnZhbHVlX29yKFNjcm9sbEJlaGF2 aW9yOjpBdXRvKSwgdGhpcykgPyBTY3JvbGxJc0FuaW1hdGVkOjpZZXMgOiBTY3JvbGxJc0FuaW1h dGVkOjpObzsKICAgICBhdXRvIHNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9ucyA9IFNjcm9sbFBv c2l0aW9uQ2hhbmdlT3B0aW9uczo6Y3JlYXRlUHJvZ3JhbW1hdGljV2l0aE9wdGlvbnMoY2xhbXBp bmcsIGFuaW1hdGVkLCBzbmFwUG9pbnRTZWxlY3Rpb25NZXRob2QpOwogICAgIHJlbmRlcmVyLT5z ZXRTY3JvbGxQb3NpdGlvbihzY3JvbGxQb3NpdGlvbiwgc2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRp b25zKTsKIH0KQEAgLTEzNjUsNyArMTM2NSw3IEBAIHZvaWQgRWxlbWVudDo6c2V0U2Nyb2xsTGVm dChpbnQgbmV3TGVmdCkKICAgICBkb2N1bWVudCgpLnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdT dHlsZXNoZWV0cygpOwogCiAgICAgYXV0byBvcHRpb25zID0gU2Nyb2xsUG9zaXRpb25DaGFuZ2VP cHRpb25zOjpjcmVhdGVQcm9ncmFtbWF0aWMoKTsKLSAgICBvcHRpb25zLmFuaW1hdGVkID0gdXNl U21vb3RoU2Nyb2xsaW5nKFNjcm9sbEJlaGF2aW9yOjpBdXRvLCB0aGlzKSA/IEFuaW1hdGVkU2Ny b2xsOjpZZXMgOiBBbmltYXRlZFNjcm9sbDo6Tm87CisgICAgb3B0aW9ucy5hbmltYXRlZCA9IHVz ZVNtb290aFNjcm9sbGluZyhTY3JvbGxCZWhhdmlvcjo6QXV0bywgdGhpcykgPyBTY3JvbGxJc0Fu aW1hdGVkOjpZZXMgOiBTY3JvbGxJc0FuaW1hdGVkOjpObzsKIAogICAgIGlmIChkb2N1bWVudCgp LnNjcm9sbGluZ0VsZW1lbnQoKSA9PSB0aGlzKSB7CiAgICAgICAgIGlmIChhdXRvKiBmcmFtZSA9 IGRvY3VtZW50RnJhbWVXaXRoTm9uTnVsbFZpZXcoKSkgewpAQCAtMTM4OCw3ICsxMzg4LDcgQEAg dm9pZCBFbGVtZW50OjpzZXRTY3JvbGxUb3AoaW50IG5ld1RvcCkKICAgICBkb2N1bWVudCgpLnVw ZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOwogCiAgICAgYXV0byBvcHRpb25z ID0gU2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zOjpjcmVhdGVQcm9ncmFtbWF0aWMoKTsKLSAg ICBvcHRpb25zLmFuaW1hdGVkID0gdXNlU21vb3RoU2Nyb2xsaW5nKFNjcm9sbEJlaGF2aW9yOjpB dXRvLCB0aGlzKSA/IEFuaW1hdGVkU2Nyb2xsOjpZZXMgOiBBbmltYXRlZFNjcm9sbDo6Tm87Cisg ICAgb3B0aW9ucy5hbmltYXRlZCA9IHVzZVNtb290aFNjcm9sbGluZyhTY3JvbGxCZWhhdmlvcjo6 QXV0bywgdGhpcykgPyBTY3JvbGxJc0FuaW1hdGVkOjpZZXMgOiBTY3JvbGxJc0FuaW1hdGVkOjpO bzsKIAogICAgIGlmIChkb2N1bWVudCgpLnNjcm9sbGluZ0VsZW1lbnQoKSA9PSB0aGlzKSB7CiAg ICAgICAgIGlmIChhdXRvKiBmcmFtZSA9IGRvY3VtZW50RnJhbWVXaXRoTm9uTnVsbFZpZXcoKSkg ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwIGIvU291cmNl L1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCmluZGV4IDJlYjY3NWRjZmM3MjIyOWVhOTQwNzUw NGU4NzcxZjIyOGIxY2I0OGIuLmNmYTJkYzAyMjBlNmZjNjViNmZiZmNiNzk1ZDgwZDk1YTdiZTU4 NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKQEAgLTE3MjEsNyArMTcyMSw3IEBAIHZv aWQgRE9NV2luZG93OjpzY3JvbGxUbyhjb25zdCBTY3JvbGxUb09wdGlvbnMmIG9wdGlvbnMsIFNj cm9sbENsYW1waW5nIGNsYW1waW5nCiAKICAgICAvLyBGSVhNRTogU2hvdWxkIHdlIHVzZSBkb2N1 bWVudCgpLT5zY3JvbGxpbmdFbGVtZW50KCk/CiAgICAgLy8gU2VlIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDUwNTkKLSAgICBhdXRvIGFuaW1hdGVkID0gdXNlU21v b3RoU2Nyb2xsaW5nKHNjcm9sbFRvT3B0aW9ucy5iZWhhdmlvci52YWx1ZV9vcihTY3JvbGxCZWhh dmlvcjo6QXV0byksIGRvY3VtZW50KCktPmRvY3VtZW50RWxlbWVudCgpKSA/IEFuaW1hdGVkU2Ny b2xsOjpZZXMgOiBBbmltYXRlZFNjcm9sbDo6Tm87CisgICAgYXV0byBhbmltYXRlZCA9IHVzZVNt b290aFNjcm9sbGluZyhzY3JvbGxUb09wdGlvbnMuYmVoYXZpb3IudmFsdWVfb3IoU2Nyb2xsQmVo YXZpb3I6OkF1dG8pLCBkb2N1bWVudCgpLT5kb2N1bWVudEVsZW1lbnQoKSkgPyBTY3JvbGxJc0Fu aW1hdGVkOjpZZXMgOiBTY3JvbGxJc0FuaW1hdGVkOjpObzsKICAgICBhdXRvIHNjcm9sbFBvc2l0 aW9uQ2hhbmdlT3B0aW9ucyA9IFNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9uczo6Y3JlYXRlUHJv Z3JhbW1hdGljV2l0aE9wdGlvbnMoY2xhbXBpbmcsIGFuaW1hdGVkLCBzbmFwUG9pbnRTZWxlY3Rp b25NZXRob2QpOwogICAgIHZpZXctPnNldENvbnRlbnRzU2Nyb2xsUG9zaXRpb24obGF5b3V0UG9z LCBzY3JvbGxQb3NpdGlvbkNoYW5nZU9wdGlvbnMpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcu Y3BwCmluZGV4IDE4NzdkY2YxMTZmYWIzNjgxZDZiY2Q2OTk5NzQ1MDBhNGExZDk2ZDAuLjAwZWI1 ZmNjNjM4NDI1Y2NkMzBmODUzOWEwOWM3MGE2ZDY5MTM3YWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5jcHAKQEAgLTIzMjEsNyArMjMyMSw3IEBAIHZvaWQgRnJhbWVWaWV3OjpzZXRTY3JvbGxQ b3NpdGlvbihjb25zdCBTY3JvbGxQb3NpdGlvbiYgc2Nyb2xsUG9zaXRpb24sIGNvbnN0IFNjCiAg ICAgU2Nyb2xsT2Zmc2V0IHNuYXBwZWRPZmZzZXQgPSBjZWlsZWRJbnRQb2ludChzY3JvbGxBbmlt YXRvcigpLnNjcm9sbE9mZnNldEFkanVzdGVkRm9yU25hcHBpbmcoc2Nyb2xsT2Zmc2V0RnJvbVBv c2l0aW9uKHNjcm9sbFBvc2l0aW9uKSwgb3B0aW9ucy5zbmFwUG9pbnRTZWxlY3Rpb25NZXRob2Qp KTsKICAgICBhdXRvIHNuYXBwZWRQb3NpdGlvbiA9IHNjcm9sbFBvc2l0aW9uRnJvbU9mZnNldChz bmFwcGVkT2Zmc2V0KTsKIAotICAgIGlmIChvcHRpb25zLmFuaW1hdGVkID09IEFuaW1hdGVkU2Ny b2xsOjpZZXMpCisgICAgaWYgKG9wdGlvbnMuYW5pbWF0ZWQgPT0gU2Nyb2xsSXNBbmltYXRlZDo6 WWVzKQogICAgICAgICBzY3JvbGxUb1Bvc2l0aW9uV2l0aEFuaW1hdGlvbihzbmFwcGVkUG9zaXRp b24sIGN1cnJlbnRTY3JvbGxUeXBlKCksIG9wdGlvbnMuY2xhbXBpbmcpOwogICAgIGVsc2UKICAg ICAgICAgU2Nyb2xsVmlldzo6c2V0U2Nyb2xsUG9zaXRpb24oc25hcHBlZFBvc2l0aW9uLCBvcHRp b25zKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFR5cGVzLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxUeXBlcy5oCmluZGV4IDdkYzdlNGI0ODcy NmFjMGZkY2I5OGQ1YjRiNjA3NmQyZTMwNTgxZWEuLjNiMTc3YzZkZTRhMzg5N2UyODg3N2Q2MDNj YjU0MDY1YTA2YjNkOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9s bFR5cGVzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVHlwZXMuaApAQCAt NzQsNyArNzQsNyBAQCBlbnVtIGNsYXNzIFNjcm9sbEJlaGF2aW9yU3RhdHVzIDogdWludDhfdCB7 CiAgICAgSW5Ob25OYXRpdmVBbmltYXRpb24sCiB9OwogCi1lbnVtIGNsYXNzIEFuaW1hdGVkU2Ny b2xsIDogdWludDhfdCB7CitlbnVtIGNsYXNzIFNjcm9sbElzQW5pbWF0ZWQgOiB1aW50OF90IHsK ICAgICBObywKICAgICBZZXMKIH07CkBAIC0yNzksNyArMjc5LDcgQEAgc3RydWN0IFNjcm9sbEV4 dGVudHMgewogc3RydWN0IFNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9ucyB7CiAgICAgU2Nyb2xs VHlwZSB0eXBlOwogICAgIFNjcm9sbENsYW1waW5nIGNsYW1waW5nID0gU2Nyb2xsQ2xhbXBpbmc6 OkNsYW1wZWQ7Ci0gICAgQW5pbWF0ZWRTY3JvbGwgYW5pbWF0ZWQgPSBBbmltYXRlZFNjcm9sbDo6 Tm87CisgICAgU2Nyb2xsSXNBbmltYXRlZCBhbmltYXRlZCA9IFNjcm9sbElzQW5pbWF0ZWQ6Ok5v OwogICAgIFNjcm9sbFNuYXBQb2ludFNlbGVjdGlvbk1ldGhvZCBzbmFwUG9pbnRTZWxlY3Rpb25N ZXRob2QgPSBTY3JvbGxTbmFwUG9pbnRTZWxlY3Rpb25NZXRob2Q6OkNsb3Nlc3Q7CiAKICAgICBz dGF0aWMgU2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zIGNyZWF0ZVByb2dyYW1tYXRpYygpCkBA IC0yODcsNyArMjg3LDcgQEAgc3RydWN0IFNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9ucyB7CiAg ICAgICAgIHJldHVybiB7IFNjcm9sbFR5cGU6OlByb2dyYW1tYXRpYyB9OwogICAgIH0KIAotICAg IHN0YXRpYyBTY3JvbGxQb3NpdGlvbkNoYW5nZU9wdGlvbnMgY3JlYXRlUHJvZ3JhbW1hdGljV2l0 aE9wdGlvbnMoU2Nyb2xsQ2xhbXBpbmcgY2xhbXBpbmcsIEFuaW1hdGVkU2Nyb2xsIGFuaW1hdGVk LCBTY3JvbGxTbmFwUG9pbnRTZWxlY3Rpb25NZXRob2Qgc25hcFBvaW50U2VsZWN0aW9uTWV0aG9k KQorICAgIHN0YXRpYyBTY3JvbGxQb3NpdGlvbkNoYW5nZU9wdGlvbnMgY3JlYXRlUHJvZ3JhbW1h dGljV2l0aE9wdGlvbnMoU2Nyb2xsQ2xhbXBpbmcgY2xhbXBpbmcsIFNjcm9sbElzQW5pbWF0ZWQg YW5pbWF0ZWQsIFNjcm9sbFNuYXBQb2ludFNlbGVjdGlvbk1ldGhvZCBzbmFwUG9pbnRTZWxlY3Rp b25NZXRob2QpCiAgICAgewogICAgICAgICByZXR1cm4geyBTY3JvbGxUeXBlOjpQcm9ncmFtbWF0 aWMsIGNsYW1waW5nLCBhbmltYXRlZCwgc25hcFBvaW50U2VsZWN0aW9uTWV0aG9kIH07CiAgICAg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggODE0NWRkNDQ1 YTc1MDE5ODlhYWIzMDFhOTU4YjNjYzQzZjZhYjNhNy4uMzk5Mzk4YWY1ZmIzNTIxYTI1YWFiNzlk MTlhNjFhZmJjZTg5OWU4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu Y3BwCkBAIC0yNDQ0LDcgKzI0NDQsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpzY3JvbGxSZWN0VG9W aXNpYmxlKGNvbnN0IExheW91dFJlY3QmIGFic29sdXRlUmVjdCwgYm9vbCBpbnNpZAogICAgIHsK ICAgICAgICAgYXV0byBzY3JvbGxQb3NpdGlvbk9wdGlvbnMgPSBTY3JvbGxQb3NpdGlvbkNoYW5n ZU9wdGlvbnM6OmNyZWF0ZVByb2dyYW1tYXRpYygpOwogICAgICAgICBpZiAoIXJlbmRlcmVyKCku ZnJhbWUoKS5ldmVudEhhbmRsZXIoKS5hdXRvc2Nyb2xsSW5Qcm9ncmVzcygpICYmIGVsZW1lbnQg JiYgdXNlU21vb3RoU2Nyb2xsaW5nKG9wdGlvbnMuYmVoYXZpb3IsIGVsZW1lbnQpKQotICAgICAg ICAgICAgc2Nyb2xsUG9zaXRpb25PcHRpb25zLmFuaW1hdGVkID0gQW5pbWF0ZWRTY3JvbGw6Olll czsKKyAgICAgICAgICAgIHNjcm9sbFBvc2l0aW9uT3B0aW9ucy5hbmltYXRlZCA9IFNjcm9sbElz QW5pbWF0ZWQ6OlllczsKICAgICAgICAgcmV0dXJuIHNjcm9sbFBvc2l0aW9uT3B0aW9uczsKICAg ICB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJT Y3JvbGxhYmxlQXJlYS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJT Y3JvbGxhYmxlQXJlYS5jcHAKaW5kZXggZTVhOWUyNWZlODBmMDZiNTQ2ZGUyMzgwOGNmYTA5NmJh MTJjNThiNS4uYmQyODQ3NmMyNTI0NjA0ODYwZWVhMjE3OTIwOWFlM2YwNTRjOTg5OSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVB cmVhLmNwcApAQCAtMjY4LDcgKzI2OCw3IEBAIFNjcm9sbE9mZnNldCBSZW5kZXJMYXllclNjcm9s bGFibGVBcmVhOjpzY3JvbGxUb09mZnNldChjb25zdCBTY3JvbGxPZmZzZXQmIHNjcm9sCiAKICAg ICBTY3JvbGxPZmZzZXQgc25hcHBlZE9mZnNldCA9IGNlaWxlZEludFBvaW50KHNjcm9sbEFuaW1h dG9yKCkuc2Nyb2xsT2Zmc2V0QWRqdXN0ZWRGb3JTbmFwcGluZyhjbGFtcGVkU2Nyb2xsT2Zmc2V0 LCBvcHRpb25zLnNuYXBQb2ludFNlbGVjdGlvbk1ldGhvZCkpOwogICAgIGF1dG8gc25hcHBlZFBv c2l0aW9uID0gc2Nyb2xsUG9zaXRpb25Gcm9tT2Zmc2V0KHNuYXBwZWRPZmZzZXQpOwotICAgIGlm IChvcHRpb25zLmFuaW1hdGVkID09IEFuaW1hdGVkU2Nyb2xsOjpZZXMpCisgICAgaWYgKG9wdGlv bnMuYW5pbWF0ZWQgPT0gU2Nyb2xsSXNBbmltYXRlZDo6WWVzKQogICAgICAgICBTY3JvbGxhYmxl QXJlYTo6c2Nyb2xsVG9Qb3NpdGlvbldpdGhBbmltYXRpb24oc25hcHBlZFBvc2l0aW9uKTsKICAg ICBlbHNlIHsKICAgICAgICAgaWYgKCFyZXF1ZXN0U2Nyb2xsUG9zaXRpb25VcGRhdGUoc25hcHBl ZFBvc2l0aW9uLCBvcHRpb25zLnR5cGUsIG9wdGlvbnMuY2xhbXBpbmcpKQo=