227803 2021-07-08 10:32:07 -0700 RenderLayerScrollableArea::updateScrollPosition assumes that it can scroll to the targeted scroll position 2021-07-13 01:18:28 -0700 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mrobinson mrobinson changseok esprehn+autocc ews-watchlist fred.wang glenn kondapallykalyan pdr simon.fraser webkit-bug-importer oldest_to_newest 1775713 0 mrobinson 2021-07-08 10:32:07 -0700 RenderLayerScrollableArea::updateScrollPosition calculates a target scroll offset and tries to scroll there before returning an adjusted rectangle. The adjusted rectangle is based on the target scroll offset, rather than the area's true new scroll offset. The target offset may not be equal to the area's true offset due to scroll snapping. 1775716 1 433138 mrobinson 2021-07-08 10:35:13 -0700 Created attachment 433138 Patch 1776271 2 433303 mrobinson 2021-07-12 01:52:46 -0700 Created attachment 433303 Patch 1776325 3 mrobinson 2021-07-12 08:29:53 -0700 Looks like my original change did not take into account the in-progress smooth scrolling API. I've modified this patch so that instead of using `scrollOffset()` to adjust the output rectangle, `scrollToOffset()` now returns the snapped scroll offset. 1776577 4 ews-feeder 2021-07-13 01:17:36 -0700 Committed r279869 (239622@main): <https://commits.webkit.org/239622@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 433303. 1776578 5 webkit-bug-importer 2021-07-13 01:18:28 -0700 <rdar://problem/80505941> 433138 2021-07-08 10:35:13 -0700 2021-07-12 01:52:41 -0700 Patch bug-227803-20210708193512.patch text/plain 4259 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NzI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmVmMDBhOTE4YzZkZTU3 Nzc3MTExYmYxNmI3YzlhMjczNDAxNjExOC4uNjI0ZDI1OTY4ZDQ4YzIwOTQzY2YxM2ZhZTNmYWEy MThjYjAxOTQ3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA3LTA4ICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBSZW5kZXJMYXll clNjcm9sbGFibGVBcmVhOjp1cGRhdGVTY3JvbGxQb3NpdGlvbiBhc3N1bWVzIHRoYXQgaXQgY2Fu IHNjcm9sbCB0byB0aGUgdGFyZ2V0ZWQgc2Nyb2xsIHBvc2l0aW9uCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjc4MDMKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIFRoaXMgaXMgY292 ZXJlZCBieSBhbiBleGlzdGluZyBXUFQgdGVzdDoKKyAgICAgICAgICAtIHdlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXNjcm9sbC1zbmFwL25lc3RlZC1zY3JvbGxJbnRvVmlldy1zbmFwcy5odG1s CisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllclNjcm9sbGFibGVBcmVhOjp1cGRhdGVTY3JvbGxQ b3NpdGlvbik6IEluc3RlYWQgb2YgdXNpbmcgdGhlIHRhcmdldCBzY3JvbGwgb2Zmc2V0LAorICAg ICAgICB1c2UgdGhlIFJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEncyB0cnVlIG5ldyBvZmZzZXQg dG8gYWRqdXN0IHRoZSBvdXRwdXQgcmVjdGFuZ2xlLgorCiAyMDIxLTA3LTA4ICBDaHJpcyBEdW1l eiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYkNyeXB0b10gZGVyaXZlQml0cygp IGZhaWxzIGlmIGxlbmd0aCBpcyBub3QgYSBtdWx0aXBsZSBvZiA4IGZvciBFQ0RIIGFsZ29yaXRo bQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyU2Nyb2xs YWJsZUFyZWEuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyU2Nyb2xs YWJsZUFyZWEuY3BwCmluZGV4IDViYzc3MmNjODE2YmNiZjA2ODdkMjllOGM5YWE0MDkyOTVkM2Yy N2YuLjU0ZWUzODgyNmRiYzcxYzFhMTc5ZGYzNThhMzE4Nzc0NmJhYTQyNzIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5j cHAKQEAgLTE3NTUsNyArMTc1NSwxMSBAQCBzdGQ6Om9wdGlvbmFsPExheW91dFJlY3Q+IFJlbmRl ckxheWVyU2Nyb2xsYWJsZUFyZWE6OnVwZGF0ZVNjcm9sbFBvc2l0aW9uKGNvbnN0CiAgICAgaWYg KGNsYW1wZWRTY3JvbGxPZmZzZXQgIT0gc2Nyb2xsT2Zmc2V0KCkgfHwgY3VycmVudFNjcm9sbEJl aGF2aW9yU3RhdHVzKCkgIT0gU2Nyb2xsQmVoYXZpb3JTdGF0dXM6Ok5vdEluQW5pbWF0aW9uKSB7 CiAgICAgICAgIFNjcm9sbE9mZnNldCBvbGRTY3JvbGxPZmZzZXQgPSBzY3JvbGxPZmZzZXQoKTsK ICAgICAgICAgc2Nyb2xsVG9PZmZzZXQoY2xhbXBlZFNjcm9sbE9mZnNldCwgb3B0aW9ucyk7Ci0g ICAgICAgIEludFNpemUgc2Nyb2xsT2Zmc2V0RGlmZmVyZW5jZSA9IGNsYW1wZWRTY3JvbGxPZmZz ZXQgLSBvbGRTY3JvbGxPZmZzZXQ7CisKKyAgICAgICAgLy8gVGhlIG5ldyBzY3JvbGwgb2Zmc2V0 IG1heSBiZSBkaWZmZXJlbnQgZnJvbSBjbGFtcGVkU2Nyb2xsT2Zmc2V0LCB3aGljaCB3ZSBjYWxj dWxhdGVkIGFib3ZlLAorICAgICAgICAvLyBiZWNhdXNlIHRoZSBTY3JvbGxhYmxlQXJlYSBtYXkg aGF2ZSBhZGp1c3RlZCBpdCBkdWUgdG8gc2Nyb2xsIHNuYXBwaW5nLiBXZSBjYWxsIHNjcm9sbE9m ZnNldCgpCisgICAgICAgIC8vIGluc3RlYWQgb2YgcmVseWluZyBvbiB0aGUgb3JpZ2luYWwgdmFs dWUuCisgICAgICAgIEludFNpemUgc2Nyb2xsT2Zmc2V0RGlmZmVyZW5jZSA9IHNjcm9sbE9mZnNl dCgpIC0gb2xkU2Nyb2xsT2Zmc2V0OwogICAgICAgICBhdXRvIGxvY2FsRXhwb3NlUmVjdFNjcm9s bGVkID0gbG9jYWxFeHBvc2VSZWN0OwogICAgICAgICBsb2NhbEV4cG9zZVJlY3RTY3JvbGxlZC5t b3ZlKC1zY3JvbGxPZmZzZXREaWZmZXJlbmNlKTsKICAgICAgICAgcmV0dXJuIExheW91dFJlY3Qo Ym94LT5sb2NhbFRvQWJzb2x1dGVRdWFkKEZsb2F0UXVhZChGbG9hdFJlY3QobG9jYWxFeHBvc2VS ZWN0U2Nyb2xsZWQpKSwgVXNlVHJhbnNmb3JtcykuYm91bmRpbmdCb3goKSk7CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL0NoYW5nZUxvZwppbmRleCAyYjljMDg1ZWI5ZTM5YzhhY2FmZDRiNmFlY2EwZGZlYWU5 MzhhYWMxLi4yNWQ5ZTM5YTg4M2IxMmUzNDViZWYxYjE0NWQ5ODU5NWFmNjRkODY3IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0wNy0wOCAgTWFy dGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVuZGVyTGF5 ZXJTY3JvbGxhYmxlQXJlYTo6dXBkYXRlU2Nyb2xsUG9zaXRpb24gYXNzdW1lcyB0aGF0IGl0IGNh biBzY3JvbGwgdG8gdGhlIHRhcmdldGVkIHNjcm9sbCBwb3NpdGlvbgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3ODAzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1zY3JvbGwtc25hcC9uZXN0ZWQtc2Nyb2xsSW50b1ZpZXctc25hcHMtZXhwZWN0ZWQudHh0 OiBVcGRhdGUgdGVzdCByZXN1bHQgdG8gcmVmbGVjdCBuZXdseSBwYXNzaW5nIHRlc3QuCisKIDIw MjEtMDctMDggIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBbV2Vi Q3J5cHRvXSBkZXJpdmVCaXRzKCkgZmFpbHMgaWYgbGVuZ3RoIGlzIG5vdCBhIG11bHRpcGxlIG9m IDggZm9yIEVDREggYWxnb3JpdGhtCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2Nyb2xsLXNuYXAvbmVzdGVkLXNjcm9sbElu dG9WaWV3LXNuYXBzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY3JvbGwtc25hcC9uZXN0ZWQtc2Nyb2xsSW50b1ZpZXct c25hcHMtZXhwZWN0ZWQudHh0CmluZGV4IDc5OWI3YjBjYWVhMzkzYjg1M2I5NzY1N2ViZGUwNGZk Y2I1Y2E0MWMuLjY2MzY4ODAzZWJiMjQzMTMwOWRiMGY0ZGQ4OGJmOGE5ZTNkY2JlYmUgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz cy1zY3JvbGwtc25hcC9uZXN0ZWQtc2Nyb2xsSW50b1ZpZXctc25hcHMtZXhwZWN0ZWQudHh0Cisr KyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z Y3JvbGwtc25hcC9uZXN0ZWQtc2Nyb2xsSW50b1ZpZXctc25hcHMtZXhwZWN0ZWQudHh0CkBAIC0x LDMgKzEsMyBAQAogCi1GQUlMIEFsbCB0aGUgc2Nyb2xsZXJzIGFmZmVjdGVkIGJ5IHNjcm9sbElu dG9WaWV3IHNob3VsZCBsYW5kIG9uIGEgc25hcCBwb3NpdGlvbiBpZiBvbmUgZXhpc3RzLiBPdGhl cndpc2UsIGxhbmQgYWNjb3JkaW5nIHRvIHRoZSBzcGVjaWZpZWQgYWxpZ25tZW50IGFzc2VydF9l cXVhbHM6IFNjcm9sbEludG9WaWV3IGVuZHMgd2l0aCB0aGUgc3BlY2lmaWVkIGFsaWdubWVudCBp ZiBubyBzbmFwIHBvc2l0aW9uIGlzIHNwZWNpZmllZC4gZXhwZWN0ZWQgMTE4NSBidXQgZ290IDEw MDAKK1BBU1MgQWxsIHRoZSBzY3JvbGxlcnMgYWZmZWN0ZWQgYnkgc2Nyb2xsSW50b1ZpZXcgc2hv dWxkIGxhbmQgb24gYSBzbmFwIHBvc2l0aW9uIGlmIG9uZSBleGlzdHMuIE90aGVyd2lzZSwgbGFu ZCBhY2NvcmRpbmcgdG8gdGhlIHNwZWNpZmllZCBhbGlnbm1lbnQKIAo= 433303 2021-07-12 01:52:46 -0700 2021-07-13 01:17:37 -0700 Patch bug-227803-20210712105244.patch text/plain 6687 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5Nzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTFkNDMxZTA5NzJjY2Y3 YmUxM2U5Mzk0MmQ0MzVkMDNlODZhM2NiZi4uNDBjNjVlODg2NWRjNWYxNTdkODU2MDQ1YjlmNTRl ZGJhYTU0YTQ3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA3LTEyICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBSZW5kZXJMYXll clNjcm9sbGFibGVBcmVhOjp1cGRhdGVTY3JvbGxQb3NpdGlvbiBhc3N1bWVzIHRoYXQgaXQgY2Fu IHNjcm9sbCB0byB0aGUgdGFyZ2V0ZWQgc2Nyb2xsIHBvc2l0aW9uCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjc4MDMKKworICAgICAgICBSZXZpZXdl ZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlzIGlzIGNvdmVy ZWQgYnkgYW4gZXhpc3RpbmcgV1BUIHRlc3Q6CisgICAgICAgICAgLSB3ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy1zY3JvbGwtc25hcC9uZXN0ZWQtc2Nyb2xsSW50b1ZpZXctc25hcHMuaHRtbAor CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYTo6c2Nyb2xsVG9PZmZzZXQp OiBNb2RpZmllZCB0aGlzIG1ldGhvZCB0byByZXR1cm4gdGhlIHNuYXBwZWQKKyAgICAgICAgc2Ny b2xsIG9mZnNldC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWE6 OnVwZGF0ZVNjcm9sbFBvc2l0aW9uKTogSW5zdGVhZCBvZiB1c2luZyB0aGUgb3JpZ2luYWwgdGFy Z2V0IG9mZnNldCwKKyAgICAgICAgdXNlIHRoZSByZXR1cm4gdmFsdWUgZnJvbSBzY3JvbGxUb09m ZnNldCB0byBhZGp1c3QgdGhlIG91dHB1dCByZWN0YW5nbGUuCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuaDogVXBkYXRlIHRoZSBtZXRob2QgZGVmaW5pdGlv bi4KKwogMjAyMS0wNy0wOCAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkIGlPUyBidWlsZCBmaXggYWZ0ZXIKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNwcApp bmRleCA1YmM3NzJjYzgxNmJjYmYwNjg3ZDI5ZThjOWFhNDA5Mjk1ZDNmMjdmLi5kMjg2MDY3OWE4 MmQ0MzE5ZWYzMjM5MzNhMWExNDNhNjlkMjRiMDk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuY3BwCkBAIC0yNTQsMTQg KzI1NCwxNCBAQCBib29sIFJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWE6OnJlcXVlc3RTY3JvbGxQ b3NpdGlvblVwZGF0ZShjb25zdCBTY3JvbGxQb3NpdGlvbgogICAgIHJldHVybiBmYWxzZTsKIH0K IAotdm9pZCBSZW5kZXJMYXllclNjcm9sbGFibGVBcmVhOjpzY3JvbGxUb09mZnNldChjb25zdCBT Y3JvbGxPZmZzZXQmIHNjcm9sbE9mZnNldCwgY29uc3QgU2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRp b25zJiBvcHRpb25zKQorU2Nyb2xsT2Zmc2V0IFJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWE6OnNj cm9sbFRvT2Zmc2V0KGNvbnN0IFNjcm9sbE9mZnNldCYgc2Nyb2xsT2Zmc2V0LCBjb25zdCBTY3Jv bGxQb3NpdGlvbkNoYW5nZU9wdGlvbnMmIG9wdGlvbnMpCiB7CiAgICAgaWYgKGN1cnJlbnRTY3Jv bGxCZWhhdmlvclN0YXR1cygpID09IFNjcm9sbEJlaGF2aW9yU3RhdHVzOjpJbk5vbk5hdGl2ZUFu aW1hdGlvbikKICAgICAgICAgc2Nyb2xsQW5pbWF0b3IoKS5jYW5jZWxBbmltYXRpb25zKCk7CiAK ICAgICBTY3JvbGxPZmZzZXQgY2xhbXBlZFNjcm9sbE9mZnNldCA9IG9wdGlvbnMuY2xhbXBpbmcg PT0gU2Nyb2xsQ2xhbXBpbmc6OkNsYW1wZWQgPyBjbGFtcFNjcm9sbE9mZnNldChzY3JvbGxPZmZz ZXQpIDogc2Nyb2xsT2Zmc2V0OwogICAgIGlmIChjbGFtcGVkU2Nyb2xsT2Zmc2V0ID09IHRoaXMt PnNjcm9sbE9mZnNldCgpKQotICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVybiBjbGFtcGVk U2Nyb2xsT2Zmc2V0OwogCiAgICAgYXV0byBwcmV2aW91c1Njcm9sbFR5cGUgPSBjdXJyZW50U2Ny b2xsVHlwZSgpOwogICAgIHNldEN1cnJlbnRTY3JvbGxUeXBlKG9wdGlvbnMudHlwZSk7CkBAIC0y NzcsNiArMjc3LDcgQEAgdm9pZCBSZW5kZXJMYXllclNjcm9sbGFibGVBcmVhOjpzY3JvbGxUb09m ZnNldChjb25zdCBTY3JvbGxPZmZzZXQmIHNjcm9sbE9mZnNldCwKICAgICB9CiAKICAgICBzZXRD dXJyZW50U2Nyb2xsVHlwZShwcmV2aW91c1Njcm9sbFR5cGUpOworICAgIHJldHVybiBzbmFwcGVk T2Zmc2V0OwogfQogCiB2b2lkIFJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWE6OnNjcm9sbFRvKGNv bnN0IFNjcm9sbFBvc2l0aW9uJiBwb3NpdGlvbikKQEAgLTE3NTQsOCArMTc1NSw5IEBAIHN0ZDo6 b3B0aW9uYWw8TGF5b3V0UmVjdD4gUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYTo6dXBkYXRlU2Ny b2xsUG9zaXRpb24oY29uc3QKICAgICBTY3JvbGxPZmZzZXQgY2xhbXBlZFNjcm9sbE9mZnNldCA9 IGNsYW1wU2Nyb2xsT2Zmc2V0KHNjcm9sbE9mZnNldCgpICsgdG9JbnRTaXplKHJvdW5kZWRJbnRS ZWN0KHJldmVhbFJlY3QpLmxvY2F0aW9uKCkpKTsKICAgICBpZiAoY2xhbXBlZFNjcm9sbE9mZnNl dCAhPSBzY3JvbGxPZmZzZXQoKSB8fCBjdXJyZW50U2Nyb2xsQmVoYXZpb3JTdGF0dXMoKSAhPSBT Y3JvbGxCZWhhdmlvclN0YXR1czo6Tm90SW5BbmltYXRpb24pIHsKICAgICAgICAgU2Nyb2xsT2Zm c2V0IG9sZFNjcm9sbE9mZnNldCA9IHNjcm9sbE9mZnNldCgpOwotICAgICAgICBzY3JvbGxUb09m ZnNldChjbGFtcGVkU2Nyb2xsT2Zmc2V0LCBvcHRpb25zKTsKLSAgICAgICAgSW50U2l6ZSBzY3Jv bGxPZmZzZXREaWZmZXJlbmNlID0gY2xhbXBlZFNjcm9sbE9mZnNldCAtIG9sZFNjcm9sbE9mZnNl dDsKKyAgICAgICAgU2Nyb2xsT2Zmc2V0IHJlYWxTY3JvbGxPZmZzZXQgPSBzY3JvbGxUb09mZnNl dChjbGFtcGVkU2Nyb2xsT2Zmc2V0LCBvcHRpb25zKTsKKworICAgICAgICBJbnRTaXplIHNjcm9s bE9mZnNldERpZmZlcmVuY2UgPSByZWFsU2Nyb2xsT2Zmc2V0IC0gb2xkU2Nyb2xsT2Zmc2V0Owog ICAgICAgICBhdXRvIGxvY2FsRXhwb3NlUmVjdFNjcm9sbGVkID0gbG9jYWxFeHBvc2VSZWN0Owog ICAgICAgICBsb2NhbEV4cG9zZVJlY3RTY3JvbGxlZC5tb3ZlKC1zY3JvbGxPZmZzZXREaWZmZXJl bmNlKTsKICAgICAgICAgcmV0dXJuIExheW91dFJlY3QoYm94LT5sb2NhbFRvQWJzb2x1dGVRdWFk KEZsb2F0UXVhZChGbG9hdFJlY3QobG9jYWxFeHBvc2VSZWN0U2Nyb2xsZWQpKSwgVXNlVHJhbnNm b3JtcykuYm91bmRpbmdCb3goKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuaAppbmRleCBhMDcyODFiYjU5NWVlYzg3MjE2ZmMy YmU2N2NlZDlmMDljOTJlMTRhLi4zYWIyOGNiNjFkYjI3YzU2YTJjZDhiOTc1Yzk3MmI3ODE0ODg3 MTA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3Jv bGxhYmxlQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNj cm9sbGFibGVBcmVhLmgKQEAgLTgzLDcgKzgzLDEwIEBAIHB1YmxpYzoKICAgICAvLyBTY3JvbGxp bmcgbWV0aG9kcyBmb3IgbGF5ZXJzIHRoYXQgY2FuIHNjcm9sbCB0aGVpciBvdmVyZmxvdy4KICAg ICB2b2lkIHNjcm9sbEJ5UmVjdXJzaXZlbHkoY29uc3QgSW50U2l6ZSYgZGVsdGEsIFNjcm9sbGFi bGVBcmVhKiogc2Nyb2xsZWRBcmVhID0gbnVsbHB0cik7CiAKLSAgICBXRUJDT1JFX0VYUE9SVCB2 b2lkIHNjcm9sbFRvT2Zmc2V0KGNvbnN0IFNjcm9sbE9mZnNldCYsIGNvbnN0IFNjcm9sbFBvc2l0 aW9uQ2hhbmdlT3B0aW9ucyYgPSBTY3JvbGxQb3NpdGlvbkNoYW5nZU9wdGlvbnM6OmNyZWF0ZVBy b2dyYW1tYXRpYygpKTsKKyAgICAvLyBBdHRlbXB0IHRvIHNjcm9sbCB0aGUgZ2l2ZW4gU2Nyb2xs T2Zmc2V0LCByZXR1cm5pbmcgdGhlIHJlYWwgdGFyZ2V0IG9mZnNldCBhZnRlciBpdCBoYXMKKyAg ICAvLyBiZWVuIGFkanVzdGVkIGJ5IHNjcm9sbCBzbmFwcGluZy4KKyAgICBXRUJDT1JFX0VYUE9S VCBTY3JvbGxPZmZzZXQgc2Nyb2xsVG9PZmZzZXQoY29uc3QgU2Nyb2xsT2Zmc2V0JiwgY29uc3Qg U2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zJiA9IFNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9u czo6Y3JlYXRlUHJvZ3JhbW1hdGljKCkpOworCiAgICAgdm9pZCBzY3JvbGxUb1hQb3NpdGlvbihp bnQgeCwgY29uc3QgU2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zJik7CiAgICAgdm9pZCBzY3Jv bGxUb1lQb3NpdGlvbihpbnQgeSwgY29uc3QgU2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zJik7 CiAgICAgdm9pZCBzZXRTY3JvbGxQb3NpdGlvbihjb25zdCBTY3JvbGxQb3NpdGlvbiYsIGNvbnN0 IFNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9ucyYpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VM b2cKaW5kZXggNmU5MWUzY2JmNWUwOWM0MjhhZWY4OWZmZjc1YzAyZWE1OGExOWM4OC4uYWE3ZWRk MWM3MTE4ZGNkM2Y4N2RmODg4MGNmZGNkODgyZTgzMzM3YyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMDctMDkgIE1hcnRpbiBSb2JpbnNvbiAg PG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJlbmRlckxheWVyU2Nyb2xsYWJsZUFy ZWE6OnVwZGF0ZVNjcm9sbFBvc2l0aW9uIGFzc3VtZXMgdGhhdCBpdCBjYW4gc2Nyb2xsIHRvIHRo ZSB0YXJnZXRlZCBzY3JvbGwgcG9zaXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyNzgwMworCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZy YXNlci4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjcm9sbC1zbmFw L25lc3RlZC1zY3JvbGxJbnRvVmlldy1zbmFwcy1leHBlY3RlZC50eHQ6IFVwZGF0ZSB0ZXN0IHJl c3VsdCB0byByZWZsZWN0IG5ld2x5IHBhc3NpbmcgdGVzdC4KKwogMjAyMS0wNy0wOCAgWXVzdWtl IFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBTdHJ1Y3R1cmVkQ2xv bmUgZm9yIHN0cmVhbXMgdG8gaGFuZGxlIEJpZ0ludDY0QXJyYXkgLyBCaWdVaW50NjRBcnJheQpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXNjcm9sbC1zbmFwL25lc3RlZC1zY3JvbGxJbnRvVmlldy1zbmFwcy1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt c2Nyb2xsLXNuYXAvbmVzdGVkLXNjcm9sbEludG9WaWV3LXNuYXBzLWV4cGVjdGVkLnR4dAppbmRl eCA3OTliN2IwY2FlYTM5M2I4NTNiOTc2NTdlYmRlMDRmZGNiNWNhNDFjLi42NjM2ODgwM2ViYjI0 MzEzMDlkYjBmNGRkODhiZjhhOWUzZGNiZWJlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2Nyb2xsLXNuYXAvbmVzdGVkLXNj cm9sbEludG9WaWV3LXNuYXBzLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2Nyb2xsLXNuYXAvbmVzdGVkLXNjcm9s bEludG9WaWV3LXNuYXBzLWV4cGVjdGVkLnR4dApAQCAtMSwzICsxLDMgQEAKIAotRkFJTCBBbGwg dGhlIHNjcm9sbGVycyBhZmZlY3RlZCBieSBzY3JvbGxJbnRvVmlldyBzaG91bGQgbGFuZCBvbiBh IHNuYXAgcG9zaXRpb24gaWYgb25lIGV4aXN0cy4gT3RoZXJ3aXNlLCBsYW5kIGFjY29yZGluZyB0 byB0aGUgc3BlY2lmaWVkIGFsaWdubWVudCBhc3NlcnRfZXF1YWxzOiBTY3JvbGxJbnRvVmlldyBl bmRzIHdpdGggdGhlIHNwZWNpZmllZCBhbGlnbm1lbnQgaWYgbm8gc25hcCBwb3NpdGlvbiBpcyBz cGVjaWZpZWQuIGV4cGVjdGVkIDExODUgYnV0IGdvdCAxMDAwCitQQVNTIEFsbCB0aGUgc2Nyb2xs ZXJzIGFmZmVjdGVkIGJ5IHNjcm9sbEludG9WaWV3IHNob3VsZCBsYW5kIG9uIGEgc25hcCBwb3Np dGlvbiBpZiBvbmUgZXhpc3RzLiBPdGhlcndpc2UsIGxhbmQgYWNjb3JkaW5nIHRvIHRoZSBzcGVj aWZpZWQgYWxpZ25tZW50CiAK