223406 2021-03-17 18:08:45 -0700 scroll-snap-stop: always not respected during momentum scrolling 2021-03-19 10:49:16 -0700 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 218115 1 raphael.schaad mrobinson mrobinson simon.fraser webkit-bug-importer oldest_to_newest 1740982 0 423545 raphael.schaad 2021-03-17 18:08:45 -0700 Created attachment 423545 Demonstrates minimum viable snap requirements: paging between colors, aligning to black lines, un-snapped vertical scroll. This is following up on bug 197744 - Implement scroll-snap-stop for scroll snapping. `scroll-snap-stop` doesn't work properly, tested in STP Release 122. Unlike in Chromium, it scrolls past `scroll-snap-stop: always` hard stops. The attached test case is a basic HTML/CSS file that demonstrates minimum viable snap requirements: outer hard snap (paging between colors), inner soft snap (aligning to black lines), un-snapped vertical scroll. This should likely be tracked in meta bug 218115 that tracks the remaining CSS scroll-snap web compatibility issues. 1741093 1 mrobinson 2021-03-18 01:58:17 -0700 Thanks for making this bug report and including a test case. I just want to confirm that you are seeing this issue when scrolling with the trackpad (momentum scrolling). Have you noticed this issue when using other types of scrolling such as via the keyboard or with an attached mouse? 1741205 2 raphael.schaad 2021-03-18 07:57:06 -0700 Seeing this issue when scrolling with the trackpad, keyboard, or mouse. Screencast that demos the supplied test case with all 3 peripherals: https://www.loom.com/share/5f72b8971638480b94660c7f4a032ca2 1741637 3 mrobinson 2021-03-19 02:44:28 -0700 Thanks for the great video! I think there are a few issues here: 1. scroll-snap-stop:mandatory is not working for momentum scrolling. 2. There is a bug which prevents momentum scrolling in the axis that doesn't have scroll snap. This is bug https://bugs.webkit.org/show_bug.cgi?id=213571. 3. Scrolling via the keyboard is not animating. I'm not sure what was causing this, but it seems to be fixed now. It is perhaps related to https://bugs.webkit.org/show_bug.cgi?id=223375. In addition, there is a similar bug for for scrolling overflow: https://bugs.webkit.org/show_bug.cgi?id=220767. I have a fix for the first issue, which I will post shortly. 1741640 4 423708 mrobinson 2021-03-19 02:52:33 -0700 Created attachment 423708 Patch 1741735 5 423708 simon.fraser 2021-03-19 09:25:16 -0700 Comment on attachment 423708 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423708&action=review > LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-stop-momentum-scroll.html:91 > + <div class="color0 colorBox"><div id="console"></div></div> > + <div class="color1 colorBox"></div> > + <div class="color2 colorBox"></div> > + <div class="color3 colorBox"></div> > + <div class="color4 colorBox"></div> > + <div class="color5 colorBox"></div> > + <div class="color0 colorBox"><div id="console"></div></div> Two consoles? 1741747 6 423739 mrobinson 2021-03-19 09:53:43 -0700 Created attachment 423739 Patch 1741759 7 mrobinson 2021-03-19 10:03:42 -0700 (In reply to Simon Fraser (smfr) from comment #5) > Comment on attachment 423708 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=423708&action=review > > > LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-stop-momentum-scroll.html:91 > > + <div class="color0 colorBox"><div id="console"></div></div> > > + <div class="color1 colorBox"></div> > > + <div class="color2 colorBox"></div> > > + <div class="color3 colorBox"></div> > > + <div class="color4 colorBox"></div> > > + <div class="color5 colorBox"></div> > > + <div class="color0 colorBox"><div id="console"></div></div> > > Two consoles? Oof. That is a copy-and-paste error. I'll fix that and land this. Thanks for the review! 1741783 8 ews-feeder 2021-03-19 10:48:14 -0700 Committed r274726: <https://commits.webkit.org/r274726> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423739. 1741784 9 webkit-bug-importer 2021-03-19 10:49:16 -0700 <rdar://problem/75626899> 423545 2021-03-17 18:08:45 -0700 2021-03-17 18:08:45 -0700 Demonstrates minimum viable snap requirements: paging between colors, aligning to black lines, un-snapped vertical scroll. sketch4.html text/html 1424 raphael.schaad PGh0bWw+CiAgPGhlYWQ+CiAgICA8c3R5bGU+CiAgICAgIGJvZHkgewogICAgICAgIG1hcmdpbjog MDsKICAgICAgfQoKICAgICAgLmdyaWQgewogICAgICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKICAg ICAgICBkaXNwbGF5OiBmbGV4OwogICAgICAgIGZsZXgtd3JhcDogbm9uZTsKICAgICAgICB3aWR0 aDogMTAwJTsKICAgICAgICBoZWlnaHQ6IDEwMCU7CiAgICAgICAgb3ZlcmZsb3c6IGF1dG87CiAg ICAgICAgc2Nyb2xsLXNuYXAtdHlwZTogeCBtYW5kYXRvcnk7CiAgICAgIH0KCiAgICAgIC5wYWdl IHsKICAgICAgICBkaXNwbGF5OiBmbGV4OwogICAgICAgIGFsaWduLWl0ZW1zOiBjZW50ZXI7CiAg ICAgICAganVzdGlmeS1jb250ZW50OiBjZW50ZXI7CiAgICAgICAgZmxleC1zaHJpbms6IDA7CiAg ICAgICAgd2lkdGg6IDEwMHZ3OwogICAgICAgIGhlaWdodDogMzAwdmg7CiAgICAgICAgYmFja2dy b3VuZDogcmVkOwogICAgICAgIHNjcm9sbC1zbmFwLWFsaWduOiBzdGFydDsKICAgICAgICBzY3Jv bGwtc25hcC1zdG9wOiBhbHdheXM7CiAgICAgIH0KCiAgICAgIC5wYWdlOm50aC1jaGlsZCgyKSB7 CiAgICAgICAgYmFja2dyb3VuZDogZ3JlZW47CiAgICAgIH0KCiAgICAgIC5wYWdlOm50aC1jaGls ZCgzKSB7CiAgICAgICAgYmFja2dyb3VuZDogYmx1ZTsKICAgICAgfQoKICAgICAgLnBhZ2U6bnRo LWNoaWxkKDQpIHsKICAgICAgICBiYWNrZ3JvdW5kOiBvcmFuZ2U7CiAgICAgIH0KCiAgICAgIC5w YWdlOm50aC1jaGlsZCg1KSB7CiAgICAgICAgYmFja2dyb3VuZDogdmlvbGV0OwogICAgICB9Cgog ICAgICAucGFnZTpudGgtY2hpbGQoNikgewogICAgICAgIGJhY2tncm91bmQ6IHllbGxvdzsKICAg ICAgfQoKICAgICAgLmxpbmUgewogICAgICAgIHdpZHRoOiAzMHB4OwogICAgICAgIGhlaWdodDog OTAlOwogICAgICAgIGJhY2tncm91bmQ6ICMwMDA7CiAgICAgICAgc2Nyb2xsLXNuYXAtYWxpZ246 IHN0YXJ0OwogICAgICB9CiAgICA8L3N0eWxlPgogIDwvaGVhZD4KICA8Ym9keT4KICAgIDxkaXYg Y2xhc3M9ImdyaWQiPgogICAgICA8ZGl2IGNsYXNzPSJwYWdlIj4KICAgICAgICA8ZGl2IGNsYXNz PSJsaW5lIj48L2Rpdj4KICAgICAgPC9kaXY+CiAgICAgIDxkaXYgY2xhc3M9InBhZ2UiPgogICAg ICAgIDxkaXYgY2xhc3M9ImxpbmUiPjwvZGl2PgogICAgICA8L2Rpdj4KICAgICAgPGRpdiBjbGFz cz0icGFnZSI+CiAgICAgICAgPGRpdiBjbGFzcz0ibGluZSI+PC9kaXY+CiAgICAgIDwvZGl2Pgog ICAgICA8ZGl2IGNsYXNzPSJwYWdlIj4KICAgICAgICA8ZGl2IGNsYXNzPSJsaW5lIj48L2Rpdj4K ICAgICAgPC9kaXY+CiAgICAgIDxkaXYgY2xhc3M9InBhZ2UiPgogICAgICAgIDxkaXYgY2xhc3M9 ImxpbmUiPjwvZGl2PgogICAgICA8L2Rpdj4KICAgIDwvZGl2PgogIDwvYm9keT4KPC9odG1sPgo= 423708 2021-03-19 02:52:33 -0700 2021-03-19 09:53:35 -0700 Patch bug-223406-20210319105232.patch text/plain 7819 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjBjZjA5MWEzYmI0ZmJl NGFjNWVlZjVkNzBhMTZmMzdjN2MxMTQ4My4uNjVjOGE3YWFkMmU1ZjQ0OTA3MTc0ZDRkMTVlNzc5 NWY3OWYwMGJiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTE5ICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBzY3JvbGwtc25h cC1zdG9wOiBhbHdheXMgbm90IHJlc3BlY3RlZCBkdXJpbmcgbW9tZW50dW0gc2Nyb2xsaW5nCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjM0MDYKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiB0aWxl ZC1kcmF3aW5nL3Njcm9sbGluZy9zY3JvbGwtc25hcC9zY3JvbGwtc25hcC1zdG9wLW1vbWVudHVt LXNjcm9sbC5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxTbmFwQW5pbWF0b3JTdGF0 ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZTo6dGFyZ2V0 T2Zmc2V0Rm9yU3RhcnRPZmZzZXQgY29uc3QpOiBFbmFibGUgZGlyZWN0aW9uYWwgc2Nyb2xsCisg ICAgICAgIHNuYXBwaW5nIHdoZW4gaGFuZGxpbmcgbW9tZW50dW0gc2Nyb2xsaW5nLiBUaGlzIHR1 cm5zIG9uIHNjcm9sbC1zbmFwLXN0b3AgYXMgd2VsbCBhcyBhIGZldyBvdGhlcgorICAgICAgICBm ZWF0dXJlcy4KKwogMjAyMS0wMy0xNyAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxp YS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjI3MjAxOSk6IE1vbWVudHVtIHNjcm9sbGlu ZyBpbiBwcm94aW1pdHkgY3NzLXNjcm9sbC1zbmFwIHNjcm9sbCBhcmVhcyBicm9rZW4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFNuYXBBbmltYXRvclN0YXRlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFNuYXBBbmltYXRvclN0YXRlLmNwcApp bmRleCBjYmFiNjliMmVmNjA3MjVhMGRiYjViM2NhZTNiZDkyNzZkODIyZWYzLi41N2YyOTlhZDQ1 ZjBmYTE0MzNmNjk2YzdhZTcxNzBiYjNhODE1YzFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9TY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vU2Nyb2xsU25hcEFuaW1hdG9yU3RhdGUuY3BwCkBAIC05OSw3ICs5OSw3IEBA IGZsb2F0IFNjcm9sbFNuYXBBbmltYXRvclN0YXRlOjp0YXJnZXRPZmZzZXRGb3JTdGFydE9mZnNl dChTY3JvbGxFdmVudEF4aXMgYXhpcywKICAgICAgICAgcmV0dXJuIGNsYW1wVG88ZmxvYXQ+KHN0 YXJ0T2Zmc2V0LCAwLCBtYXhTY3JvbGxPZmZzZXQpOwogICAgIH0KIAotICAgIGZsb2F0IHRhcmdl dE9mZnNldCA9IG1fc25hcE9mZnNldHNJbmZvLmNsb3Nlc3RTbmFwT2Zmc2V0KGF4aXMsIExheW91 dFVuaXQocHJlZGljdGVkT2Zmc2V0IC8gcGFnZVNjYWxlKSwgaW5pdGlhbERlbHRhKS5maXJzdDsK KyAgICBmbG9hdCB0YXJnZXRPZmZzZXQgPSBtX3NuYXBPZmZzZXRzSW5mby5jbG9zZXN0U25hcE9m ZnNldChheGlzLCBMYXlvdXRVbml0KHByZWRpY3RlZE9mZnNldCAvIHBhZ2VTY2FsZSksIGluaXRp YWxEZWx0YSwgTGF5b3V0VW5pdChzdGFydE9mZnNldCAvIHBhZ2VTY2FsZSkpLmZpcnN0OwogICAg IGZsb2F0IG1pbmltdW1UYXJnZXRPZmZzZXQgPSBzdGQ6Om1heDxmbG9hdD4oMCwgc25hcE9mZnNl dHMuZmlyc3QoKS5vZmZzZXQpOwogICAgIGZsb2F0IG1heGltdW1UYXJnZXRPZmZzZXQgPSBzdGQ6 Om1pbjxmbG9hdD4obWF4U2Nyb2xsT2Zmc2V0LCBzbmFwT2Zmc2V0cy5sYXN0KCkub2Zmc2V0KTsK ICAgICB0YXJnZXRPZmZzZXQgPSBjbGFtcFRvPGZsb2F0Pih0YXJnZXRPZmZzZXQsIG1pbmltdW1U YXJnZXRPZmZzZXQsIG1heGltdW1UYXJnZXRPZmZzZXQpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDExYWYwNjAyYjdkYzQw YTJiZjFiYWU0OTk3ZThjZjhjNmYyNjEzN2EuLmMwODcxMWViZTk2OGQ4YzEzNzEyMGJiYmI1ZGQz YTZlNTA4MmIwZDEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0wMy0xOSAgTWFydGluIFJv Ymluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgc2Nyb2xsLXNuYXAtc3Rv cDogYWx3YXlzIG5vdCByZXNwZWN0ZWQgZHVyaW5nIG1vbWVudHVtIHNjcm9sbGluZworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzNDA2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB0aWxlZC1kcmF3aW5n L3Njcm9sbGluZy9zY3JvbGwtc25hcC9zY3JvbGwtc25hcC1zdG9wLW1vbWVudHVtLXNjcm9sbC1l eHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHRpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Nj cm9sbC1zbmFwL3Njcm9sbC1zbmFwLXN0b3AtbW9tZW50dW0tc2Nyb2xsLmh0bWw6IEFkZGVkLgor CiAyMDIxLTAzLTE3ICBQZW5nIExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CiAKICAgICAgICAg W0dQVVBdIFNvbWUgbWVkaWEtc291cmNlIHRlc3RzIGZhaWwvdGltZW91dCB3aGVuIG1lZGlhIGlu IEdQVSBQcm9jZXNzIGlzIGVuYWJsZWQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3RpbGVkLWRy YXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLXN0b3AtbW9tZW50dW0tc2Ny b2xsLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Nj cm9sbC1zbmFwL3Njcm9sbC1zbmFwLXN0b3AtbW9tZW50dW0tc2Nyb2xsLWV4cGVjdGVkLnR4dApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi4zMTg2OTQyNzMyYzNhNWMzZGY5MjMyNzE3YmZlNjQxMGY3NzQ4YTQ4Ci0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xs LXNuYXAvc2Nyb2xsLXNuYXAtc3RvcC1tb21lbnR1bS1zY3JvbGwtZXhwZWN0ZWQudHh0CkBAIC0w LDAgKzEsNiBAQAorUEFTUyBkaWQgbm90IGdsaWRlIHBhc3QgZmlyc3Qgc2Nyb2xsIHNuYXAgc3Rv cC4KK1BBU1MgZGlkIG5vdCBnbGlkZSBwYXN0IHNlY29uZCBzY3JvbGwgc25hcCBzdG9wLgorUEFT UyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9s bC1zbmFwLXN0b3AtbW9tZW50dW0tc2Nyb2xsLmh0bWwgYi9MYXlvdXRUZXN0cy90aWxlZC1kcmF3 aW5nL3Njcm9sbGluZy9zY3JvbGwtc25hcC9zY3JvbGwtc25hcC1zdG9wLW1vbWVudHVtLXNjcm9s bC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLjQwNzRjODQ0MzY5OWZlYWRjNTQzOTgxNGNmMTA3NjE1NzgzZGFh YTUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy90aWxlZC1kcmF3aW5nL3Njcm9sbGlu Zy9zY3JvbGwtc25hcC9zY3JvbGwtc25hcC1zdG9wLW1vbWVudHVtLXNjcm9sbC5odG1sCkBAIC0w LDAgKzEsOTggQEAKKzwhRE9DVFlQRSBIVE1MPgorPGh0bWw+CisgICAgPGhlYWQ+CisgICAgICAg IDxzdHlsZT4KKyAgICAgICAgICAgIGh0bWwgeworICAgICAgICAgICAgICAgIHNjcm9sbC1zbmFw LXR5cGU6IHkgbWFuZGF0b3J5OworICAgICAgICAgICAgfQorICAgICAgICAgICAgLnZlcnRpY2Fs R2FsbGVyeSB7CisgICAgICAgICAgICAgICAgd2lkdGg6IDEwMHZ3OworICAgICAgICAgICAgICAg IGhlaWdodDogNjAwdmg7CisgICAgICAgICAgICAgICAgbWFyZ2luOiAwOworICAgICAgICAgICAg ICAgIHBhZGRpbmc6IDA7CisgICAgICAgICAgICB9CisgICAgICAgICAgICAuY29sb3JCb3ggewor ICAgICAgICAgICAgICAgIGhlaWdodDogMjAwcHg7CisgICAgICAgICAgICAgICAgd2lkdGg6IDEw MHZ3OworICAgICAgICAgICAgICAgIGZsb2F0OiBsZWZ0OworICAgICAgICAgICAgICAgIHNjcm9s bC1zbmFwLWFsaWduOiBzdGFydDsKKyAgICAgICAgICAgICAgICBzY3JvbGwtc25hcC1zdG9wOiBh bHdheXM7CisgICAgICAgICAgICB9CisgICAgICAgICAgICAuY29sb3IwIHsgYmFja2dyb3VuZC1j b2xvcjogcmVkOyB9CisgICAgICAgICAgICAuY29sb3IxIHsgYmFja2dyb3VuZC1jb2xvcjogZ3Jl ZW47IH0KKyAgICAgICAgICAgIC5jb2xvcjIgeyBiYWNrZ3JvdW5kLWNvbG9yOiBibHVlOyB9Cisg ICAgICAgICAgICAuY29sb3IzIHsgYmFja2dyb3VuZC1jb2xvcjogYXF1YTsgfQorICAgICAgICAg ICAgLmNvbG9yNCB7IGJhY2tncm91bmQtY29sb3I6IHllbGxvdzsgfQorICAgICAgICAgICAgLmNv bG9yNSB7IGJhY2tncm91bmQtY29sb3I6IGZ1Y2hzaWE7IH0KKyAgICAgICAgPC9zdHlsZT4KKyAg ICAgICAgPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LmpzIj48L3Njcmlw dD4KKyAgICAgICAgPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy91aS1oZWxwZXIuanMi Pjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz0icmVzb3VyY2VzL21haW5mcmFtZS1zY3Jv bGwtc25hcC10ZXN0LmpzIj48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdD4KKyAgICAgICAgd2lu ZG93LmpzVGVzdElzQXN5bmMgPSB0cnVlOworCisgICAgICAgIGFzeW5jIGZ1bmN0aW9uIHJ1blRl c3RzKCkKKyAgICAgICAgeworICAgICAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgICAgICBsZXQg c2Nyb2xsTW90aW9uc0ZvckxhcmdlU2Nyb2xsR2xpZGUgPSBbCisgICAgICAgICAgICAgICAgICAg IFstMSwgLTEsICdiZWdhbicsICdub25lJ10sCisgICAgICAgICAgICAgICAgICAgIFstMSwgLTEs ICdjaGFuZ2VkJywgJ25vbmUnXSwKKyAgICAgICAgICAgICAgICAgICAgWy0xLCAtMSwgJ2NoYW5n ZWQnLCAnbm9uZSddLAorICAgICAgICAgICAgICAgICAgICBbLTEsIC0xLCAnY2hhbmdlZCcsICdu b25lJ10sCisgICAgICAgICAgICAgICAgICAgIFstMSwgLTEsICdjaGFuZ2VkJywgJ25vbmUnXSwK KyAgICAgICAgICAgICAgICAgICAgWy0xLCAtMSwgJ2NoYW5nZWQnLCAnbm9uZSddLAorICAgICAg ICAgICAgICAgICAgICBbLTEsIC0xLCAnY2hhbmdlZCcsICdub25lJ10sCisgICAgICAgICAgICAg ICAgICAgIFstMSwgLTEsICdjaGFuZ2VkJywgJ25vbmUnXSwKKyAgICAgICAgICAgICAgICAgICAg Wy0xLCAtMSwgJ2NoYW5nZWQnLCAnbm9uZSddLAorICAgICAgICAgICAgICAgICAgICBbLTEsIC0x LCAnY2hhbmdlZCcsICdub25lJ10sCisgICAgICAgICAgICAgICAgICAgIFstMSwgLTEsICdjaGFu Z2VkJywgJ25vbmUnXSwKKyAgICAgICAgICAgICAgICAgICAgWy0xLCAtMSwgJ2NoYW5nZWQnLCAn bm9uZSddLAorICAgICAgICAgICAgICAgICAgICBbLTEsIC0xLCAnY2hhbmdlZCcsICdub25lJ10s CisgICAgICAgICAgICAgICAgICAgIFswLCAwLCAnZW5kZWQnLCAnbm9uZSddLAorICAgICAgICAg ICAgICAgICAgICBbLTEsIC0xLCAnbm9uZScsICdiZWdpbiddLAorICAgICAgICAgICAgICAgICAg ICBbLTEsIC0xLCAnbm9uZScsICdjb250aW51ZSddLAorICAgICAgICAgICAgICAgICAgICBbMCwg MCwgJ25vbmUnLCAnZW5kJ10sCisgICAgICAgICAgICAgICAgXTsKKworICAgICAgICAgICAgICAg IGF3YWl0IFVJSGVscGVyLmRlbGF5Rm9yKDApOworICAgICAgICAgICAgICAgIGF3YWl0IGRvU2Ny b2xsR2xpZGUoZG9jdW1lbnQuc2Nyb2xsaW5nRWxlbWVudCwgVkVSVElDQUwpOworICAgICAgICAg ICAgICAgIGV4cGVjdFRydWUoZG9jdW1lbnQuc2Nyb2xsaW5nRWxlbWVudC5zY3JvbGxUb3AgPT0g MjAwLCAiZGlkIG5vdCBnbGlkZSBwYXN0IGZpcnN0IHNjcm9sbCBzbmFwIHN0b3AuIik7CisKKyAg ICAgICAgICAgICAgICBhd2FpdCBVSUhlbHBlci5kZWxheUZvcigwKTsKKyAgICAgICAgICAgICAg ICBhd2FpdCBkb1Njcm9sbEdsaWRlKGRvY3VtZW50LnNjcm9sbGluZ0VsZW1lbnQsIFZFUlRJQ0FM KTsKKyAgICAgICAgICAgICAgICBleHBlY3RUcnVlKGRvY3VtZW50LnNjcm9sbGluZ0VsZW1lbnQu c2Nyb2xsVG9wID09IDQwMCwgImRpZCBub3QgZ2xpZGUgcGFzdCBzZWNvbmQgc2Nyb2xsIHNuYXAg c3RvcC4iKTsKKyAgICAgICAgICAgIH0gY2F0Y2ggKGUpIHsKKyAgICAgICAgICAgICAgICBjb25z b2xlLmxvZyhlKTsKKyAgICAgICAgICAgIH0gZmluYWxseSB7CisgICAgICAgICAgICAgICAgZmlu aXNoSlNUZXN0KCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlv biBvbkxvYWQoKQorICAgICAgICB7CisgICAgICAgICAgICBpZiAod2luZG93LmV2ZW50U2VuZGVy KSB7CisgICAgICAgICAgICAgICAgaW50ZXJuYWxzLnNldFBsYXRmb3JtTW9tZW50dW1TY3JvbGxp bmdQcmVkaWN0aW9uRW5hYmxlZChmYWxzZSk7CisgICAgICAgICAgICAgICAgcnVuVGVzdHMoKTsK KyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgdmFyIG1lc3NhZ2VMb2NhdGlv biA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdjb25zb2xlJyk7CisgICAgICAgICAgICAgICAg bWVzc2FnZUxvY2F0aW9uLmlubmVySFRNTCA9ICI8cD5UbyBydW4gdGhpcyB0ZXN0IG1hbnVhbGx5 IGRvIGEgZmFzdCB2ZXJ0aWNhbCBtb21lbnR1bSBzY3JvbGwuICIKKyAgICAgICAgICAgICAgICAg ICAgKyAiU2Nyb2xpbmcgc2hvdWxkIHNuYXAgdG8gZWFjaCBibG9jaywgcmVnYXJkbGVzcyBvZiBo b3cgZmFzdCB0aGUgc2Nyb2xsIGlzLjxwPiI7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAg ICAgICAgPC9zY3JpcHQ+CisgICAgPC9oZWFkPgorICAgIDxib2R5IG9ubG9hZD0ib25Mb2FkKCk7 IiBjbGFzcz0idmVydGljYWxHYWxsZXJ5Ij4KKyAgICAgICAgPGRpdiBjbGFzcz0iY29sb3IwIGNv bG9yQm94Ij48ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFz cz0iY29sb3IxIGNvbG9yQm94Ij48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0iY29sb3IyIGNv bG9yQm94Ij48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0iY29sb3IzIGNvbG9yQm94Ij48L2Rp dj4KKyAgICAgICAgPGRpdiBjbGFzcz0iY29sb3I0IGNvbG9yQm94Ij48L2Rpdj4KKyAgICAgICAg PGRpdiBjbGFzcz0iY29sb3I1IGNvbG9yQm94Ij48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0i Y29sb3IwIGNvbG9yQm94Ij48ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj48L2Rpdj4KKyAgICAgICAg PGRpdiBjbGFzcz0iY29sb3IxIGNvbG9yQm94Ij48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0i Y29sb3IyIGNvbG9yQm94Ij48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0iY29sb3IzIGNvbG9y Qm94Ij48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0iY29sb3I0IGNvbG9yQm94Ij48L2Rpdj4K KyAgICAgICAgPGRpdiBjbGFzcz0iY29sb3I1IGNvbG9yQm94Ij48L2Rpdj4KKyAgICA8L2JvZHk+ Cis8L2h0bWw+Cg== 423739 2021-03-19 09:53:43 -0700 2021-03-19 10:48:15 -0700 Patch bug-223406-20210319175341.patch text/plain 7791 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjBjZjA5MWEzYmI0ZmJl NGFjNWVlZjVkNzBhMTZmMzdjN2MxMTQ4My4uNjY3YWYxZjQ4NTM5MmJhYmY2YjhhYjZlYzI4OWIx YWRkNTE4YmQ1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTE5ICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBzY3JvbGwtc25h cC1zdG9wOiBhbHdheXMgbm90IHJlc3BlY3RlZCBkdXJpbmcgbW9tZW50dW0gc2Nyb2xsaW5nCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjM0MDYKKwor ICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgVGVzdDogdGlsZWQt ZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtc3RvcC1tb21lbnR1bS1z Y3JvbGwuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsU25hcEFuaW1hdG9yU3RhdGUu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsU25hcEFuaW1hdG9yU3RhdGU6OnRhcmdldE9m ZnNldEZvclN0YXJ0T2Zmc2V0IGNvbnN0KTogRW5hYmxlIGRpcmVjdGlvbmFsIHNjcm9sbAorICAg ICAgICBzbmFwcGluZyB3aGVuIGhhbmRsaW5nIG1vbWVudHVtIHNjcm9sbGluZy4gVGhpcyB0dXJu cyBvbiBzY3JvbGwtc25hcC1zdG9wIGFzIHdlbGwgYXMgYSBmZXcgb3RoZXIKKyAgICAgICAgZmVh dHVyZXMuCisKIDIwMjEtMDMtMTcgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEu Y29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyNzIwMTkpOiBNb21lbnR1bSBzY3JvbGxpbmcg aW4gcHJveGltaXR5IGNzcy1zY3JvbGwtc25hcCBzY3JvbGwgYXJlYXMgYnJva2VuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZS5jcHAKaW5k ZXggY2JhYjY5YjJlZjYwNzI1YTBkYmI1YjNjYWUzYmQ5Mjc2ZDgyMmVmMy4uNTdmMjk5YWQ0NWYw ZmExNDMzZjY5NmM3YWU3MTcwYmIzYTgxNWMxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsU25hcEFuaW1hdG9yU3RhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL1Njcm9sbFNuYXBBbmltYXRvclN0YXRlLmNwcApAQCAtOTksNyArOTksNyBAQCBm bG9hdCBTY3JvbGxTbmFwQW5pbWF0b3JTdGF0ZTo6dGFyZ2V0T2Zmc2V0Rm9yU3RhcnRPZmZzZXQo U2Nyb2xsRXZlbnRBeGlzIGF4aXMsCiAgICAgICAgIHJldHVybiBjbGFtcFRvPGZsb2F0PihzdGFy dE9mZnNldCwgMCwgbWF4U2Nyb2xsT2Zmc2V0KTsKICAgICB9CiAKLSAgICBmbG9hdCB0YXJnZXRP ZmZzZXQgPSBtX3NuYXBPZmZzZXRzSW5mby5jbG9zZXN0U25hcE9mZnNldChheGlzLCBMYXlvdXRV bml0KHByZWRpY3RlZE9mZnNldCAvIHBhZ2VTY2FsZSksIGluaXRpYWxEZWx0YSkuZmlyc3Q7Cisg ICAgZmxvYXQgdGFyZ2V0T2Zmc2V0ID0gbV9zbmFwT2Zmc2V0c0luZm8uY2xvc2VzdFNuYXBPZmZz ZXQoYXhpcywgTGF5b3V0VW5pdChwcmVkaWN0ZWRPZmZzZXQgLyBwYWdlU2NhbGUpLCBpbml0aWFs RGVsdGEsIExheW91dFVuaXQoc3RhcnRPZmZzZXQgLyBwYWdlU2NhbGUpKS5maXJzdDsKICAgICBm bG9hdCBtaW5pbXVtVGFyZ2V0T2Zmc2V0ID0gc3RkOjptYXg8ZmxvYXQ+KDAsIHNuYXBPZmZzZXRz LmZpcnN0KCkub2Zmc2V0KTsKICAgICBmbG9hdCBtYXhpbXVtVGFyZ2V0T2Zmc2V0ID0gc3RkOjpt aW48ZmxvYXQ+KG1heFNjcm9sbE9mZnNldCwgc25hcE9mZnNldHMubGFzdCgpLm9mZnNldCk7CiAg ICAgdGFyZ2V0T2Zmc2V0ID0gY2xhbXBUbzxmbG9hdD4odGFyZ2V0T2Zmc2V0LCBtaW5pbXVtVGFy Z2V0T2Zmc2V0LCBtYXhpbXVtVGFyZ2V0T2Zmc2V0KTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAxMWFmMDYwMmI3ZGM0MGEy YmYxYmFlNDk5N2U4Y2Y4YzZmMjYxMzdhLi5kZWEyOTBmM2EzMjMyNGNmOTE4ZmI4MDZiMmYyN2Jh MjhmZDA5ODFmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMDMtMTkgIE1hcnRpbiBSb2Jp bnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIHNjcm9sbC1zbmFwLXN0b3A6 IGFsd2F5cyBub3QgcmVzcGVjdGVkIGR1cmluZyBtb21lbnR1bSBzY3JvbGxpbmcKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzQwNgorCisgICAgICAg IFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAgICAgICAqIHRpbGVkLWRyYXdpbmcvc2Ny b2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLXN0b3AtbW9tZW50dW0tc2Nyb2xsLWV4cGVj dGVkLnR4dDogQWRkZWQuCisgICAgICAgICogdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xs LXNuYXAvc2Nyb2xsLXNuYXAtc3RvcC1tb21lbnR1bS1zY3JvbGwuaHRtbDogQWRkZWQuCisKIDIw MjEtMDMtMTcgIFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BV UF0gU29tZSBtZWRpYS1zb3VyY2UgdGVzdHMgZmFpbC90aW1lb3V0IHdoZW4gbWVkaWEgaW4gR1BV IFByb2Nlc3MgaXMgZW5hYmxlZApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvdGlsZWQtZHJhd2lu Zy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtc3RvcC1tb21lbnR1bS1zY3JvbGwt ZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xs LXNuYXAvc2Nyb2xsLXNuYXAtc3RvcC1tb21lbnR1bS1zY3JvbGwtZXhwZWN0ZWQudHh0Cm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAuLjMxODY5NDI3MzJjM2E1YzNkZjkyMzI3MTdiZmU2NDEwZjc3NDhhNDgKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy90aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9zY3JvbGwtc25h cC9zY3JvbGwtc25hcC1zdG9wLW1vbWVudHVtLXNjcm9sbC1leHBlY3RlZC50eHQKQEAgLTAsMCAr MSw2IEBACitQQVNTIGRpZCBub3QgZ2xpZGUgcGFzdCBmaXJzdCBzY3JvbGwgc25hcCBzdG9wLgor UEFTUyBkaWQgbm90IGdsaWRlIHBhc3Qgc2Vjb25kIHNjcm9sbCBzbmFwIHN0b3AuCitQQVNTIHN1 Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNu YXAtc3RvcC1tb21lbnR1bS1zY3JvbGwuaHRtbCBiL0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcv c2Nyb2xsaW5nL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLXN0b3AtbW9tZW50dW0tc2Nyb2xsLmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uYWRjMGIwZWQ0ODBmYzdjODYyNmJiNDZlZWJjOWMzZWNhY2JlNGE3MAot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Nj cm9sbC1zbmFwL3Njcm9sbC1zbmFwLXN0b3AtbW9tZW50dW0tc2Nyb2xsLmh0bWwKQEAgLTAsMCAr MSw5OCBAQAorPCFET0NUWVBFIEhUTUw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPHN0 eWxlPgorICAgICAgICAgICAgaHRtbCB7CisgICAgICAgICAgICAgICAgc2Nyb2xsLXNuYXAtdHlw ZTogeSBtYW5kYXRvcnk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICAudmVydGljYWxHYWxs ZXJ5IHsKKyAgICAgICAgICAgICAgICB3aWR0aDogMTAwdnc7CisgICAgICAgICAgICAgICAgaGVp Z2h0OiA2MDB2aDsKKyAgICAgICAgICAgICAgICBtYXJnaW46IDA7CisgICAgICAgICAgICAgICAg cGFkZGluZzogMDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIC5jb2xvckJveCB7CisgICAg ICAgICAgICAgICAgaGVpZ2h0OiAyMDBweDsKKyAgICAgICAgICAgICAgICB3aWR0aDogMTAwdnc7 CisgICAgICAgICAgICAgICAgZmxvYXQ6IGxlZnQ7CisgICAgICAgICAgICAgICAgc2Nyb2xsLXNu YXAtYWxpZ246IHN0YXJ0OworICAgICAgICAgICAgICAgIHNjcm9sbC1zbmFwLXN0b3A6IGFsd2F5 czsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIC5jb2xvcjAgeyBiYWNrZ3JvdW5kLWNvbG9y OiByZWQ7IH0KKyAgICAgICAgICAgIC5jb2xvcjEgeyBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsg fQorICAgICAgICAgICAgLmNvbG9yMiB7IGJhY2tncm91bmQtY29sb3I6IGJsdWU7IH0KKyAgICAg ICAgICAgIC5jb2xvcjMgeyBiYWNrZ3JvdW5kLWNvbG9yOiBhcXVhOyB9CisgICAgICAgICAgICAu Y29sb3I0IHsgYmFja2dyb3VuZC1jb2xvcjogeWVsbG93OyB9CisgICAgICAgICAgICAuY29sb3I1 IHsgYmFja2dyb3VuZC1jb2xvcjogZnVjaHNpYTsgfQorICAgICAgICA8L3N0eWxlPgorICAgICAg ICA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QuanMiPjwvc2NyaXB0Pgor ICAgICAgICA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL3VpLWhlbHBlci5qcyI+PC9z Y3JpcHQ+CisgICAgICAgIDxzY3JpcHQgc3JjPSJyZXNvdXJjZXMvbWFpbmZyYW1lLXNjcm9sbC1z bmFwLXRlc3QuanMiPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0PgorICAgICAgICB3aW5kb3cu anNUZXN0SXNBc3luYyA9IHRydWU7CisKKyAgICAgICAgYXN5bmMgZnVuY3Rpb24gcnVuVGVzdHMo KQorICAgICAgICB7CisgICAgICAgICAgICB0cnkgeworICAgICAgICAgICAgICAgIGxldCBzY3Jv bGxNb3Rpb25zRm9yTGFyZ2VTY3JvbGxHbGlkZSA9IFsKKyAgICAgICAgICAgICAgICAgICAgWy0x LCAtMSwgJ2JlZ2FuJywgJ25vbmUnXSwKKyAgICAgICAgICAgICAgICAgICAgWy0xLCAtMSwgJ2No YW5nZWQnLCAnbm9uZSddLAorICAgICAgICAgICAgICAgICAgICBbLTEsIC0xLCAnY2hhbmdlZCcs ICdub25lJ10sCisgICAgICAgICAgICAgICAgICAgIFstMSwgLTEsICdjaGFuZ2VkJywgJ25vbmUn XSwKKyAgICAgICAgICAgICAgICAgICAgWy0xLCAtMSwgJ2NoYW5nZWQnLCAnbm9uZSddLAorICAg ICAgICAgICAgICAgICAgICBbLTEsIC0xLCAnY2hhbmdlZCcsICdub25lJ10sCisgICAgICAgICAg ICAgICAgICAgIFstMSwgLTEsICdjaGFuZ2VkJywgJ25vbmUnXSwKKyAgICAgICAgICAgICAgICAg ICAgWy0xLCAtMSwgJ2NoYW5nZWQnLCAnbm9uZSddLAorICAgICAgICAgICAgICAgICAgICBbLTEs IC0xLCAnY2hhbmdlZCcsICdub25lJ10sCisgICAgICAgICAgICAgICAgICAgIFstMSwgLTEsICdj aGFuZ2VkJywgJ25vbmUnXSwKKyAgICAgICAgICAgICAgICAgICAgWy0xLCAtMSwgJ2NoYW5nZWQn LCAnbm9uZSddLAorICAgICAgICAgICAgICAgICAgICBbLTEsIC0xLCAnY2hhbmdlZCcsICdub25l J10sCisgICAgICAgICAgICAgICAgICAgIFstMSwgLTEsICdjaGFuZ2VkJywgJ25vbmUnXSwKKyAg ICAgICAgICAgICAgICAgICAgWzAsIDAsICdlbmRlZCcsICdub25lJ10sCisgICAgICAgICAgICAg ICAgICAgIFstMSwgLTEsICdub25lJywgJ2JlZ2luJ10sCisgICAgICAgICAgICAgICAgICAgIFst MSwgLTEsICdub25lJywgJ2NvbnRpbnVlJ10sCisgICAgICAgICAgICAgICAgICAgIFswLCAwLCAn bm9uZScsICdlbmQnXSwKKyAgICAgICAgICAgICAgICBdOworCisgICAgICAgICAgICAgICAgYXdh aXQgVUlIZWxwZXIuZGVsYXlGb3IoMCk7CisgICAgICAgICAgICAgICAgYXdhaXQgZG9TY3JvbGxH bGlkZShkb2N1bWVudC5zY3JvbGxpbmdFbGVtZW50LCBWRVJUSUNBTCk7CisgICAgICAgICAgICAg ICAgZXhwZWN0VHJ1ZShkb2N1bWVudC5zY3JvbGxpbmdFbGVtZW50LnNjcm9sbFRvcCA9PSAyMDAs ICJkaWQgbm90IGdsaWRlIHBhc3QgZmlyc3Qgc2Nyb2xsIHNuYXAgc3RvcC4iKTsKKworICAgICAg ICAgICAgICAgIGF3YWl0IFVJSGVscGVyLmRlbGF5Rm9yKDApOworICAgICAgICAgICAgICAgIGF3 YWl0IGRvU2Nyb2xsR2xpZGUoZG9jdW1lbnQuc2Nyb2xsaW5nRWxlbWVudCwgVkVSVElDQUwpOwor ICAgICAgICAgICAgICAgIGV4cGVjdFRydWUoZG9jdW1lbnQuc2Nyb2xsaW5nRWxlbWVudC5zY3Jv bGxUb3AgPT0gNDAwLCAiZGlkIG5vdCBnbGlkZSBwYXN0IHNlY29uZCBzY3JvbGwgc25hcCBzdG9w LiIpOworICAgICAgICAgICAgfSBjYXRjaCAoZSkgeworICAgICAgICAgICAgICAgIGNvbnNvbGUu bG9nKGUpOworICAgICAgICAgICAgfSBmaW5hbGx5IHsKKyAgICAgICAgICAgICAgICBmaW5pc2hK U1Rlc3QoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorCisgICAgICAgIGZ1bmN0aW9uIG9u TG9hZCgpCisgICAgICAgIHsKKyAgICAgICAgICAgIGlmICh3aW5kb3cuZXZlbnRTZW5kZXIpIHsK KyAgICAgICAgICAgICAgICBpbnRlcm5hbHMuc2V0UGxhdGZvcm1Nb21lbnR1bVNjcm9sbGluZ1By ZWRpY3Rpb25FbmFibGVkKGZhbHNlKTsKKyAgICAgICAgICAgICAgICBydW5UZXN0cygpOworICAg ICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICB2YXIgbWVzc2FnZUxvY2F0aW9uID0g ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2NvbnNvbGUnKTsKKyAgICAgICAgICAgICAgICBtZXNz YWdlTG9jYXRpb24uaW5uZXJIVE1MID0gIjxwPlRvIHJ1biB0aGlzIHRlc3QgbWFudWFsbHkgZG8g YSBmYXN0IHZlcnRpY2FsIG1vbWVudHVtIHNjcm9sbC4gIgorICAgICAgICAgICAgICAgICAgICAr ICJTY3JvbGluZyBzaG91bGQgc25hcCB0byBlYWNoIGJsb2NrLCByZWdhcmRsZXNzIG9mIGhvdyBm YXN0IHRoZSBzY3JvbGwgaXMuPHA+IjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAg ICA8L3NjcmlwdD4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHkgb25sb2FkPSJvbkxvYWQoKTsiIGNs YXNzPSJ2ZXJ0aWNhbEdhbGxlcnkiPgorICAgICAgICA8ZGl2IGNsYXNzPSJjb2xvcjAgY29sb3JC b3giPjxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PjwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJj b2xvcjEgY29sb3JCb3giPjwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJjb2xvcjIgY29sb3JC b3giPjwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJjb2xvcjMgY29sb3JCb3giPjwvZGl2Pgor ICAgICAgICA8ZGl2IGNsYXNzPSJjb2xvcjQgY29sb3JCb3giPjwvZGl2PgorICAgICAgICA8ZGl2 IGNsYXNzPSJjb2xvcjUgY29sb3JCb3giPjwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJjb2xv cjAgY29sb3JCb3giPjwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJjb2xvcjEgY29sb3JCb3gi PjwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJjb2xvcjIgY29sb3JCb3giPjwvZGl2PgorICAg ICAgICA8ZGl2IGNsYXNzPSJjb2xvcjMgY29sb3JCb3giPjwvZGl2PgorICAgICAgICA8ZGl2IGNs YXNzPSJjb2xvcjQgY29sb3JCb3giPjwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJjb2xvcjUg Y29sb3JCb3giPjwvZGl2PgorICAgIDwvYm9keT4KKzwvaHRtbD4K