208697 2020-03-05 22:27:16 -0800 Use an OptionSet<> for SynchronousScrollingReasons 2020-03-06 08:08:13 -0800 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser cmarcelo commit-queue ews-watchlist fred.wang jamesr koivisto luiz simon.fraser tonikitoo webkit-bug-importer oldest_to_newest 1626518 0 simon.fraser 2020-03-05 22:27:16 -0800 Use an OptionSet<> for SynchronousScrollingReasons 1626519 1 392678 simon.fraser 2020-03-05 22:27:58 -0800 Created attachment 392678 Patch 1626664 2 simon.fraser 2020-03-06 08:07:36 -0800 https://trac.webkit.org/changeset/257996/webkit 1626665 3 webkit-bug-importer 2020-03-06 08:08:13 -0800 <rdar://problem/60151632> 392678 2020-03-05 22:27:58 -0800 2020-03-06 08:03:56 -0800 Patch bug-208697-20200305222758.patch text/plain 27003 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3OTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTYwMTBiOWZhMGY2MzY4 MGNjMjNmOWExYjNmNDdiM2IzYWJlNjM5YS4uNWNkNzBmYjA4NjRjZTJhMzcyYWNkMjljOWMyMmM0 NGZiZDg4NWQ3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDIwLTAzLTA1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFVzZSBhbiBPcHRp b25TZXQ8PiBmb3IgU3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg2OTcKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb252ZXJ0IFN5bmNocm9ub3VzU2Nyb2xs aW5nUmVhc29ucyB0byBhbiBPcHRpb25TZXQ8U3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb24+Lgor CisgICAgICAgICogcGFnZS9QZXJmb3JtYW5jZUxvZ2dpbmdDbGllbnQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UGVyZm9ybWFuY2VMb2dnaW5nQ2xpZW50OjpzeW5jaHJvbm91c1Njcm9sbGluZ1Jl YXNvbnNBc1N0cmluZyk6CisgICAgICAgICogcGFnZS9QZXJmb3JtYW5jZUxvZ2dpbmdDbGllbnQu aDoKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnNldFN5bmNo cm9ub3VzU2Nyb2xsaW5nUmVhc29ucyk6CisgICAgICAgIChXZWJDb3JlOjpBc3luY1Njcm9sbGlu Z0Nvb3JkaW5hdG9yOjpyZXBvcnRTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnNDaGFuZ2VkKToK KyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmg6Cisg ICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnN5bmNocm9ub3VzU2Nyb2xsaW5nUmVh c29ucyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdDb29yZGluYXRvcjo6c2hv dWxkVXBkYXRlU2Nyb2xsTGF5ZXJQb3NpdGlvblN5bmNocm9ub3VzbHkgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6U2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnN5bmNocm9ub3VzU2Nyb2xsaW5nUmVh c29uc0FzVGV4dCk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0 b3IuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpzZXRTeW5jaHJv bm91c1Njcm9sbGluZ1JlYXNvbnMpOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGlu Z0Nvb3JkaW5hdG9yVHlwZXMuaDoKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdT dGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdT dGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6c2V0U3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zKToK KyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpkdW1w UHJvcGVydGllcyBjb25zdCk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3Rh dGVGcmFtZVNjcm9sbGluZ05vZGUuaDoKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxp bmdUcmVlLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlOjpyZXBvcnRTeW5jaHJv bm91c1Njcm9sbGluZ1JlYXNvbnNDaGFuZ2VkKToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9T Y3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGU6OmR1bXBQcm9wZXJ0aWVzIGNvbnN0KToKKyAg ICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlLmg6 CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvVGhyZWFkZWRTY3JvbGxpbmdUcmVlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlRocmVhZGVkU2Nyb2xsaW5nVHJlZTo6cmVwb3J0U3luY2hyb25vdXNT Y3JvbGxpbmdSZWFzb25zQ2hhbmdlZCk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvVGhyZWFk ZWRTY3JvbGxpbmdUcmVlLmg6CisKIDIwMjAtMDItMjkgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBw bGUuY29tPgogCiAgICAgICAgIFNpbXBsaWZ5IGdyYWRpZW50IHBhcnNpbmcKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXgg MTQzZWI5NzQ3NzA2ZTA3YjMyMzc1ODJkMGU0ZDE3ZjI1YjIxNDQxYy4uNzAyMTg3YTk4OGUzZmM2 YjE0OGJlYjc3ZWRlNDVmN2M3MzUyY2RmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAy MC0wMy0wNSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAg ICBVc2UgYW4gT3B0aW9uU2V0PD4gZm9yIFN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4Njk3CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29udmVydCBTeW5j aHJvbm91c1Njcm9sbGluZ1JlYXNvbnMgdG8gYW4gT3B0aW9uU2V0PFN5bmNocm9ub3VzU2Nyb2xs aW5nUmVhc29uPi4KKworICAgICAgICAqIFNoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Ny b2xsaW5nQ29vcmRpbmF0b3JUcmFuc2FjdGlvbi5jcHA6CisgICAgICAgIChBcmd1bWVudENvZGVy PFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlPjo6ZGVjb2RlKToKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKwogMjAyMC0wMy0wNSAgQnJhZHkgRWlkc29uICA8 YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUHJlLWZldGNoIGZpcnN0IHBhZ2UgaW4gbmV3 IFBERiBsb2FkaW5nIG1vZGVsLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QZXJm b3JtYW5jZUxvZ2dpbmdDbGllbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5j ZUxvZ2dpbmdDbGllbnQuY3BwCmluZGV4IDlkNDRkOTQ0OGY4MDUzYWExNDNmYzdiNzliZDU0MmU4 Y2QxZGI2NDguLmY5ZDkxMTk4NWEyMDY0ZGZkYzQ4MDJjZjEyZjgxZjBkYWZmOGVkOGQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VMb2dnaW5nQ2xpZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlTG9nZ2luZ0NsaWVudC5jcHAKQEAg LTI2LDI3ICsyNiwyNiBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlBlcmZvcm1h bmNlTG9nZ2luZ0NsaWVudC5oIgogCi0jaW5jbHVkZSAiU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaCIK ICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAotU3RyaW5nIFBlcmZvcm1hbmNlTG9nZ2luZ0NsaWVudDo6c3luY2hyb25vdXNTY3JvbGxp bmdSZWFzb25zQXNTdHJpbmcoU3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zIHN5bmNocm9ub3Vz U2Nyb2xsaW5nUmVhc29ucykKK1N0cmluZyBQZXJmb3JtYW5jZUxvZ2dpbmdDbGllbnQ6OnN5bmNo cm9ub3VzU2Nyb2xsaW5nUmVhc29uc0FzU3RyaW5nKE9wdGlvblNldDxTeW5jaHJvbm91c1Njcm9s bGluZ1JlYXNvbj4gc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zKQogewotICAgIGlmICghc3lu Y2hyb25vdXNTY3JvbGxpbmdSZWFzb25zKQorICAgIGlmIChzeW5jaHJvbm91c1Njcm9sbGluZ1Jl YXNvbnMuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKIAogICAgIFN0 cmluZ0J1aWxkZXIgcmVhc29uczsKIAotICAgIGlmIChzeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNv bnMgJiBTY3JvbGxpbmdDb29yZGluYXRvcjo6Rm9yY2VkT25NYWluVGhyZWFkKQorICAgIGlmIChz eW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMgJiBTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbjo6 Rm9yY2VkT25NYWluVGhyZWFkKQogICAgICAgICByZWFzb25zLmFwcGVuZExpdGVyYWwoImZvcmNl ZCwiKTsKLSAgICBpZiAoc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zICYgU2Nyb2xsaW5nQ29v cmRpbmF0b3I6Okhhc1Nsb3dSZXBhaW50T2JqZWN0cykKKyAgICBpZiAoc3luY2hyb25vdXNTY3Jv bGxpbmdSZWFzb25zICYgU3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb246Okhhc1Nsb3dSZXBhaW50 T2JqZWN0cykKICAgICAgICAgcmVhc29ucy5hcHBlbmRMaXRlcmFsKCJzbG93LXJlcGFpbnQgb2Jq ZWN0cywiKTsKLSAgICBpZiAoc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zICYgU2Nyb2xsaW5n Q29vcmRpbmF0b3I6Okhhc1ZpZXdwb3J0Q29uc3RyYWluZWRPYmplY3RzV2l0aG91dFN1cHBvcnRp bmdGaXhlZExheWVycykKKyAgICBpZiAoc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zICYgU3lu Y2hyb25vdXNTY3JvbGxpbmdSZWFzb246Okhhc1ZpZXdwb3J0Q29uc3RyYWluZWRPYmplY3RzV2l0 aG91dFN1cHBvcnRpbmdGaXhlZExheWVycykKICAgICAgICAgcmVhc29ucy5hcHBlbmRMaXRlcmFs KCJ2aWV3cG9ydC1jb25zdHJhaW5lZCBvYmplY3RzLCIpOwotICAgIGlmIChzeW5jaHJvbm91c1Nj cm9sbGluZ1JlYXNvbnMgJiBTY3JvbGxpbmdDb29yZGluYXRvcjo6SGFzTm9uTGF5ZXJWaWV3cG9y dENvbnN0cmFpbmVkT2JqZWN0cykKKyAgICBpZiAoc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25z ICYgU3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb246Okhhc05vbkxheWVyVmlld3BvcnRDb25zdHJh aW5lZE9iamVjdHMpCiAgICAgICAgIHJlYXNvbnMuYXBwZW5kTGl0ZXJhbCgibm9uLWxheWVyIHZp ZXdwb3J0LWNvbnN0cmFpbmVkIG9iamVjdHMsIik7Ci0gICAgaWYgKHN5bmNocm9ub3VzU2Nyb2xs aW5nUmVhc29ucyAmIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpJc0ltYWdlRG9jdW1lbnQpCisgICAg aWYgKHN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucyAmIFN5bmNocm9ub3VzU2Nyb2xsaW5nUmVh c29uOjpJc0ltYWdlRG9jdW1lbnQpCiAgICAgICAgIHJlYXNvbnMuYXBwZW5kTGl0ZXJhbCgiaW1h Z2UgZG9jdW1lbnQsIik7CiAKICAgICAvLyBTdHJpcCB0aGUgdHJhaWxpbmcgY29tbWEuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlTG9nZ2luZ0NsaWVudC5oIGIv U291cmNlL1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5jZUxvZ2dpbmdDbGllbnQuaAppbmRleCBjODUy OTNiNTZhMWIzNzMwOWI1NzY3MmU0ZjViMmJkZjE2OTI0OWJkLi45ZTBiNjM4ZjIwZWI5ZTMwZGE0 NjQ4MjRjN2Q4NjQyZjkwMGRkYTRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Bl cmZvcm1hbmNlTG9nZ2luZ0NsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9y bWFuY2VMb2dnaW5nQ2xpZW50LmgKQEAgLTI1LDE0ICsyNSwxNCBAQAogCiAjcHJhZ21hIG9uY2UK IAorI2luY2x1ZGUgIlNjcm9sbGluZ0Nvb3JkaW5hdG9yVHlwZXMuaCIKICNpbmNsdWRlIDx3dGYv RmFzdE1hbGxvYy5oPgogI2luY2x1ZGUgPHd0Zi9Nb25vdG9uaWNUaW1lLmg+CisjaW5jbHVkZSA8 d3RmL09wdGlvblNldC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKLXR5cGVkZWYgdW5zaWduZWQgU3luY2hyb25vdXNTY3JvbGxpbmdS ZWFzb25zOwotCiBjbGFzcyBQZXJmb3JtYW5jZUxvZ2dpbmdDbGllbnQgewogICAgIFdURl9NQUtF X0ZBU1RfQUxMT0NBVEVEOwogcHVibGljOgpAQCAtNDMsNyArNDMsNyBAQCBwdWJsaWM6CiAgICAg fTsKICAgICB2aXJ0dWFsIHZvaWQgbG9nU2Nyb2xsaW5nRXZlbnQoU2Nyb2xsaW5nRXZlbnQsIE1v bm90b25pY1RpbWUsIHVpbnQ2NF90KSA9IDA7CiAKLSAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMg U3RyaW5nIHN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29uc0FzU3RyaW5nKFN5bmNocm9ub3VzU2Ny b2xsaW5nUmVhc29ucyk7CisgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIFN0cmluZyBzeW5jaHJv bm91c1Njcm9sbGluZ1JlYXNvbnNBc1N0cmluZyhPcHRpb25TZXQ8U3luY2hyb25vdXNTY3JvbGxp bmdSZWFzb24+KTsKIAogICAgIHZpcnR1YWwgflBlcmZvcm1hbmNlTG9nZ2luZ0NsaWVudCgpID0g ZGVmYXVsdDsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9B c3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs aW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCmluZGV4IGEwNjQzYTJmMDUzNjNmNGM0 YTQ5MTMyMjMyODI4NmJhYmMxYjg5MjguLjcxMzBlNmI0M2YwZmRlYTY5Yjg2ZDRjNjc3ODZhMTU3 YzFhOTg3YWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5j U2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs aW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCkBAIC03MzIsNyArNzMyLDcgQEAgdm9p ZCBBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjpzZXRSZWxhdGVkT3ZlcmZsb3dTY3JvbGxpbmdO b2RlcyhTY3JvbGxpbmdOb2RlSUQKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiB9CiAK LXZvaWQgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6c2V0U3luY2hyb25vdXNTY3JvbGxpbmdS ZWFzb25zKEZyYW1lVmlldyYgZnJhbWVWaWV3LCBTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMg cmVhc29ucykKK3ZvaWQgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6c2V0U3luY2hyb25vdXNT Y3JvbGxpbmdSZWFzb25zKEZyYW1lVmlldyYgZnJhbWVWaWV3LCBPcHRpb25TZXQ8U3luY2hyb25v dXNTY3JvbGxpbmdSZWFzb24+IHJlYXNvbnMpCiB7CiAgICAgYXV0byogc2Nyb2xsaW5nU3RhdGVO b2RlID0gc3RhdGljX2Nhc3Q8U2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGUqPihtX3Nj cm9sbGluZ1N0YXRlVHJlZS0+c3RhdGVOb2RlRm9ySUQoZnJhbWVWaWV3LnNjcm9sbGluZ05vZGVJ RCgpKSk7CiAgICAgaWYgKCFzY3JvbGxpbmdTdGF0ZU5vZGUpCkBAIC04NjgsMTAgKzg2OCwxMCBA QCB2b2lkIEFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnJlcG9ydEV4cG9zZWRVbmZpbGxlZEFy ZWEoTW9ub3RvbmljVGltZSB0aW1lc3RhbQogICAgICAgICBtX3BhZ2UtPnBlcmZvcm1hbmNlTG9n Z2luZ0NsaWVudCgpLT5sb2dTY3JvbGxpbmdFdmVudChQZXJmb3JtYW5jZUxvZ2dpbmdDbGllbnQ6 OlNjcm9sbGluZ0V2ZW50OjpFeHBvc2VkVGlsZWxlc3NBcmVhLCB0aW1lc3RhbXAsIHVuZmlsbGVk QXJlYSk7CiB9CiAKLXZvaWQgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6cmVwb3J0U3luY2hy b25vdXNTY3JvbGxpbmdSZWFzb25zQ2hhbmdlZChNb25vdG9uaWNUaW1lIHRpbWVzdGFtcCwgU3lu Y2hyb25vdXNTY3JvbGxpbmdSZWFzb25zIHJlYXNvbnMpCit2b2lkIEFzeW5jU2Nyb2xsaW5nQ29v cmRpbmF0b3I6OnJlcG9ydFN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29uc0NoYW5nZWQoTW9ub3Rv bmljVGltZSB0aW1lc3RhbXAsIE9wdGlvblNldDxTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbj4g cmVhc29ucykKIHsKICAgICBpZiAobV9wYWdlICYmIG1fcGFnZS0+cGVyZm9ybWFuY2VMb2dnaW5n Q2xpZW50KCkpCi0gICAgICAgIG1fcGFnZS0+cGVyZm9ybWFuY2VMb2dnaW5nQ2xpZW50KCktPmxv Z1Njcm9sbGluZ0V2ZW50KFBlcmZvcm1hbmNlTG9nZ2luZ0NsaWVudDo6U2Nyb2xsaW5nRXZlbnQ6 OlN3aXRjaGVkU2Nyb2xsaW5nTW9kZSwgdGltZXN0YW1wLCByZWFzb25zKTsKKyAgICAgICAgbV9w YWdlLT5wZXJmb3JtYW5jZUxvZ2dpbmdDbGllbnQoKS0+bG9nU2Nyb2xsaW5nRXZlbnQoUGVyZm9y bWFuY2VMb2dnaW5nQ2xpZW50OjpTY3JvbGxpbmdFdmVudDo6U3dpdGNoZWRTY3JvbGxpbmdNb2Rl LCB0aW1lc3RhbXAsIHJlYXNvbnMudG9SYXcoKSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xs aW5nQ29vcmRpbmF0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Ny b2xsaW5nQ29vcmRpbmF0b3IuaAppbmRleCBiZTAzNDY5MzA5ZGFiYWU5MjFjNzY4ODMzMjg4MGYy ZTNmMDJhYmUwLi5kMGU3MTFlMTUxNGRiNmU1NTZhM2U4ZGJhNTc0NWM5YTkyYzJhNzk3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3Jk aW5hdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxp bmdDb29yZGluYXRvci5oCkBAIC02Niw3ICs2Niw3IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VY UE9SVCB2b2lkIHVwZGF0ZUlzTW9uaXRvcmluZ1doZWVsRXZlbnRzRm9yRnJhbWVWaWV3KGNvbnN0 IEZyYW1lVmlldyYpIG92ZXJyaWRlOwogCiAgICAgdm9pZCByZXBvcnRFeHBvc2VkVW5maWxsZWRB cmVhKE1vbm90b25pY1RpbWUsIHVuc2lnbmVkIHVuZmlsbGVkQXJlYSk7Ci0gICAgdm9pZCByZXBv cnRTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnNDaGFuZ2VkKE1vbm90b25pY1RpbWUsIFN5bmNo cm9ub3VzU2Nyb2xsaW5nUmVhc29ucyk7CisgICAgdm9pZCByZXBvcnRTeW5jaHJvbm91c1Njcm9s bGluZ1JlYXNvbnNDaGFuZ2VkKE1vbm90b25pY1RpbWUsIE9wdGlvblNldDxTeW5jaHJvbm91c1Nj cm9sbGluZ1JlYXNvbj4pOwogCiBwcm90ZWN0ZWQ6CiAgICAgV0VCQ09SRV9FWFBPUlQgQXN5bmNT Y3JvbGxpbmdDb29yZGluYXRvcihQYWdlKik7CkBAIC0xMzMsNyArMTMzLDcgQEAgcHJpdmF0ZToK ICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHJlY29uY2lsZVZpZXdwb3J0Q29uc3RyYWluZWRMYXll clBvc2l0aW9ucyhTY3JvbGxpbmdOb2RlSUQsIGNvbnN0IExheW91dFJlY3QmIHZpZXdwb3J0UmVj dCwgU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbikgb3ZlcnJpZGU7CiAgICAgV0VCQ09SRV9F WFBPUlQgdm9pZCBzY3JvbGxhYmxlQXJlYVNjcm9sbGJhckxheWVyRGlkQ2hhbmdlKFNjcm9sbGFi bGVBcmVhJiwgU2Nyb2xsYmFyT3JpZW50YXRpb24pIG92ZXJyaWRlOwogCi0gICAgV0VCQ09SRV9F WFBPUlQgdm9pZCBzZXRTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMoRnJhbWVWaWV3JiwgU3lu Y2hyb25vdXNTY3JvbGxpbmdSZWFzb25zKSBmaW5hbDsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lk IHNldFN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucyhGcmFtZVZpZXcmLCBPcHRpb25TZXQ8U3lu Y2hyb25vdXNTY3JvbGxpbmdSZWFzb24+KSBmaW5hbDsKIAogICAgIHZpcnR1YWwgdm9pZCBzY2hl ZHVsZVRyZWVTdGF0ZUNvbW1pdCgpID0gMDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCmluZGV4IDViOTZiZDU5OWY0 NWJhNTA0YmU0YzQ4YThhYTFhOWZhNmMzMjU4Y2YuLjg4ODRmNmIxODAyZTZkNzNhZGM4OWUwMmZk MTI4OTQ4ZjNiNGRmNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s bGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5jcHAKQEAgLTMyNywxOCArMzI3LDE4IEBAIGJvb2wg U2Nyb2xsaW5nQ29vcmRpbmF0b3I6Omhhc1Zpc2libGVTbG93UmVwYWludFZpZXdwb3J0Q29uc3Ry YWluZWRPYmplY3RzKGNvbnN0CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1TeW5jaHJvbm91c1Nj cm9sbGluZ1JlYXNvbnMgU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnN5bmNocm9ub3VzU2Nyb2xsaW5n UmVhc29ucyhjb25zdCBGcmFtZVZpZXcmIGZyYW1lVmlldykgY29uc3QKK09wdGlvblNldDxTeW5j aHJvbm91c1Njcm9sbGluZ1JlYXNvbj4gU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnN5bmNocm9ub3Vz U2Nyb2xsaW5nUmVhc29ucyhjb25zdCBGcmFtZVZpZXcmIGZyYW1lVmlldykgY29uc3QKIHsKLSAg ICBTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMgc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25z ID0gKFN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucykwOworICAgIE9wdGlvblNldDxTeW5jaHJv bm91c1Njcm9sbGluZ1JlYXNvbj4gc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zOwogCiAgICAg aWYgKG1fZm9yY2VTeW5jaHJvbm91c1Njcm9sbExheWVyUG9zaXRpb25VcGRhdGVzKQotICAgICAg ICBzeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMgfD0gRm9yY2VkT25NYWluVGhyZWFkOworICAg ICAgICBzeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMuYWRkKFN5bmNocm9ub3VzU2Nyb2xsaW5n UmVhc29uOjpGb3JjZWRPbk1haW5UaHJlYWQpOwogICAgIGlmIChmcmFtZVZpZXcuaGFzU2xvd1Jl cGFpbnRPYmplY3RzKCkpCi0gICAgICAgIHN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucyB8PSBI YXNTbG93UmVwYWludE9iamVjdHM7CisgICAgICAgIHN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29u cy5hZGQoU3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb246Okhhc1Nsb3dSZXBhaW50T2JqZWN0cyk7 CiAgICAgaWYgKGhhc1Zpc2libGVTbG93UmVwYWludFZpZXdwb3J0Q29uc3RyYWluZWRPYmplY3Rz KGZyYW1lVmlldykpCi0gICAgICAgIHN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucyB8PSBIYXNO b25MYXllclZpZXdwb3J0Q29uc3RyYWluZWRPYmplY3RzOworICAgICAgICBzeW5jaHJvbm91c1Nj cm9sbGluZ1JlYXNvbnMuYWRkKFN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29uOjpIYXNOb25MYXll clZpZXdwb3J0Q29uc3RyYWluZWRPYmplY3RzKTsKICAgICBpZiAoZnJhbWVWaWV3LmZyYW1lKCku bWFpbkZyYW1lKCkuZG9jdW1lbnQoKSAmJiBmcmFtZVZpZXcuZnJhbWUoKS5kb2N1bWVudCgpLT5p c0ltYWdlRG9jdW1lbnQoKSkKLSAgICAgICAgc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zIHw9 IElzSW1hZ2VEb2N1bWVudDsKKyAgICAgICAgc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zLmFk ZChTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbjo6SXNJbWFnZURvY3VtZW50KTsKIAogICAgIHJl dHVybiBzeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnM7CiB9CkBAIC0zNzEsNyArMzcxLDcgQEAg dm9pZCBTY3JvbGxpbmdDb29yZGluYXRvcjo6c2V0Rm9yY2VTeW5jaHJvbm91c1Njcm9sbExheWVy UG9zaXRpb25VcGRhdGVzKGJvb2wgZm8KIGJvb2wgU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnNob3Vs ZFVwZGF0ZVNjcm9sbExheWVyUG9zaXRpb25TeW5jaHJvbm91c2x5KGNvbnN0IEZyYW1lVmlldyYg ZnJhbWVWaWV3KSBjb25zdAogewogICAgIGlmICgmZnJhbWVWaWV3ID09IG1fcGFnZS0+bWFpbkZy YW1lKCkudmlldygpKQotICAgICAgICByZXR1cm4gc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25z KGZyYW1lVmlldyk7CisgICAgICAgIHJldHVybiAhc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25z KGZyYW1lVmlldykuaXNFbXB0eSgpOwogICAgIAogICAgIHJldHVybiB0cnVlOwogfQpAQCAtMzg3 LDE5ICszODcsMTkgQEAgU3RyaW5nIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpzY3JvbGxpbmdTdGF0 ZVRyZWVBc1RleHQoU2Nyb2xsaW5nU3RhdGVUcmVlQXNUZXh0QmUKICAgICByZXR1cm4gU3RyaW5n KCk7CiB9CiAKLVN0cmluZyBTY3JvbGxpbmdDb29yZGluYXRvcjo6c3luY2hyb25vdXNTY3JvbGxp bmdSZWFzb25zQXNUZXh0KFN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucyByZWFzb25zKQorU3Ry aW5nIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpzeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnNBc1Rl eHQoT3B0aW9uU2V0PFN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29uPiByZWFzb25zKQogewogICAg IFN0cmluZ0J1aWxkZXIgc3RyaW5nQnVpbGRlcjsKIAotICAgIGlmIChyZWFzb25zICYgU2Nyb2xs aW5nQ29vcmRpbmF0b3I6OkZvcmNlZE9uTWFpblRocmVhZCkKKyAgICBpZiAocmVhc29ucyAmIFN5 bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29uOjpGb3JjZWRPbk1haW5UaHJlYWQpCiAgICAgICAgIHN0 cmluZ0J1aWxkZXIuYXBwZW5kTGl0ZXJhbCgiRm9yY2VkIG9uIG1haW4gdGhyZWFkLCAiKTsKLSAg ICBpZiAocmVhc29ucyAmIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpIYXNTbG93UmVwYWludE9iamVj dHMpCisgICAgaWYgKHJlYXNvbnMgJiBTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbjo6SGFzU2xv d1JlcGFpbnRPYmplY3RzKQogICAgICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZExpdGVyYWwoIkhh cyBzbG93IHJlcGFpbnQgb2JqZWN0cywgIik7Ci0gICAgaWYgKHJlYXNvbnMgJiBTY3JvbGxpbmdD b29yZGluYXRvcjo6SGFzVmlld3BvcnRDb25zdHJhaW5lZE9iamVjdHNXaXRob3V0U3VwcG9ydGlu Z0ZpeGVkTGF5ZXJzKQorICAgIGlmIChyZWFzb25zICYgU3luY2hyb25vdXNTY3JvbGxpbmdSZWFz b246Okhhc1ZpZXdwb3J0Q29uc3RyYWluZWRPYmplY3RzV2l0aG91dFN1cHBvcnRpbmdGaXhlZExh eWVycykKICAgICAgICAgc3RyaW5nQnVpbGRlci5hcHBlbmRMaXRlcmFsKCJIYXMgdmlld3BvcnQg Y29uc3RyYWluZWQgb2JqZWN0cyB3aXRob3V0IHN1cHBvcnRpbmcgZml4ZWQgbGF5ZXJzLCAiKTsK LSAgICBpZiAocmVhc29ucyAmIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpIYXNOb25MYXllclZpZXdw b3J0Q29uc3RyYWluZWRPYmplY3RzKQorICAgIGlmIChyZWFzb25zICYgU3luY2hyb25vdXNTY3Jv bGxpbmdSZWFzb246Okhhc05vbkxheWVyVmlld3BvcnRDb25zdHJhaW5lZE9iamVjdHMpCiAgICAg ICAgIHN0cmluZ0J1aWxkZXIuYXBwZW5kTGl0ZXJhbCgiSGFzIG5vbi1sYXllciB2aWV3cG9ydC1j b25zdHJhaW5lZCBvYmplY3RzLCAiKTsKLSAgICBpZiAocmVhc29ucyAmIFNjcm9sbGluZ0Nvb3Jk aW5hdG9yOjpJc0ltYWdlRG9jdW1lbnQpCisgICAgaWYgKHJlYXNvbnMgJiBTeW5jaHJvbm91c1Nj cm9sbGluZ1JlYXNvbjo6SXNJbWFnZURvY3VtZW50KQogICAgICAgICBzdHJpbmdCdWlsZGVyLmFw cGVuZExpdGVyYWwoIklzIGltYWdlIGRvY3VtZW50LCAiKTsKIAogICAgIGlmIChzdHJpbmdCdWls ZGVyLmxlbmd0aCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv U2Nyb2xsaW5nQ29vcmRpbmF0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ0Nvb3JkaW5hdG9yLmgKaW5kZXggMTM2ZTQyOTk4MTgwNTNlYjM5OTMxODVmZDZjMmVm NDZjYTVhZTczOC4uMTRlMDY0MDliNWNhZjBhZTBmOTRiNGJlMjUzZjEwOTgxOTU0NDRlNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0 b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGlu YXRvci5oCkBAIC0xNjgsMjEgKzE2OCwxMyBAQCBwdWJsaWM6CiAgICAgLy8gR2VuZXJhdGVkIGEg dW5pcXVlIGlkIGZvciBzY3JvbGxpbmcgbm9kZXMuCiAgICAgU2Nyb2xsaW5nTm9kZUlEIHVuaXF1 ZVNjcm9sbGluZ05vZGVJRCgpOwogCi0gICAgZW51bSBNYWluVGhyZWFkU2Nyb2xsaW5nUmVhc29u RmxhZ3MgewotICAgICAgICBGb3JjZWRPbk1haW5UaHJlYWQgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICA9IDEgPDwgMCwKLSAgICAgICAgSGFzU2xvd1JlcGFpbnRPYmpl Y3RzICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPSAxIDw8IDEsCi0gICAg ICAgIEhhc1ZpZXdwb3J0Q29uc3RyYWluZWRPYmplY3RzV2l0aG91dFN1cHBvcnRpbmdGaXhlZExh eWVycyAgID0gMSA8PCAyLAotICAgICAgICBIYXNOb25MYXllclZpZXdwb3J0Q29uc3RyYWluZWRP YmplY3RzICAgICAgICAgICAgICAgICAgICAgICA9IDEgPDwgMywKLSAgICAgICAgSXNJbWFnZURv Y3VtZW50ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPSAxIDw8 IDQKLSAgICB9OwotCi0gICAgU3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zIHN5bmNocm9ub3Vz U2Nyb2xsaW5nUmVhc29ucyhjb25zdCBGcmFtZVZpZXcmKSBjb25zdDsKKyAgICBPcHRpb25TZXQ8 U3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb24+IHN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucyhj b25zdCBGcmFtZVZpZXcmKSBjb25zdDsKICAgICBib29sIHNob3VsZFVwZGF0ZVNjcm9sbExheWVy UG9zaXRpb25TeW5jaHJvbm91c2x5KGNvbnN0IEZyYW1lVmlldyYpIGNvbnN0OwogCiAgICAgdmly dHVhbCB2b2lkIHdpbGxEZXN0cm95U2Nyb2xsYWJsZUFyZWEoU2Nyb2xsYWJsZUFyZWEmKSB7IH0K ICAgICB2aXJ0dWFsIHZvaWQgc2Nyb2xsYWJsZUFyZWFTY3JvbGxiYXJMYXllckRpZENoYW5nZShT Y3JvbGxhYmxlQXJlYSYsIFNjcm9sbGJhck9yaWVudGF0aW9uKSB7IH0KIAotICAgIHN0YXRpYyBT dHJpbmcgc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zQXNUZXh0KFN5bmNocm9ub3VzU2Nyb2xs aW5nUmVhc29ucyk7CisgICAgc3RhdGljIFN0cmluZyBzeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNv bnNBc1RleHQoT3B0aW9uU2V0PFN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29uPik7CiAgICAgU3Ry aW5nIHN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29uc0FzVGV4dCgpIGNvbnN0OwogCiAgICAgRXZl bnRUcmFja2luZ1JlZ2lvbnMgYWJzb2x1dGVFdmVudFRyYWNraW5nUmVnaW9ucygpIGNvbnN0OwpA QCAtMjA1LDcgKzE5Nyw3IEBAIHByb3RlY3RlZDoKICAgICBQYWdlKiBtX3BhZ2U7IC8vIEZJWE1F OiBpZGVhbGx5IHRoaXMgd291bGQgYmUgYSByZWZlcmVuY2UgYnV0IGl0IGdldHMgbnVsbGVkIG9u IGFzeW5jIHRlYXJkb3duLgogCiBwcml2YXRlOgotICAgIHZpcnR1YWwgdm9pZCBzZXRTeW5jaHJv bm91c1Njcm9sbGluZ1JlYXNvbnMoRnJhbWVWaWV3JiwgU3luY2hyb25vdXNTY3JvbGxpbmdSZWFz b25zKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgc2V0U3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25z KEZyYW1lVmlldyYsIE9wdGlvblNldDxTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbj4pIHsgfQog CiAgICAgdmlydHVhbCBib29sIGhhc1Zpc2libGVTbG93UmVwYWludFZpZXdwb3J0Q29uc3RyYWlu ZWRPYmplY3RzKGNvbnN0IEZyYW1lVmlldyYpIGNvbnN0OwogICAgIHZvaWQgdXBkYXRlU3luY2hy b25vdXNTY3JvbGxpbmdSZWFzb25zKEZyYW1lVmlldyYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3JUeXBlcy5oIGIvU291cmNl L1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3JUeXBlcy5oCmluZGV4 IDliMDJmZjUyZmI4YWE4MzRiYzE0ZmM0YzFlMGVhYjMyNDRiMTA5YmIuLjYzMGRhOTE3NmYyYzkx YTUxNGExZjg4OGI4MjcwZTI2M2Q2NWRjZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yVHlwZXMuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvclR5cGVzLmgKQEAgLTI5LDcg KzI5LDEzIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotdHlwZWRlZiB1bnNpZ25lZCBTeW5j aHJvbm91c1Njcm9sbGluZ1JlYXNvbnM7CitlbnVtIGNsYXNzIFN5bmNocm9ub3VzU2Nyb2xsaW5n UmVhc29uIHsKKyAgICBGb3JjZWRPbk1haW5UaHJlYWQgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICA9IDEgPDwgMCwKKyAgICBIYXNTbG93UmVwYWludE9iamVjdHMgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA9IDEgPDwgMSwKKyAgICBIYXNWaWV3 cG9ydENvbnN0cmFpbmVkT2JqZWN0c1dpdGhvdXRTdXBwb3J0aW5nRml4ZWRMYXllcnMgICA9IDEg PDwgMiwKKyAgICBIYXNOb25MYXllclZpZXdwb3J0Q29uc3RyYWluZWRPYmplY3RzICAgICAgICAg ICAgICAgICAgICAgICA9IDEgPDwgMywKKyAgICBJc0ltYWdlRG9jdW1lbnQgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA9IDEgPDwgNAorfTsKIAogZW51bSBjbGFz cyBTY3JvbGxpbmdOb2RlVHlwZSA6IHVpbnQ4X3QgewogICAgIE1haW5GcmFtZSwKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlRnJhbWVTY3Jv bGxpbmdOb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0 YXRlRnJhbWVTY3JvbGxpbmdOb2RlLmNwcAppbmRleCA4ODlmMjZmNGU2MzFhMDFiNTc5ZGQ5Y2Jh OTVmOGFhMDUxOGQ0YzU3Li5kYmM1OTUxYzhhMzk3Y2Y2MzQyODdkN2FjZGU2YzUzYzBmNzcyZmEy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0 ZUZyYW1lU2Nyb2xsaW5nTm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGUuY3BwCkBAIC0xMzMsNyArMTMzLDcg QEAgdm9pZCBTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6c2V0RXZlbnRUcmFja2lu Z1JlZ2lvbnMoY29uc3QgRXZlbnRUcmFja2kKICAgICBzZXRQcm9wZXJ0eUNoYW5nZWQoRXZlbnRU cmFja2luZ1JlZ2lvbik7CiB9CiAKLXZvaWQgU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05v ZGU6OnNldFN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucyhTeW5jaHJvbm91c1Njcm9sbGluZ1Jl YXNvbnMgcmVhc29ucykKK3ZvaWQgU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OnNl dFN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucyhPcHRpb25TZXQ8U3luY2hyb25vdXNTY3JvbGxp bmdSZWFzb24+IHJlYXNvbnMpCiB7CiAgICAgaWYgKG1fc3luY2hyb25vdXNTY3JvbGxpbmdSZWFz b25zID09IHJlYXNvbnMpCiAgICAgICAgIHJldHVybjsKQEAgLTM1Myw3ICszNTMsNyBAQCB2b2lk IFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpkdW1wUHJvcGVydGllcyhUZXh0U3Ry ZWFtJiB0cywgU2Nyb2xsaW5nUwogICAgICAgICB9CiAgICAgfQogCi0gICAgaWYgKG1fc3luY2hy b25vdXNTY3JvbGxpbmdSZWFzb25zKQorICAgIGlmICghbV9zeW5jaHJvbm91c1Njcm9sbGluZ1Jl YXNvbnMuaXNFbXB0eSgpKQogICAgICAgICB0cy5kdW1wUHJvcGVydHkoIlNjcm9sbGluZyBvbiBt YWluIHRocmVhZCBiZWNhdXNlOiIsIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpzeW5jaHJvbm91c1Nj cm9sbGluZ1JlYXNvbnNBc1RleHQobV9zeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMpKTsKICAg ICAKICAgICB0cy5kdW1wUHJvcGVydHkoImJlaGF2aW9yIGZvciBmaXhlZCIsIG1fYmVoYXZpb3JG b3JGaXhlZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3Jv bGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGUuaAppbmRleCA1ZThlM2IxMzll MWJmYzI5YWRkOTU5Mzk2YTE3MTUxZTVhNTM1ODhjLi41YmJkZjBiY2IwNmM0NDQ5OTFlMTlmNzNj MWFkZWVjOTRhZTMzNDdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGlu Zy9TY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlLmgKQEAgLTc1 LDggKzc1LDggQEAgcHVibGljOgogICAgIGNvbnN0IEV2ZW50VHJhY2tpbmdSZWdpb25zJiBldmVu dFRyYWNraW5nUmVnaW9ucygpIGNvbnN0IHsgcmV0dXJuIG1fZXZlbnRUcmFja2luZ1JlZ2lvbnM7 IH0KICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldEV2ZW50VHJhY2tpbmdSZWdpb25zKGNvbnN0 IEV2ZW50VHJhY2tpbmdSZWdpb25zJik7CiAKLSAgICBTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNv bnMgc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zKCkgY29uc3QgeyByZXR1cm4gbV9zeW5jaHJv bm91c1Njcm9sbGluZ1JlYXNvbnM7IH0KLSAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldFN5bmNo cm9ub3VzU2Nyb2xsaW5nUmVhc29ucyhTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMpOworICAg IE9wdGlvblNldDxTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbj4gc3luY2hyb25vdXNTY3JvbGxp bmdSZWFzb25zKCkgY29uc3QgeyByZXR1cm4gbV9zeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnM7 IH0KKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldFN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29u cyhPcHRpb25TZXQ8U3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb24+KTsKIAogICAgIFNjcm9sbEJl aGF2aW9yRm9yRml4ZWRFbGVtZW50cyBzY3JvbGxCZWhhdmlvckZvckZpeGVkRWxlbWVudHMoKSBj b25zdCB7IHJldHVybiBtX2JlaGF2aW9yRm9yRml4ZWQ7IH0KICAgICBXRUJDT1JFX0VYUE9SVCB2 b2lkIHNldFNjcm9sbEJlaGF2aW9yRm9yRml4ZWRFbGVtZW50cyhTY3JvbGxCZWhhdmlvckZvckZp eGVkRWxlbWVudHMpOwpAQCAtMTY0LDcgKzE2NCw3IEBAIHByaXZhdGU6CiAgICAgZmxvYXQgbV90 b3BDb250ZW50SW5zZXQgeyAwIH07CiAgICAgaW50IG1faGVhZGVySGVpZ2h0IHsgMCB9OwogICAg IGludCBtX2Zvb3RlckhlaWdodCB7IDAgfTsKLSAgICBTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNv bnMgbV9zeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMgeyAwIH07CisgICAgT3B0aW9uU2V0PFN5 bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29uPiBtX3N5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29uczsK ICAgICBTY3JvbGxCZWhhdmlvckZvckZpeGVkRWxlbWVudHMgbV9iZWhhdmlvckZvckZpeGVkIHsg U3RpY2tUb0RvY3VtZW50Qm91bmRzIH07CiAgICAgYm9vbCBtX2ZpeGVkRWxlbWVudHNMYXlvdXRS ZWxhdGl2ZVRvRnJhbWUgeyBmYWxzZSB9OwogICAgIGJvb2wgbV92aXN1YWxWaWV3cG9ydElzU21h bGxlclRoYW5MYXlvdXRWaWV3cG9ydCB7IGZhbHNlIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmgKaW5kZXggZGQ1ZTU0YzEwYTgwMmQ5NjhmNWY2YmMw MmE3ZGRhYTU4NDE2MGE3Ni4uOGNjYmE1YmUxMjg1ZTA5Yzg4Y2RiNjI5NzYzZTFjYzg5ZDk4ZDIz MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJl ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuaApA QCAtOTIsNyArOTIsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIG5vdGlmeVJlbGF0ZWROb2Rlc0Fm dGVyU2Nyb2xsUG9zaXRpb25DaGFuZ2UoU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUmIGNoYW5n ZWROb2RlKTsKIAotICAgIHZpcnR1YWwgdm9pZCByZXBvcnRTeW5jaHJvbm91c1Njcm9sbGluZ1Jl YXNvbnNDaGFuZ2VkKE1vbm90b25pY1RpbWUsIFN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucykg eyB9CisgICAgdmlydHVhbCB2b2lkIHJlcG9ydFN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29uc0No YW5nZWQoTW9ub3RvbmljVGltZSwgT3B0aW9uU2V0PFN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29u PikgeyB9CiAgICAgdmlydHVhbCB2b2lkIHJlcG9ydEV4cG9zZWRVbmZpbGxlZEFyZWEoTW9ub3Rv bmljVGltZSwgdW5zaWduZWQgLyogdW5maWxsZWRBcmVhICovKSB7IH0KIAogI2lmIFBMQVRGT1JN KElPU19GQU1JTFkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9T Y3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGUuY3BwCmluZGV4IGUwNDZl YzI4NWYwYmEyMzYxNTExNzVlMTEwYjg4MmFiNjcyYmExNTkuLmUwZmZlZTBlM2NiOGJjNWEyODMy ZTJiZWZlZmQ4ZjIzYmUxMTg3NDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGUuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGUuY3Bw CkBAIC0xNTYsNyArMTU2LDcgQEAgdm9pZCBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2Rl OjpkdW1wUHJvcGVydGllcyhUZXh0U3RyZWFtJiB0cywgU2Nyb2xsaW5nU3QKICAgICAgICAgdHMu ZHVtcFByb3BlcnR5KCJoZWFkZXIgaGVpZ2h0IiwgbV9oZWFkZXJIZWlnaHQpOwogICAgIGlmICht X2Zvb3RlckhlaWdodCkKICAgICAgICAgdHMuZHVtcFByb3BlcnR5KCJmb290ZXIgaGVpZ2h0Iiwg bV9mb290ZXJIZWlnaHQpOwotICAgIGlmIChtX3N5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucykK KyAgICBpZiAoIW1fc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zLmlzRW1wdHkoKSkKICAgICAg ICAgdHMuZHVtcFByb3BlcnR5KCJzeW5jaHJvbm91cyBzY3JvbGxpbmcgcmVhc29ucyIsIFNjcm9s bGluZ0Nvb3JkaW5hdG9yOjpzeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnNBc1RleHQobV9zeW5j aHJvbm91c1Njcm9sbGluZ1JlYXNvbnMpKTsKIAogICAgIHRzLmR1bXBQcm9wZXJ0eSgiYmVoYXZp b3IgZm9yIGZpeGVkIiwgbV9iZWhhdmlvckZvckZpeGVkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGUuaCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGlu Z05vZGUuaAppbmRleCBkYjZiZTZhMzAzYzkwNzEyNDg4NGMxMDdkZDVhNGIzZTE5MDU0MjM3Li4y MmYzYzJjMDUwZTMzZDk5YzVmMTZkZTFhZWI3ZjkwOWExN2QzMGU3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2Rl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZUZyYW1l U2Nyb2xsaW5nTm9kZS5oCkBAIC00MSw4ICs0MSw4IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgY29t bWl0U3RhdGVCZWZvcmVDaGlsZHJlbihjb25zdCBTY3JvbGxpbmdTdGF0ZU5vZGUmKSBvdmVycmlk ZTsKICAgICAKLSAgICBTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMgc3luY2hyb25vdXNTY3Jv bGxpbmdSZWFzb25zKCkgY29uc3QgeyByZXR1cm4gbV9zeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNv bnM7IH0KLSAgICBib29sIHNob3VsZFVwZGF0ZVNjcm9sbExheWVyUG9zaXRpb25TeW5jaHJvbm91 c2x5KCkgY29uc3QgeyByZXR1cm4gbV9zeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnM7IH0KKyAg ICBPcHRpb25TZXQ8U3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb24+IHN5bmNocm9ub3VzU2Nyb2xs aW5nUmVhc29ucygpIGNvbnN0IHsgcmV0dXJuIG1fc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25z OyB9CisgICAgYm9vbCBzaG91bGRVcGRhdGVTY3JvbGxMYXllclBvc2l0aW9uU3luY2hyb25vdXNs eSgpIGNvbnN0IHsgcmV0dXJuICFtX3N5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucy5pc0VtcHR5 KCk7IH0KICAgICBib29sIGZpeGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUoKSBjb25z dCB7IHJldHVybiBtX2ZpeGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWU7IH0KICAgICBi b29sIHZpc3VhbFZpZXdwb3J0SXNTbWFsbGVyVGhhbkxheW91dFZpZXdwb3J0KCkgY29uc3QgeyBy ZXR1cm4gbV92aXN1YWxWaWV3cG9ydElzU21hbGxlclRoYW5MYXlvdXRWaWV3cG9ydDsgfQogCkBA IC04NSw3ICs4NSw3IEBAIHByaXZhdGU6CiAgICAgaW50IG1faGVhZGVySGVpZ2h0IHsgMCB9Owog ICAgIGludCBtX2Zvb3RlckhlaWdodCB7IDAgfTsKICAgICAKLSAgICBTeW5jaHJvbm91c1Njcm9s bGluZ1JlYXNvbnMgbV9zeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMgeyAwIH07CisgICAgT3B0 aW9uU2V0PFN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29uPiBtX3N5bmNocm9ub3VzU2Nyb2xsaW5n UmVhc29uczsKICAgICBTY3JvbGxCZWhhdmlvckZvckZpeGVkRWxlbWVudHMgbV9iZWhhdmlvckZv ckZpeGVkIHsgU3RpY2tUb0RvY3VtZW50Qm91bmRzIH07CiAgICAgCiAgICAgYm9vbCBtX2ZpeGVk RWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUgeyBmYWxzZSB9OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvVGhyZWFkZWRTY3JvbGxpbmdUcmVlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5jcHAKaW5k ZXggNWRjZmZkN2UwODgwNzk4YzRhZTA3NGEzZjMxNGI2MTk1OTkxMTZjNy4uODEwYWZkNDQzMWYy ZTExYTNlYjA0MTJlZWU1YmNhYTdlZTIwYWNlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvVGhyZWFkZWRTY3JvbGxpbmdUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9UaHJlYWRlZFNjcm9sbGluZ1RyZWUuY3BwCkBAIC0xMjcsNyAr MTI3LDcgQEAgdm9pZCBUaHJlYWRlZFNjcm9sbGluZ1RyZWU6OnNjcm9sbGluZ1RyZWVOb2RlRGlk U2Nyb2xsKFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2QKICAgICB9KTsKIH0KIAotdm9pZCBUaHJl YWRlZFNjcm9sbGluZ1RyZWU6OnJlcG9ydFN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29uc0NoYW5n ZWQoTW9ub3RvbmljVGltZSB0aW1lc3RhbXAsIFN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucyBy ZWFzb25zKQordm9pZCBUaHJlYWRlZFNjcm9sbGluZ1RyZWU6OnJlcG9ydFN5bmNocm9ub3VzU2Ny b2xsaW5nUmVhc29uc0NoYW5nZWQoTW9ub3RvbmljVGltZSB0aW1lc3RhbXAsIE9wdGlvblNldDxT eW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbj4gcmVhc29ucykKIHsKICAgICBSdW5Mb29wOjptYWlu KCkuZGlzcGF0Y2goW3Njcm9sbGluZ0Nvb3JkaW5hdG9yID0gbV9zY3JvbGxpbmdDb29yZGluYXRv ciwgdGltZXN0YW1wLCByZWFzb25zXSB7CiAgICAgICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5y ZXBvcnRTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnNDaGFuZ2VkKHRpbWVzdGFtcCwgcmVhc29u cyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9UaHJlYWRlZFNj cm9sbGluZ1RyZWUuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Ny b2xsaW5nVHJlZS5oCmluZGV4IGVjOTcyNDJjODEwZDQxOGNmZjEwZDdiYjZlNDg4ZGQ0NDI4OWM3 OTIuLjA1ZGRjNWNkMDM4YjY5NTgyOTUyNDA5NzAyNWY3MjUxMDhjNWI2ZmYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5o CkBAIC03NSw3ICs3NSw3IEBAIHByb3RlY3RlZDoKICNlbmRpZgogCiAgICAgdm9pZCByZXBvcnRF eHBvc2VkVW5maWxsZWRBcmVhKE1vbm90b25pY1RpbWUsIHVuc2lnbmVkIHVuZmlsbGVkQXJlYSkg b3ZlcnJpZGU7Ci0gICAgdm9pZCByZXBvcnRTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnNDaGFu Z2VkKE1vbm90b25pY1RpbWUsIFN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucykgb3ZlcnJpZGU7 CisgICAgdm9pZCByZXBvcnRTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnNDaGFuZ2VkKE1vbm90 b25pY1RpbWUsIE9wdGlvblNldDxTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbj4pIG92ZXJyaWRl OwogCiBwcml2YXRlOgogICAgIGJvb2wgaXNUaHJlYWRlZFNjcm9sbGluZ1RyZWUoKSBjb25zdCBv dmVycmlkZSB7IHJldHVybiB0cnVlOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJl ZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JUcmFuc2FjdGlvbi5j cHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5n Q29vcmRpbmF0b3JUcmFuc2FjdGlvbi5jcHAKaW5kZXggMDY2NjFkZjNhMjk3N2NhMDMyMTIyNDVl NmI2OGM0ZDU2NmZlN2Q4My4uNzk3YzczYjM5ZWI3MTQxNDc3MjAzZGE3OTMzNjQyNDlkYjdjM2I0 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90 ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yVHJhbnNhY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv U2hhcmVkL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclRyYW5zYWN0 aW9uLmNwcApAQCAtMjk1LDcgKzI5NSw3IEBAIGJvb2wgQXJndW1lbnRDb2RlcjxTY3JvbGxpbmdT dGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZT46OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyLCBTCiAKICAg ICBTQ1JPTExJTkdfTk9ERV9ERUNPREUoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6 OkZyYW1lU2NhbGVGYWN0b3IsIGZsb2F0LCBzZXRGcmFtZVNjYWxlRmFjdG9yKTsKICAgICBTQ1JP TExJTkdfTk9ERV9ERUNPREUoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OkV2ZW50 VHJhY2tpbmdSZWdpb24sIEV2ZW50VHJhY2tpbmdSZWdpb25zLCBzZXRFdmVudFRyYWNraW5nUmVn aW9ucyk7Ci0gICAgU0NST0xMSU5HX05PREVfREVDT0RFKFNjcm9sbGluZ1N0YXRlRnJhbWVTY3Jv bGxpbmdOb2RlOjpSZWFzb25zRm9yU3luY2hyb25vdXNTY3JvbGxpbmcsIFN5bmNocm9ub3VzU2Ny b2xsaW5nUmVhc29ucywgc2V0U3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zKTsKKyAgICBTQ1JP TExJTkdfTk9ERV9ERUNPREUoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OlJlYXNv bnNGb3JTeW5jaHJvbm91c1Njcm9sbGluZywgT3B0aW9uU2V0PFN5bmNocm9ub3VzU2Nyb2xsaW5n UmVhc29uPiwgc2V0U3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zKTsKICAgICBTQ1JPTExJTkdf Tk9ERV9ERUNPREVfRU5VTShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6QmVoYXZp b3JGb3JGaXhlZEVsZW1lbnRzLCBTY3JvbGxCZWhhdmlvckZvckZpeGVkRWxlbWVudHMsIHNldFNj cm9sbEJlaGF2aW9yRm9yRml4ZWRFbGVtZW50cyk7CiAKICAgICBTQ1JPTExJTkdfTk9ERV9ERUNP REUoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OkhlYWRlckhlaWdodCwgaW50LCBz ZXRIZWFkZXJIZWlnaHQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAK aW5kZXggMjg3OWViYThjZTVhZjc1N2EzYjBhODAyYjA5Yjk3MWVhNTIzNjRiMC4uNTRhY2ExNjgy OTYzM2Y4OWM0YTJiYjc3YTU4NTdlNTNkYTY2NjI1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwCkBAIC03MTQ3LDcgKzcxNDcsNyBAQCB2b2lkIFdlYlBhZ2VQcm94 eTo6bG9nU2Nyb2xsaW5nRXZlbnQodWludDMyX3QgZXZlbnRUeXBlLCBNb25vdG9uaWNUaW1lIHRp bWVzdGFtcAogICAgICAgICBicmVhazsKICAgICBjYXNlIFBlcmZvcm1hbmNlTG9nZ2luZ0NsaWVu dDo6U2Nyb2xsaW5nRXZlbnQ6OlN3aXRjaGVkU2Nyb2xsaW5nTW9kZToKICAgICAgICAgaWYgKGRh dGEpCi0gICAgICAgICAgICBXVEZMb2dBbHdheXMoIlNDUk9MTElORzogU3dpdGNoaW5nIHRvIG1h aW4tdGhyZWFkIHNjcm9sbGluZyBtb2RlLiBUaW1lOiAlZiBSZWFzb24ocyk6ICVzXG4iLCB0aW1l c3RhbXAuc2Vjb25kc1NpbmNlRXBvY2goKS52YWx1ZSgpLCBQZXJmb3JtYW5jZUxvZ2dpbmdDbGll bnQ6OnN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29uc0FzU3RyaW5nKGRhdGEpLnV0ZjgoKS5kYXRh KCkpOworICAgICAgICAgICAgV1RGTG9nQWx3YXlzKCJTQ1JPTExJTkc6IFN3aXRjaGluZyB0byBt YWluLXRocmVhZCBzY3JvbGxpbmcgbW9kZS4gVGltZTogJWYgUmVhc29uKHMpOiAlc1xuIiwgdGlt ZXN0YW1wLnNlY29uZHNTaW5jZUVwb2NoKCkudmFsdWUoKSwgUGVyZm9ybWFuY2VMb2dnaW5nQ2xp ZW50OjpzeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnNBc1N0cmluZyhPcHRpb25TZXQ8U3luY2hy b25vdXNTY3JvbGxpbmdSZWFzb24+Ojpmcm9tUmF3KGRhdGEpKS51dGY4KCkuZGF0YSgpKTsKICAg ICAgICAgZWxzZQogICAgICAgICAgICAgV1RGTG9nQWx3YXlzKCJTQ1JPTExJTkc6IFN3aXRjaGlu ZyB0byB0aHJlYWRlZCBzY3JvbGxpbmcgbW9kZS4gVGltZTogJWZcbiIsIHRpbWVzdGFtcC5zZWNv bmRzU2luY2VFcG9jaCgpLnZhbHVlKCkpOwogICAgICAgICBicmVhazsK