208721 2020-03-06 09:46:05 -0800 Move synchronousScrollingReasons to ScrollingTreeScrollingNode 2020-03-06 11:33:46 -0800 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser cmarcelo ews-watchlist fred.wang jamesr koivisto luiz simon.fraser tonikitoo webkit-bug-importer oldest_to_newest 1626707 0 simon.fraser 2020-03-06 09:46:05 -0800 Move synchronousScrollingReasons to ScrollingTreeScrollingNode 1626712 1 392736 simon.fraser 2020-03-06 09:54:48 -0800 Created attachment 392736 Patch 1626713 2 webkit-bug-importer 2020-03-06 09:55:13 -0800 <rdar://problem/60158683> 1626768 3 simon.fraser 2020-03-06 11:33:46 -0800 https://trac.webkit.org/changeset/258012/webkit 392736 2020-03-06 09:54:48 -0800 2020-03-06 10:13:02 -0800 Patch bug-208721-20200306095448.patch text/plain 22924 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3OTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWRhZTllYjcwNDA0NDUz NDlmZjdjNGYwNjFhY2ZkMTY1NDBhN2JjMC4uMmQ1ODJmYTBlNmMzYTUwNjIyMGQ1ZTBlYzlmZjZm YzhhZWUwYWEzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDIwLTAzLTA2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgc3luY2hy b25vdXNTY3JvbGxpbmdSZWFzb25zIHRvIFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg3MjEKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBzeW5jaHJvbm91c1Nj cm9sbGluZ1JlYXNvbnMgd2FzIG9uIFNjcm9sbGluZypGcmFtZVNjcm9sbGluZ05vZGUsIGJ1dCB3 aXRoIGFzeW5jIG92ZXJmbG93CisgICAgICAgIHNjcm9sbGluZywgc29tZSBvdmVyZmxvdyBzY3Jv bGxzIHdpbGwgbmVlZCB0byBzY3JvbGwgc3luY2hyb25vdXNseSBpZiB0aGV5IHBhaW50IGFueQor ICAgICAgICBiYWNrZ3JvdW5kLWF0dGFjaG1lbnQ6Zml4ZWQsIHNvIG1vdmUgc3luY2hyb25vdXNT Y3JvbGxpbmdSZWFzb25zIGRvd24gdG8gU2Nyb2xsaW5nKlNjcm9sbGluZ05vZGUuCisKKyAgICAg ICAgQWxzbyB3cmFwIHRoZSBzY3JvbGxpbmcgdHJlZSBwYXJ0cyBpbiAjaWYgRU5BQkxFKFNDUk9M TElOR19USFJFQUQpIHNpbmNlIHN5bmNocm9ub3VzIHNjcm9sbGluZworICAgICAgICBpcyBvbmx5 IGEgdGhpbmcgaWYgeW91IHVzZSB0aHJlYWRlZCBzY3JvbGxpbmcuIElkZWFsbHkgbW9yZSBvZiB0 aGUgU2Nyb2xsaW5nQ29vcmRpbmF0b3IgY29kZQorICAgICAgICB3b3VsZCBhbHNvIGhhdmUgI2lm IEVOQUJMRShTQ1JPTExJTkdfVEhSRUFEKSBidXQgdGhhdCBjYW4gYmUgZG9uZSBsYXRlci4KKwor ICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6QXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6c2V0U3luY2hyb25v dXNTY3JvbGxpbmdSZWFzb25zKToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdT dGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdT dGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6U2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGUp OgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OnNl dFByb3BlcnR5Q2hhbmdlZEJpdHNBZnRlclJlYXR0YWNoKToKKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpkdW1wUHJvcGVydGllcyBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6c2V0U3lu Y2hyb25vdXNTY3JvbGxpbmdSZWFzb25zKTogRGVsZXRlZC4KKyAgICAgICAgKiBwYWdlL3Njcm9s bGluZy9TY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZS5oOgorICAgICAgICAqIHBhZ2Uv c2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5n Tm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OnNl dFByb3BlcnR5Q2hhbmdlZEJpdHNBZnRlclJlYXR0YWNoKToKKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6c2V0U3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25z KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6ZHVtcFBy b3BlcnRpZXMgY29uc3QpOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRl U2Nyb2xsaW5nTm9kZS5oOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nU3RhdGVTY3JvbGxp bmdOb2RlOjpzeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMgY29uc3QpOgorICAgICAgICAqIHBh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZTo6Y29tbWl0U3RhdGVC ZWZvcmVDaGlsZHJlbik6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlRnJhbWVTY3Jv bGxpbmdOb2RlOjpkdW1wUHJvcGVydGllcyBjb25zdCk6CisgICAgICAgICogcGFnZS9zY3JvbGxp bmcvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZS5oOgorICAgICAgICAqIHBhZ2Uvc2Ny b2xsaW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlOjpjb21taXRTdGF0ZUJlZm9yZUNoaWxkcmVuKToK KyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlOjpkdW1wUHJvcGVy dGllcyBjb25zdCk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9s bGluZ05vZGUuaDoKKwogMjAyMC0wMy0wNSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFw cGxlLmNvbT4KIAogICAgICAgICBVc2UgYW4gT3B0aW9uU2V0PD4gZm9yIFN5bmNocm9ub3VzU2Ny b2xsaW5nUmVhc29ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA1MmU2ZjFlMDI1MGQ5ZDY1ODkxN2ZkNjQ1YjEzMDMx ODFjOTczZGE3Li45MzViM2ExODlhMzNkNTRhMzdmNzc0NTY1MWFmZDUwZTYzYjY1MTU1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTAzLTA2ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5m cmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgc3luY2hyb25vdXNTY3JvbGxpbmdSZWFz b25zIHRvIFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg3MjEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZWVkIHRvIHNlbmQgc3luY2hyb25vdXNTY3Jv bGxpbmdSZWFzb25zIHRvIHRoZSBVSSBwcm9jZXNzOyBpdCBtYWtlcyBubyBzZW5zZSB0aGVyZS4K KworICAgICAgICAqIFNoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nQ29vcmRp bmF0b3JUcmFuc2FjdGlvbi5jcHA6CisgICAgICAgIChBcmd1bWVudENvZGVyPFNjcm9sbGluZ1N0 YXRlU2Nyb2xsaW5nTm9kZT46OmVuY29kZSk6CisgICAgICAgIChBcmd1bWVudENvZGVyPFNjcm9s bGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlPjo6ZW5jb2RlKToKKyAgICAgICAgKEFyZ3VtZW50 Q29kZXI8U2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU+OjpkZWNvZGUpOgorICAgICAg ICAoV2ViS2l0OjpkdW1wKToKKwogMjAyMC0wMy0wNSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJh c2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgYW4gT3B0aW9uU2V0PD4gZm9yIFN5bmNocm9u b3VzU2Nyb2xsaW5nUmVhc29ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcAppbmRleCA3MTMwZTZiNDNm MGZkZWE2OWI4NmQ0YzY3Nzg2YTE1N2MxYTk4N2FjLi5jNWU1NWVhZTQ1ODNkMzEyY2E3ZTUyYWQ4 MGVlMWQyNmUwZGEyMjEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGlu Zy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcApAQCAtNzQzLDcgKzc0Mywx MSBAQCB2b2lkIEFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnNldFN5bmNocm9ub3VzU2Nyb2xs aW5nUmVhc29ucyhGcmFtZVZpZXcmIGZyYW1lVgogICAgIC8vIGluIG9yZGVyIHRvIGF2b2lkIGxh eWVyIHBvc2l0aW9uaW5nIGJ1Z3MuCiAgICAgaWYgKHJlYXNvbnMpCiAgICAgICAgIHJlY29uY2ls ZVNjcm9sbFBvc2l0aW9uKGZyYW1lVmlldywgU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbjo6 U2V0KTsKKworICAgIC8vIEZJWE1FOiBJZGVhbGx5IGFsbCB0aGUgInN5bmNocm9ub3VzU2Nyb2xs aW5nUmVhc29ucyIgZnVuY3Rpb25zIHNob3VsZCBiZSAjaWZkZWZmZWQuCisjaWYgRU5BQkxFKFND Uk9MTElOR19USFJFQUQpCiAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLT5zZXRTeW5jaHJvbm91c1Nj cm9sbGluZ1JlYXNvbnMocmVhc29ucyk7CisjZW5kaWYKIH0KIAogYm9vbCBBc3luY1Njcm9sbGlu Z0Nvb3JkaW5hdG9yOjppc1J1YmJlckJhbmRJblByb2dyZXNzKCkgY29uc3QKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxp bmdOb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRl RnJhbWVTY3JvbGxpbmdOb2RlLmNwcAppbmRleCBkYmM1OTUxYzhhMzk3Y2Y2MzQyODdkN2FjZGU2 YzUzYzBmNzcyZmEyLi5hZmY0M2I1ZWRhMmJjMGI3OGMxNDI4YjE0ZTkzMTM5ZjQ4MDlhZGY0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZUZy YW1lU2Nyb2xsaW5nTm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv U2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGUuY3BwCkBAIC01NSw3ICs1NSw2IEBAIFNj cm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xs aW5nTm9kZShjb25zdCBTY3JvbGxpCiAgICAgLCBtX3RvcENvbnRlbnRJbnNldChzdGF0ZU5vZGUu dG9wQ29udGVudEluc2V0KCkpCiAgICAgLCBtX2hlYWRlckhlaWdodChzdGF0ZU5vZGUuaGVhZGVy SGVpZ2h0KCkpCiAgICAgLCBtX2Zvb3RlckhlaWdodChzdGF0ZU5vZGUuZm9vdGVySGVpZ2h0KCkp Ci0gICAgLCBtX3N5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucyhzdGF0ZU5vZGUuc3luY2hyb25v dXNTY3JvbGxpbmdSZWFzb25zKCkpCiAgICAgLCBtX2JlaGF2aW9yRm9yRml4ZWQoc3RhdGVOb2Rl LnNjcm9sbEJlaGF2aW9yRm9yRml4ZWRFbGVtZW50cygpKQogICAgICwgbV9maXhlZEVsZW1lbnRz TGF5b3V0UmVsYXRpdmVUb0ZyYW1lKHN0YXRlTm9kZS5maXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRp dmVUb0ZyYW1lKCkpCiAgICAgLCBtX3Zpc3VhbFZpZXdwb3J0SXNTbWFsbGVyVGhhbkxheW91dFZp ZXdwb3J0KHN0YXRlTm9kZS52aXN1YWxWaWV3cG9ydElzU21hbGxlclRoYW5MYXlvdXRWaWV3cG9y dCgpKQpAQCAtOTEsNyArOTAsNiBAQCB2b2lkIFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdO b2RlOjpzZXRQcm9wZXJ0eUNoYW5nZWRCaXRzQWZ0ZXJSZWF0dGFjaCgpCiB7CiAgICAgc2V0UHJv cGVydHlDaGFuZ2VkQml0KEZyYW1lU2NhbGVGYWN0b3IpOwogICAgIHNldFByb3BlcnR5Q2hhbmdl ZEJpdChFdmVudFRyYWNraW5nUmVnaW9uKTsKLSAgICBzZXRQcm9wZXJ0eUNoYW5nZWRCaXQoUmVh c29uc0ZvclN5bmNocm9ub3VzU2Nyb2xsaW5nKTsKICAgICBzZXRQcm9wZXJ0eUNoYW5nZWRCaXQo Um9vdENvbnRlbnRzTGF5ZXIpOwogICAgIHNldFByb3BlcnR5Q2hhbmdlZEJpdChTY3JvbGxlZENv bnRlbnRzTGF5ZXIpOwogICAgIHNldFByb3BlcnR5Q2hhbmdlZEJpdChDb3VudGVyU2Nyb2xsaW5n TGF5ZXIpOwpAQCAtMTMzLDE1ICsxMzEsNiBAQCB2b2lkIFNjcm9sbGluZ1N0YXRlRnJhbWVTY3Jv bGxpbmdOb2RlOjpzZXRFdmVudFRyYWNraW5nUmVnaW9ucyhjb25zdCBFdmVudFRyYWNraQogICAg IHNldFByb3BlcnR5Q2hhbmdlZChFdmVudFRyYWNraW5nUmVnaW9uKTsKIH0KIAotdm9pZCBTY3Jv bGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6c2V0U3luY2hyb25vdXNTY3JvbGxpbmdSZWFz b25zKE9wdGlvblNldDxTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbj4gcmVhc29ucykKLXsKLSAg ICBpZiAobV9zeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMgPT0gcmVhc29ucykKLSAgICAgICAg cmV0dXJuOwotCi0gICAgbV9zeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMgPSByZWFzb25zOwot ICAgIHNldFByb3BlcnR5Q2hhbmdlZChSZWFzb25zRm9yU3luY2hyb25vdXNTY3JvbGxpbmcpOwot fQotCiB2b2lkIFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpzZXRTY3JvbGxCZWhh dmlvckZvckZpeGVkRWxlbWVudHMoU2Nyb2xsQmVoYXZpb3JGb3JGaXhlZEVsZW1lbnRzIGJlaGF2 aW9yRm9yRml4ZWQpCiB7CiAgICAgaWYgKG1fYmVoYXZpb3JGb3JGaXhlZCA9PSBiZWhhdmlvckZv ckZpeGVkKQpAQCAtMzUzLDkgKzM0Miw2IEBAIHZvaWQgU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9s bGluZ05vZGU6OmR1bXBQcm9wZXJ0aWVzKFRleHRTdHJlYW0mIHRzLCBTY3JvbGxpbmdTCiAgICAg ICAgIH0KICAgICB9CiAKLSAgICBpZiAoIW1fc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zLmlz RW1wdHkoKSkKLSAgICAgICAgdHMuZHVtcFByb3BlcnR5KCJTY3JvbGxpbmcgb24gbWFpbiB0aHJl YWQgYmVjYXVzZToiLCBTY3JvbGxpbmdDb29yZGluYXRvcjo6c3luY2hyb25vdXNTY3JvbGxpbmdS ZWFzb25zQXNUZXh0KG1fc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zKSk7Ci0gICAgCiAgICAg dHMuZHVtcFByb3BlcnR5KCJiZWhhdmlvciBmb3IgZml4ZWQiLCBtX2JlaGF2aW9yRm9yRml4ZWQp OwogCiAgICAgaWYgKG1fdmlzdWFsVmlld3BvcnRJc1NtYWxsZXJUaGFuTGF5b3V0Vmlld3BvcnQp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0 ZUZyYW1lU2Nyb2xsaW5nTm9kZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGUuaAppbmRleCA1YmJkZjBiY2IwNmM0NDQ5OTFl MTlmNzNjMWFkZWVjOTRhZTMzNDdiLi4xMDk4ZjI5NTAxYTBlMjk1ZjgwY2QyMWU4Yzc3YjQ0N2I1 OTRmYzVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxp bmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL1Njcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlLmgKQEAgLTQ4LDcgKzQ4LDYg QEAgcHVibGljOgogICAgIGVudW0gQ2hhbmdlZFByb3BlcnR5IHsKICAgICAgICAgRnJhbWVTY2Fs ZUZhY3RvciA9IE51bVNjcm9sbGluZ1N0YXRlTm9kZUJpdHMsCiAgICAgICAgIEV2ZW50VHJhY2tp bmdSZWdpb24sCi0gICAgICAgIFJlYXNvbnNGb3JTeW5jaHJvbm91c1Njcm9sbGluZywKICAgICAg ICAgUm9vdENvbnRlbnRzTGF5ZXIsCiAgICAgICAgIFNjcm9sbGVkQ29udGVudHNMYXllciwKICAg ICAgICAgQ291bnRlclNjcm9sbGluZ0xheWVyLApAQCAtNzUsOSArNzQsNiBAQCBwdWJsaWM6CiAg ICAgY29uc3QgRXZlbnRUcmFja2luZ1JlZ2lvbnMmIGV2ZW50VHJhY2tpbmdSZWdpb25zKCkgY29u c3QgeyByZXR1cm4gbV9ldmVudFRyYWNraW5nUmVnaW9uczsgfQogICAgIFdFQkNPUkVfRVhQT1JU IHZvaWQgc2V0RXZlbnRUcmFja2luZ1JlZ2lvbnMoY29uc3QgRXZlbnRUcmFja2luZ1JlZ2lvbnMm KTsKIAotICAgIE9wdGlvblNldDxTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbj4gc3luY2hyb25v dXNTY3JvbGxpbmdSZWFzb25zKCkgY29uc3QgeyByZXR1cm4gbV9zeW5jaHJvbm91c1Njcm9sbGlu Z1JlYXNvbnM7IH0KLSAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldFN5bmNocm9ub3VzU2Nyb2xs aW5nUmVhc29ucyhPcHRpb25TZXQ8U3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb24+KTsKLQogICAg IFNjcm9sbEJlaGF2aW9yRm9yRml4ZWRFbGVtZW50cyBzY3JvbGxCZWhhdmlvckZvckZpeGVkRWxl bWVudHMoKSBjb25zdCB7IHJldHVybiBtX2JlaGF2aW9yRm9yRml4ZWQ7IH0KICAgICBXRUJDT1JF X0VYUE9SVCB2b2lkIHNldFNjcm9sbEJlaGF2aW9yRm9yRml4ZWRFbGVtZW50cyhTY3JvbGxCZWhh dmlvckZvckZpeGVkRWxlbWVudHMpOwogCkBAIC0xNjQsNyArMTYwLDYgQEAgcHJpdmF0ZToKICAg ICBmbG9hdCBtX3RvcENvbnRlbnRJbnNldCB7IDAgfTsKICAgICBpbnQgbV9oZWFkZXJIZWlnaHQg eyAwIH07CiAgICAgaW50IG1fZm9vdGVySGVpZ2h0IHsgMCB9OwotICAgIE9wdGlvblNldDxTeW5j aHJvbm91c1Njcm9sbGluZ1JlYXNvbj4gbV9zeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnM7CiAg ICAgU2Nyb2xsQmVoYXZpb3JGb3JGaXhlZEVsZW1lbnRzIG1fYmVoYXZpb3JGb3JGaXhlZCB7IFN0 aWNrVG9Eb2N1bWVudEJvdW5kcyB9OwogICAgIGJvb2wgbV9maXhlZEVsZW1lbnRzTGF5b3V0UmVs YXRpdmVUb0ZyYW1lIHsgZmFsc2UgfTsKICAgICBib29sIG1fdmlzdWFsVmlld3BvcnRJc1NtYWxs ZXJUaGFuTGF5b3V0Vmlld3BvcnQgeyBmYWxzZSB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZS5jcHAK aW5kZXggMjk2ODk2OTYwMTJmYjJhN2NiMmFmMjc4MjE2Y2FiMGJkYjFjMmRiZi4uMWM5Nzk2ZmYz NDNiNzEzNDZhZWRmNDkzMTJlYTAxMDE0MWNjM2MwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUu Y3BwCkBAIC01NCw2ICs1NCw5IEBAIFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6U2Nyb2xs aW5nU3RhdGVTY3JvbGxpbmdOb2RlKGNvbnN0IFNjcm9sbGluZ1N0YXRlU2NyCiAjZW5kaWYKICAg ICAsIG1fc2Nyb2xsYWJsZUFyZWFQYXJhbWV0ZXJzKHN0YXRlTm9kZS5zY3JvbGxhYmxlQXJlYVBh cmFtZXRlcnMoKSkKICAgICAsIG1fcmVxdWVzdGVkU2Nyb2xsRGF0YShzdGF0ZU5vZGUucmVxdWVz dGVkU2Nyb2xsRGF0YSgpKQorI2lmIEVOQUJMRShTQ1JPTExJTkdfVEhSRUFEKQorICAgICwgbV9z eW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMoc3RhdGVOb2RlLnN5bmNocm9ub3VzU2Nyb2xsaW5n UmVhc29ucygpKQorI2VuZGlmCiAgICAgLCBtX2lzTW9uaXRvcmluZ1doZWVsRXZlbnRzKHN0YXRl Tm9kZS5pc01vbml0b3JpbmdXaGVlbEV2ZW50cygpKQogewogICAgIGlmIChoYXNDaGFuZ2VkUHJv cGVydHkoU2Nyb2xsQ29udGFpbmVyTGF5ZXIpKQpAQCAtNzksNiArODIsOSBAQCB2b2lkIFNjcm9s bGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6c2V0UHJvcGVydHlDaGFuZ2VkQml0c0FmdGVyUmVhdHRh Y2goKQogICAgIHNldFByb3BlcnR5Q2hhbmdlZEJpdChTY3JvbGxQb3NpdGlvbik7CiAgICAgc2V0 UHJvcGVydHlDaGFuZ2VkQml0KFNjcm9sbE9yaWdpbik7CiAgICAgc2V0UHJvcGVydHlDaGFuZ2Vk Qml0KFNjcm9sbGFibGVBcmVhUGFyYW1zKTsKKyNpZiBFTkFCTEUoU0NST0xMSU5HX1RIUkVBRCkK KyAgICBzZXRQcm9wZXJ0eUNoYW5nZWRCaXQoUmVhc29uc0ZvclN5bmNocm9ub3VzU2Nyb2xsaW5n KTsKKyNlbmRpZgogI2lmIEVOQUJMRShDU1NfU0NST0xMX1NOQVApCiAgICAgc2V0UHJvcGVydHlD aGFuZ2VkQml0KEhvcml6b250YWxTbmFwT2Zmc2V0cyk7CiAgICAgc2V0UHJvcGVydHlDaGFuZ2Vk Qml0KFZlcnRpY2FsU25hcE9mZnNldHMpOwpAQCAtMjA3LDYgKzIxMywxNyBAQCB2b2lkIFNjcm9s bGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6c2V0U2Nyb2xsYWJsZUFyZWFQYXJhbWV0ZXJzKGNvbnN0 IFNjcm9sbGFibGVBcgogICAgIHNldFByb3BlcnR5Q2hhbmdlZChTY3JvbGxhYmxlQXJlYVBhcmFt cyk7CiB9CiAKKyNpZiBFTkFCTEUoU0NST0xMSU5HX1RIUkVBRCkKK3ZvaWQgU2Nyb2xsaW5nU3Rh dGVTY3JvbGxpbmdOb2RlOjpzZXRTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMoT3B0aW9uU2V0 PFN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29uPiByZWFzb25zKQoreworICAgIGlmIChtX3N5bmNo cm9ub3VzU2Nyb2xsaW5nUmVhc29ucyA9PSByZWFzb25zKQorICAgICAgICByZXR1cm47CisKKyAg ICBtX3N5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucyA9IHJlYXNvbnM7CisgICAgc2V0UHJvcGVy dHlDaGFuZ2VkKFJlYXNvbnNGb3JTeW5jaHJvbm91c1Njcm9sbGluZyk7Cit9CisjZW5kaWYKKwog dm9pZCBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OnNldFJlcXVlc3RlZFNjcm9sbERhdGEo Y29uc3QgUmVxdWVzdGVkU2Nyb2xsRGF0YSYgc2Nyb2xsRGF0YSkKIHsKICAgICAvLyBTY3JvbGwg cG9zaXRpb24gcmVxdWVzdHMgYXJlIGltcGVyYXRpdmUsIG5vdCBzdGF0ZWZ1bCwgc28gd2UgY2Fu J3QgZWFybHkgcmV0dXJuIGhlcmUuCkBAIC0zMjQsNiArMzQxLDExIEBAIHZvaWQgU2Nyb2xsaW5n U3RhdGVTY3JvbGxpbmdOb2RlOjpkdW1wUHJvcGVydGllcyhUZXh0U3RyZWFtJiB0cywgU2Nyb2xs aW5nU3RhdGVUCiAKICAgICB0cy5kdW1wUHJvcGVydHkoInNjcm9sbGFibGUgYXJlYSBwYXJhbWV0 ZXJzIiwgbV9zY3JvbGxhYmxlQXJlYVBhcmFtZXRlcnMpOwogCisjaWYgRU5BQkxFKFNDUk9MTElO R19USFJFQUQpCisgICAgaWYgKCFtX3N5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucy5pc0VtcHR5 KCkpCisgICAgICAgIHRzLmR1bXBQcm9wZXJ0eSgiU2Nyb2xsaW5nIG9uIG1haW4gdGhyZWFkIGJl Y2F1c2U6IiwgU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29u c0FzVGV4dChtX3N5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucykpOworI2VuZGlmCisKICAgICBp ZiAobV9pc01vbml0b3JpbmdXaGVlbEV2ZW50cykKICAgICAgICAgdHMuZHVtcFByb3BlcnR5KCJl eHBlY3RzIHdoZWVsIGV2ZW50IHRlc3QgdHJpZ2dlciIsIG1faXNNb25pdG9yaW5nV2hlZWxFdmVu dHMpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxp bmdTdGF0ZVNjcm9sbGluZ05vZGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZS5oCmluZGV4IDhkZjdiZTg4YTQzMWUwOGZlYWZmNjRl MTE0MzdkNzYyYjY2MDRlZWEuLmUzZDc2OGJmYmM2MmNhOTRjZGIxMWZlZWI4OTUxNmRjNDM0NjM2 ZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0 YXRlU2Nyb2xsaW5nTm9kZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZS5oCkBAIC02Miw2ICs2Miw5IEBAIHB1YmxpYzoKICAg ICAgICAgU2Nyb2xsUG9zaXRpb24sCiAgICAgICAgIFNjcm9sbE9yaWdpbiwKICAgICAgICAgU2Ny b2xsYWJsZUFyZWFQYXJhbXMsCisjaWYgRU5BQkxFKFNDUk9MTElOR19USFJFQUQpCisgICAgICAg IFJlYXNvbnNGb3JTeW5jaHJvbm91c1Njcm9sbGluZywKKyNlbmRpZgogICAgICAgICBSZXF1ZXN0 ZWRTY3JvbGxQb3NpdGlvbiwKICNpZiBFTkFCTEUoQ1NTX1NDUk9MTF9TTkFQKQogICAgICAgICBI b3Jpem9udGFsU25hcE9mZnNldHMsCkBAIC0xMTgsNiArMTIxLDExIEBAIHB1YmxpYzoKICAgICBj b25zdCBTY3JvbGxhYmxlQXJlYVBhcmFtZXRlcnMmIHNjcm9sbGFibGVBcmVhUGFyYW1ldGVycygp IGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xsYWJsZUFyZWFQYXJhbWV0ZXJzOyB9CiAgICAgV0VCQ09S RV9FWFBPUlQgdm9pZCBzZXRTY3JvbGxhYmxlQXJlYVBhcmFtZXRlcnMoY29uc3QgU2Nyb2xsYWJs ZUFyZWFQYXJhbWV0ZXJzJiBwYXJhbXMpOwogCisjaWYgRU5BQkxFKFNDUk9MTElOR19USFJFQUQp CisgICAgT3B0aW9uU2V0PFN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29uPiBzeW5jaHJvbm91c1Nj cm9sbGluZ1JlYXNvbnMoKSBjb25zdCB7IHJldHVybiBtX3N5bmNocm9ub3VzU2Nyb2xsaW5nUmVh c29uczsgfQorICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0U3luY2hyb25vdXNTY3JvbGxpbmdS ZWFzb25zKE9wdGlvblNldDxTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbj4pOworI2VuZGlmCisK ICAgICBjb25zdCBSZXF1ZXN0ZWRTY3JvbGxEYXRhJiByZXF1ZXN0ZWRTY3JvbGxEYXRhKCkgY29u c3QgeyByZXR1cm4gbV9yZXF1ZXN0ZWRTY3JvbGxEYXRhOyB9CiAgICAgV0VCQ09SRV9FWFBPUlQg dm9pZCBzZXRSZXF1ZXN0ZWRTY3JvbGxEYXRhKGNvbnN0IFJlcXVlc3RlZFNjcm9sbERhdGEmKTsK IApAQCAtMTc2LDcgKzE4NCw5IEBAIHByaXZhdGU6CiAKICAgICBTY3JvbGxhYmxlQXJlYVBhcmFt ZXRlcnMgbV9zY3JvbGxhYmxlQXJlYVBhcmFtZXRlcnM7CiAgICAgUmVxdWVzdGVkU2Nyb2xsRGF0 YSBtX3JlcXVlc3RlZFNjcm9sbERhdGE7Ci0KKyNpZiBFTkFCTEUoU0NST0xMSU5HX1RIUkVBRCkK KyAgICBPcHRpb25TZXQ8U3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb24+IG1fc3luY2hyb25vdXNT Y3JvbGxpbmdSZWFzb25zOworI2VuZGlmCiAgICAgYm9vbCBtX2lzTW9uaXRvcmluZ1doZWVsRXZl bnRzIHsgZmFsc2UgfTsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGUuY3BwIGIvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZS5jcHAKaW5k ZXggZTBmZmVlMGUzY2I4YmM1YTI4MzJlMmJlZmVmZDhmMjNiZTExODc0NC4uNThjZWZlY2Q1YjBh NmVlOWUwMzE4NWUxZDhjNTczYWY1NDNlMWQxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5n Tm9kZS5jcHAKQEAgLTU0LDkgKzU0LDYgQEAgdm9pZCBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxp bmdOb2RlOjpjb21taXRTdGF0ZUJlZm9yZUNoaWxkcmVuKGNvbnN0IFNjcm9sbGluZ1MKICAgICBp ZiAoc3RhdGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdO b2RlOjpGcmFtZVNjYWxlRmFjdG9yKSkKICAgICAgICAgbV9mcmFtZVNjYWxlRmFjdG9yID0gc3Rh dGUuZnJhbWVTY2FsZUZhY3RvcigpOwogCi0gICAgaWYgKHN0YXRlLmhhc0NoYW5nZWRQcm9wZXJ0 eShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6UmVhc29uc0ZvclN5bmNocm9ub3Vz U2Nyb2xsaW5nKSkKLSAgICAgICAgbV9zeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMgPSBzdGF0 ZS5zeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMoKTsKLQogICAgIGlmIChzdGF0ZS5oYXNDaGFu Z2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OkhlYWRlckhlaWdo dCkpCiAgICAgICAgIG1faGVhZGVySGVpZ2h0ID0gc3RhdGUuaGVhZGVySGVpZ2h0KCk7CiAKQEAg LTE1Niw4ICsxNTMsNiBAQCB2b2lkIFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGU6OmR1 bXBQcm9wZXJ0aWVzKFRleHRTdHJlYW0mIHRzLCBTY3JvbGxpbmdTdAogICAgICAgICB0cy5kdW1w UHJvcGVydHkoImhlYWRlciBoZWlnaHQiLCBtX2hlYWRlckhlaWdodCk7CiAgICAgaWYgKG1fZm9v dGVySGVpZ2h0KQogICAgICAgICB0cy5kdW1wUHJvcGVydHkoImZvb3RlciBoZWlnaHQiLCBtX2Zv b3RlckhlaWdodCk7Ci0gICAgaWYgKCFtX3N5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucy5pc0Vt cHR5KCkpCi0gICAgICAgIHRzLmR1bXBQcm9wZXJ0eSgic3luY2hyb25vdXMgc2Nyb2xsaW5nIHJl YXNvbnMiLCBTY3JvbGxpbmdDb29yZGluYXRvcjo6c3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25z QXNUZXh0KG1fc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zKSk7CiAKICAgICB0cy5kdW1wUHJv cGVydHkoImJlaGF2aW9yIGZvciBmaXhlZCIsIG1fYmVoYXZpb3JGb3JGaXhlZCk7CiAgICAgaWYg KG1fZml4ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGUu aCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9s bGluZ05vZGUuaAppbmRleCAyMmYzYzJjMDUwZTMzZDk5YzVmMTZkZTFhZWI3ZjkwOWExN2QzMGU3 Li43MTc5YjJlZmJmZWNkMmY0ODMxOGI4YTg1ZDMyOTZmYzFlMDZlOGRlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdO b2RlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZUZy YW1lU2Nyb2xsaW5nTm9kZS5oCkBAIC00MSw4ICs0MSw2IEBAIHB1YmxpYzoKIAogICAgIHZvaWQg Y29tbWl0U3RhdGVCZWZvcmVDaGlsZHJlbihjb25zdCBTY3JvbGxpbmdTdGF0ZU5vZGUmKSBvdmVy cmlkZTsKICAgICAKLSAgICBPcHRpb25TZXQ8U3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb24+IHN5 bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucygpIGNvbnN0IHsgcmV0dXJuIG1fc3luY2hyb25vdXNT Y3JvbGxpbmdSZWFzb25zOyB9Ci0gICAgYm9vbCBzaG91bGRVcGRhdGVTY3JvbGxMYXllclBvc2l0 aW9uU3luY2hyb25vdXNseSgpIGNvbnN0IHsgcmV0dXJuICFtX3N5bmNocm9ub3VzU2Nyb2xsaW5n UmVhc29ucy5pc0VtcHR5KCk7IH0KICAgICBib29sIGZpeGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2 ZVRvRnJhbWUoKSBjb25zdCB7IHJldHVybiBtX2ZpeGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRv RnJhbWU7IH0KICAgICBib29sIHZpc3VhbFZpZXdwb3J0SXNTbWFsbGVyVGhhbkxheW91dFZpZXdw b3J0KCkgY29uc3QgeyByZXR1cm4gbV92aXN1YWxWaWV3cG9ydElzU21hbGxlclRoYW5MYXlvdXRW aWV3cG9ydDsgfQogCkBAIC04NSw3ICs4Myw2IEBAIHByaXZhdGU6CiAgICAgaW50IG1faGVhZGVy SGVpZ2h0IHsgMCB9OwogICAgIGludCBtX2Zvb3RlckhlaWdodCB7IDAgfTsKICAgICAKLSAgICBP cHRpb25TZXQ8U3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb24+IG1fc3luY2hyb25vdXNTY3JvbGxp bmdSZWFzb25zOwogICAgIFNjcm9sbEJlaGF2aW9yRm9yRml4ZWRFbGVtZW50cyBtX2JlaGF2aW9y Rm9yRml4ZWQgeyBTdGlja1RvRG9jdW1lbnRCb3VuZHMgfTsKICAgICAKICAgICBib29sIG1fZml4 ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSB7IGZhbHNlIH07CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5n Tm9kZS5jcHAKaW5kZXggN2I2NGRiYTkxNmY5NjVkMmNkZmE0YmRhM2U0YzU1YjY4MGEyZWEzNS4u NmI3Zjc3NDUzZmM0ZTEyOTVkNDk3ODE3ZmI5YTA3MjRmYmVkZjFlZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxp bmdOb2RlLmNwcApAQCAtOTQsNiArOTQsMTEgQEAgdm9pZCBTY3JvbGxpbmdUcmVlU2Nyb2xsaW5n Tm9kZTo6Y29tbWl0U3RhdGVCZWZvcmVDaGlsZHJlbihjb25zdCBTY3JvbGxpbmdTdGF0ZU4KICAg ICBpZiAoc3RhdGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9k ZTo6U2Nyb2xsYWJsZUFyZWFQYXJhbXMpKQogICAgICAgICBtX3Njcm9sbGFibGVBcmVhUGFyYW1l dGVycyA9IHN0YXRlLnNjcm9sbGFibGVBcmVhUGFyYW1ldGVycygpOwogCisjaWYgRU5BQkxFKFND Uk9MTElOR19USFJFQUQpCisgICAgaWYgKHN0YXRlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxp bmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6UmVhc29uc0ZvclN5bmNocm9ub3VzU2Nyb2xsaW5n KSkKKyAgICAgICAgbV9zeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMgPSBzdGF0ZS5zeW5jaHJv bm91c1Njcm9sbGluZ1JlYXNvbnMoKTsKKyNlbmRpZgorCiAgICAgaWYgKHN0YXRlLmhhc0NoYW5n ZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbENvbnRhaW5lckxh eWVyKSkKICAgICAgICAgbV9zY3JvbGxDb250YWluZXJMYXllciA9IHN0YXRlLnNjcm9sbENvbnRh aW5lckxheWVyKCk7CiAKQEAgLTIzOSw2ICsyNDQsMTEgQEAgdm9pZCBTY3JvbGxpbmdUcmVlU2Ny b2xsaW5nTm9kZTo6ZHVtcFByb3BlcnRpZXMoVGV4dFN0cmVhbSYgdHMsIFNjcm9sbGluZ1N0YXRl VHIKICNlbmRpZgogCiAgICAgdHMuZHVtcFByb3BlcnR5KCJzY3JvbGxhYmxlIGFyZWEgcGFyYW1l dGVycyIsIG1fc2Nyb2xsYWJsZUFyZWFQYXJhbWV0ZXJzKTsKKworI2lmIEVOQUJMRShTQ1JPTExJ TkdfVEhSRUFEKQorICAgIGlmICghbV9zeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMuaXNFbXB0 eSgpKQorICAgICAgICB0cy5kdW1wUHJvcGVydHkoInN5bmNocm9ub3VzIHNjcm9sbGluZyByZWFz b25zIiwgU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29uc0Fz VGV4dChtX3N5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucykpOworI2VuZGlmCiB9CiAKIH0gLy8g bmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs aW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Nj cm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5oCmluZGV4IDRlYTZiMzJjM2I1MGMw MmVlMGE0NjJiZjZiOWI1YzAzMmY4ZjA5ZmYuLjJiNDJlNDM2ZjJjYzliOTRmZjA2Njc1ZTc3ODY2 YjBkYzAzZmU3ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuaApAQCAtNjUsNiArNjUsMTEgQEAgcHVi bGljOgogCiAgICAgdm9pZCB3YXNTY3JvbGxlZEJ5RGVsZWdhdGVkU2Nyb2xsaW5nKGNvbnN0IEZs b2F0UG9pbnQmIHBvc2l0aW9uLCBPcHRpb25hbDxGbG9hdFJlY3Q+IG92ZXJyaWRlTGF5b3V0Vmll d3BvcnQgPSB7IH0sIFNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb24gPSBTY3JvbGxpbmdMYXll clBvc2l0aW9uQWN0aW9uOjpTeW5jKTsKICAgICAKKyNpZiBFTkFCTEUoU0NST0xMSU5HX1RIUkVB RCkKKyAgICBPcHRpb25TZXQ8U3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb24+IHN5bmNocm9ub3Vz U2Nyb2xsaW5nUmVhc29ucygpIGNvbnN0IHsgcmV0dXJuIG1fc3luY2hyb25vdXNTY3JvbGxpbmdS ZWFzb25zOyB9CisgICAgYm9vbCBzaG91bGRVcGRhdGVTY3JvbGxMYXllclBvc2l0aW9uU3luY2hy b25vdXNseSgpIGNvbnN0IHsgcmV0dXJuICFtX3N5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucy5p c0VtcHR5KCk7IH0KKyNlbmRpZgorCiAgICAgY29uc3QgRmxvYXRTaXplJiBzY3JvbGxhYmxlQXJl YVNpemUoKSBjb25zdCB7IHJldHVybiBtX3Njcm9sbGFibGVBcmVhU2l6ZTsgfQogICAgIGNvbnN0 IEZsb2F0U2l6ZSYgdG90YWxDb250ZW50c1NpemUoKSBjb25zdCB7IHJldHVybiBtX3RvdGFsQ29u dGVudHNTaXplOyB9CiAKQEAgLTE0MCw2ICsxNDUsOSBAQCBwcml2YXRlOgogICAgIHVuc2lnbmVk IG1fY3VycmVudFZlcnRpY2FsU25hcFBvaW50SW5kZXggeyAwIH07CiAjZW5kaWYKICAgICBTY3Jv bGxhYmxlQXJlYVBhcmFtZXRlcnMgbV9zY3JvbGxhYmxlQXJlYVBhcmFtZXRlcnM7CisjaWYgRU5B QkxFKFNDUk9MTElOR19USFJFQUQpCisgICAgT3B0aW9uU2V0PFN5bmNocm9ub3VzU2Nyb2xsaW5n UmVhc29uPiBtX3N5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29uczsKKyNlbmRpZgogICAgIGJvb2wg bV9pc0ZpcnN0Q29tbWl0IHsgdHJ1ZSB9OwogCiAgICAgTGF5ZXJSZXByZXNlbnRhdGlvbiBtX3Nj cm9sbENvbnRhaW5lckxheWVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvUmVt b3RlTGF5ZXJUcmVlL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yVHJhbnNhY3Rpb24uY3BwIGIv U291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZVNjcm9sbGluZ0Nvb3Jk aW5hdG9yVHJhbnNhY3Rpb24uY3BwCmluZGV4IDc5N2M3M2IzOWViNzE0MTQ3NzIwM2RhNzkzMzY0 MjQ5ZGI3YzNiNGIuLmQ1OTU2YzY1MmE4YTc3OWEwMTc2NWI5NzhlNzExZjcyMzQ3NDlhODkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVTY3Jv bGxpbmdDb29yZGluYXRvclRyYW5zYWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJl ZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JUcmFuc2FjdGlvbi5j cHAKQEAgLTE1Nyw2ICsxNTcsNyBAQCB2b2lkIEFyZ3VtZW50Q29kZXI8U2Nyb2xsaW5nU3RhdGVT Y3JvbGxpbmdOb2RlPjo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIsIGNvbnN0CiAgICAgU0NST0xM SU5HX05PREVfRU5DT0RFKFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6Q3VycmVudFZlcnRp Y2FsU25hcE9mZnNldEluZGV4LCBjdXJyZW50VmVydGljYWxTbmFwUG9pbnRJbmRleCkKICNlbmRp ZgogICAgIFNDUk9MTElOR19OT0RFX0VOQ09ERShTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6 OlNjcm9sbGFibGVBcmVhUGFyYW1zLCBzY3JvbGxhYmxlQXJlYVBhcmFtZXRlcnMpCisgICAgLy8g VUktc2lkZSBjb21wb3NpdGluZyBjYW4ndCBkbyBzeW5jaHJvbm91cyBzY3JvbGxpbmcgc28gZG9u J3QgZW5jb2RlIHN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucy4KICAgICBTQ1JPTExJTkdfTk9E RV9FTkNPREUoU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpSZXF1ZXN0ZWRTY3JvbGxQb3Np dGlvbiwgcmVxdWVzdGVkU2Nyb2xsRGF0YSkKIAogICAgIGlmIChub2RlLmhhc0NoYW5nZWRQcm9w ZXJ0eShTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbENvbnRhaW5lckxheWVyKSkK QEAgLTE3OCw3ICsxNzksNiBAQCB2b2lkIEFyZ3VtZW50Q29kZXI8U2Nyb2xsaW5nU3RhdGVGcmFt ZVNjcm9sbGluZ05vZGU+OjplbmNvZGUoRW5jb2RlciYgZW5jb2RlciwgYwogCiAgICAgU0NST0xM SU5HX05PREVfRU5DT0RFKFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpGcmFtZVNj YWxlRmFjdG9yLCBmcmFtZVNjYWxlRmFjdG9yKQogICAgIFNDUk9MTElOR19OT0RFX0VOQ09ERShT Y3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6RXZlbnRUcmFja2luZ1JlZ2lvbiwgZXZl bnRUcmFja2luZ1JlZ2lvbnMpCi0gICAgU0NST0xMSU5HX05PREVfRU5DT0RFKFNjcm9sbGluZ1N0 YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpSZWFzb25zRm9yU3luY2hyb25vdXNTY3JvbGxpbmcsIHN5 bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucykKICAgICBTQ1JPTExJTkdfTk9ERV9FTkNPREVfRU5V TShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6QmVoYXZpb3JGb3JGaXhlZEVsZW1l bnRzLCBzY3JvbGxCZWhhdmlvckZvckZpeGVkRWxlbWVudHMpCiAgICAgU0NST0xMSU5HX05PREVf RU5DT0RFKFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpIZWFkZXJIZWlnaHQsIGhl YWRlckhlaWdodCkKICAgICBTQ1JPTExJTkdfTk9ERV9FTkNPREUoU2Nyb2xsaW5nU3RhdGVGcmFt ZVNjcm9sbGluZ05vZGU6OkZvb3RlckhlaWdodCwgZm9vdGVySGVpZ2h0KQpAQCAtMjk1LDcgKzI5 NSw2IEBAIGJvb2wgQXJndW1lbnRDb2RlcjxTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9k ZT46OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyLCBTCiAKICAgICBTQ1JPTExJTkdfTk9ERV9ERUNP REUoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OkZyYW1lU2NhbGVGYWN0b3IsIGZs b2F0LCBzZXRGcmFtZVNjYWxlRmFjdG9yKTsKICAgICBTQ1JPTExJTkdfTk9ERV9ERUNPREUoU2Ny b2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OkV2ZW50VHJhY2tpbmdSZWdpb24sIEV2ZW50 VHJhY2tpbmdSZWdpb25zLCBzZXRFdmVudFRyYWNraW5nUmVnaW9ucyk7Ci0gICAgU0NST0xMSU5H X05PREVfREVDT0RFKFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpSZWFzb25zRm9y U3luY2hyb25vdXNTY3JvbGxpbmcsIE9wdGlvblNldDxTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNv bj4sIHNldFN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucyk7CiAgICAgU0NST0xMSU5HX05PREVf REVDT0RFX0VOVU0oU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OkJlaGF2aW9yRm9y Rml4ZWRFbGVtZW50cywgU2Nyb2xsQmVoYXZpb3JGb3JGaXhlZEVsZW1lbnRzLCBzZXRTY3JvbGxC ZWhhdmlvckZvckZpeGVkRWxlbWVudHMpOwogCiAgICAgU0NST0xMSU5HX05PREVfREVDT0RFKFNj cm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpIZWFkZXJIZWlnaHQsIGludCwgc2V0SGVh ZGVySGVpZ2h0KTsKQEAgLTY2OCw3ICs2NjcsNiBAQCBzdGF0aWMgdm9pZCBkdW1wKFRleHRTdHJl YW0mIHRzLCBjb25zdCBTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZSYgbm9kZSwgYgog ICAgICAgICB9CiAgICAgfQogCi0gICAgLy8gRklYTUU6IGR1bXAgc3luY2hyb25vdXNTY3JvbGxp bmdSZWFzb25zCiAgICAgLy8gRklYTUU6IGR1bXAgc2Nyb2xsYWJsZUFyZWFQYXJhbWV0ZXJzCiAg ICAgLy8gRklYTUU6IGR1bXAgc2Nyb2xsQmVoYXZpb3JGb3JGaXhlZEVsZW1lbnRzCiAKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl eCA4ZDgwNmZlMmM2YTA3ZjBmMDY0MGU3MTk3M2JhNjQ1NzYwNmIxZTNlLi44ZWM5N2NlN2FjNDI3 ZGExMDEwNjAwNThlNGExYWI3ZDY3M2Y3YzAxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAt MDMtMDYgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAg TW92ZSBzeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMgdG8gU2Nyb2xsaW5nVHJlZVNjcm9sbGlu Z05vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIw ODcyMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisJCVJlYmFzZWxp bmVkLgorCisgICAgICAgICogdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xsaW5nLXRyZWUt c2xvdy1zY3JvbGxpbmctZXhwZWN0ZWQudHh0OgorCiAyMDIwLTAzLTA2ICBBbnRvaW5lIFF1aW50 ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJlbW92ZSB0aGUgZXhwZXJpbWVudGFs IGZsYWcgZm9yIFBvaW50ZXIgRXZlbnRzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy90aWxlZC1k cmF3aW5nL3Njcm9sbGluZy9zY3JvbGxpbmctdHJlZS1zbG93LXNjcm9sbGluZy1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy90aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9zY3JvbGxpbmctdHJlZS1z bG93LXNjcm9sbGluZy1leHBlY3RlZC50eHQKaW5kZXggMWE5YTI1MmIzNTlmY2ZhMGY2ZjExZTUx YWJmM2Y2NzFhOGM5YzM0MS4uZDNmZDMxODkxMzhlMzYxOWY5MDRjMjNmOGQxMWM2NTZmNDMwYjJm ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvc2Nyb2xs aW5nLXRyZWUtc2xvdy1zY3JvbGxpbmctZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL3Rp bGVkLWRyYXdpbmcvc2Nyb2xsaW5nL3Njcm9sbGluZy10cmVlLXNsb3ctc2Nyb2xsaW5nLWV4cGVj dGVkLnR4dApAQCAtNywxMCArNywxMCBAQAogICAgICh2ZXJ0aWNhbCBzY3JvbGwgZWxhc3RpY2l0 eSAyKQogICAgIChob3Jpem9udGFsIHNjcm9sbGJhciBtb2RlIDApCiAgICAgKHZlcnRpY2FsIHNj cm9sbGJhciBtb2RlIDApKQorICAoU2Nyb2xsaW5nIG9uIG1haW4gdGhyZWFkIGJlY2F1c2U6IEhh cyBzbG93IHJlcGFpbnQgb2JqZWN0cykKICAgKGxheW91dCB2aWV3cG9ydCBhdCAoMCwwKSBzaXpl IDgwMHg2MDApCiAgIChtaW4gbGF5b3V0IHZpZXdwb3J0IG9yaWdpbiAoMCwwKSkKICAgKG1heCBs YXlvdXQgdmlld3BvcnQgb3JpZ2luICgwLDApKQotICAoU2Nyb2xsaW5nIG9uIG1haW4gdGhyZWFk IGJlY2F1c2U6IEhhcyBzbG93IHJlcGFpbnQgb2JqZWN0cykKICAgKGJlaGF2aW9yIGZvciBmaXhl ZCAwKQogKQogCg==