196589 2019-04-03 20:00:13 -0700 Simplify some "programmaticScroll" code paths 2019-04-03 20:58:21 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser cmarcelo commit-queue ews-watchlist fred.wang jamesr luiz simon.fraser tonikitoo webkit-bug-importer zalan oldest_to_newest 1524123 0 simon.fraser 2019-04-03 20:00:13 -0700 Simplify some "programmaticScroll" code paths 1524127 1 366698 simon.fraser 2019-04-03 20:06:20 -0700 Created attachment 366698 Patch 1524152 2 366698 commit-queue 2019-04-03 20:57:33 -0700 Comment on attachment 366698 Patch Clearing flags on attachment: 366698 Committed r243855: <https://trac.webkit.org/changeset/243855> 1524153 3 commit-queue 2019-04-03 20:57:35 -0700 All reviewed patches have been landed. Closing bug. 1524154 4 webkit-bug-importer 2019-04-03 20:58:21 -0700 <rdar://problem/49590781> 366698 2019-04-03 20:06:20 -0700 2019-04-03 20:57:33 -0700 Patch bug-196589-20190403200619.patch text/plain 22340 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzODQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGYzZmZmNjRjNGY2M2Fl ZDI0ZTQ3NWI3YTdjZTc2ZWE4NTNjM2FkYy4uMDVlNjRjNWEyMTkxYTZlNzU1ZjVlMGQyNDU2M2Vj ZTA5Y2JiYTZkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE5LTA0LTAzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFNpbXBsaWZ5IHNv bWUgInByb2dyYW1tYXRpY1Njcm9sbCIgY29kZSBwYXRocworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2NTg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6c2No ZWR1bGVVcGRhdGVTY3JvbGxQb3NpdGlvbkFmdGVyQXN5bmNTY3JvbGwoKSBqdXN0IHJldHVybmVk IGVhcmx5IGlmIHByb2dyYW1tYXRpY1Njcm9sbAorICAgICAgICB3YXMgdHJ1ZSwgc28gaW5zdGVh ZCwganVzdCBuZXZlciBjYWxsIGl0LiBUaGlzIG1lYW5zIHdlIGNhbiByZW1vdmUgdGhlICJwcm9n cmFtbWF0aWNTY3JvbGwiIGFyZ3VtZW50IGZyb20gCisgICAgICAgIHNjaGVkdWxlVXBkYXRlU2Ny b2xsUG9zaXRpb25BZnRlckFzeW5jU2Nyb2xsKCkuIEFsc28gY2hhbmdlIHNvbWUgY2FsbGVycyB0 byB1c2UgdGhlIFNjcm9sbFR5cGUgZW51bQorICAgICAgICBpbnN0ZWFkIG9mIGEgYm9vbC4KKwor ICAgICAgICBOb3csIFRocmVhZGVkU2Nyb2xsaW5nVHJlZTo6c2Nyb2xsaW5nVHJlZU5vZGVEaWRT Y3JvbGwoKSBqdXN0IHJldHVybnMgZWFybHkuIFByb2dyYW1tYXRpYyBzY3JvbGxzCisgICAgICAg IHVwZGF0ZSBzdGF0ZSBvbiB0aGUgbWFpbiB0aHJlYWQgYmVmb3JlIHVwZGF0aW5nIHRoZSBzY3Jv bGxpbmcgdHJlZSwgc28gdGhpcyBtYWtlcyBzZW5zZS4KKworICAgICAgICAqIHBhZ2Uvc2Nyb2xs aW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXN5 bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6cmVxdWVzdFNjcm9sbFBvc2l0aW9uVXBkYXRlKToKKyAg ICAgICAgKFdlYkNvcmU6OkFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnNjaGVkdWxlVXBkYXRl U2Nyb2xsUG9zaXRpb25BZnRlckFzeW5jU2Nyb2xsKToKKyAgICAgICAgKFdlYkNvcmU6OkFzeW5j U2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnVwZGF0ZVNjcm9sbFBvc2l0aW9uQWZ0ZXJBc3luY1Njcm9s bFRpbWVyRmlyZWQpOgorICAgICAgICAoV2ViQ29yZTo6QXN5bmNTY3JvbGxpbmdDb29yZGluYXRv cjo6dXBkYXRlU2Nyb2xsUG9zaXRpb25BZnRlckFzeW5jU2Nyb2xsKToKKyAgICAgICAgKFdlYkNv cmU6OkFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnJlY29uY2lsZVNjcm9sbGluZ1N0YXRlKToK KyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmg6Cisg ICAgICAgIChXZWJDb3JlOjpBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjpTY2hlZHVsZWRTY3Jv bGxVcGRhdGU6OlNjaGVkdWxlZFNjcm9sbFVwZGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpBc3lu Y1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjpTY2hlZHVsZWRTY3JvbGxVcGRhdGU6Om1hdGNoZXNVcGRh dGVUeXBlIGNvbnN0KToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGlu YXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpvcGVyYXRvcjw8KToKKyAgICAgICAgKiBwYWdl L3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5oOgorICAgICAgICAoV2ViQ29yZTo6U2Ny b2xsaW5nQ29vcmRpbmF0b3I6OnJlY29uY2lsZVNjcm9sbGluZ1N0YXRlKToKKyAgICAgICAgKiBw YWdlL3Njcm9sbGluZy9UaHJlYWRlZFNjcm9sbGluZ1RyZWUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6VGhyZWFkZWRTY3JvbGxpbmdUcmVlOjpzY3JvbGxpbmdUcmVlTm9kZURpZFNjcm9sbCk6CisK IDIwMTktMDQtMDMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAg ICAgICAgUmVtb3ZlIHNvbWUgcmVkdW5kYW50IG1lbWViZXJzIGZyb20gU2Nyb2xsaW5nU3RhdGVG cmFtZVNjcm9sbGluZ05vZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggOTAyNmFjMWM5MWNhYjNkYzI0MmVkNjU3OGUy NzQyNzAxMGM3Zjg3Ny4uODg2ZWNiMDhlOTEyNWUxMTUyYjNhOGRiMDc1YzA1ZTRmYWQ4NTBjNSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxOS0wNC0wMyAgU2ltb24gRnJhc2VyICA8c2lt b24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBTaW1wbGlmeSBzb21lICJwcm9ncmFtbWF0 aWNTY3JvbGwiIGNvZGUgcGF0aHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE5NjU4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVT Y3JvbGxpbmdDb29yZGluYXRvci5tbTogUmVtb3ZlIHRoZSBwYXJhbWV0ZXIuCisgICAgICAgIChX ZWJLaXQ6OlJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpzY3JvbGxQb3NpdGlvbkNoYW5nZWRG b3JOb2RlKTogVXNlIHRoZSBlbnVtIHR5cGUuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdl L2lvcy9XZWJQYWdlSU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp1cGRhdGVWaXNp YmxlQ29udGVudFJlY3RzKToKKwogMjAxOS0wNC0wMyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJh c2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgdGhlIGlzUHJvZ3JhbW1hdGljU2Nyb2xs IGFyZ3VtZW50IHRvIHJlcXVlc3RTY3JvbGwoKSBiZWNhdXNlIG5vLW9uZSB1c2VzIGl0CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3Jk aW5hdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5n Q29vcmRpbmF0b3IuY3BwCmluZGV4IDliNmMwMTJlNTMwZmI4Y2E5YTM4ZDBhZDk2M2EwNDZiMDc3 NzQ4MjguLjEwOTBmOTU4Y2E0YmI1NzI5MzE4MTZjOGExOWQzYjFlNzZjYmQzODUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0 b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5n Q29vcmRpbmF0b3IuY3BwCkBAIC0yMTIsMjAgKzIxMiwyMSBAQCBib29sIEFzeW5jU2Nyb2xsaW5n Q29vcmRpbmF0b3I6OnJlcXVlc3RTY3JvbGxQb3NpdGlvblVwZGF0ZShGcmFtZVZpZXcmIGZyYW1l VmlldwogICAgIGlmICghY29vcmRpbmF0ZXNTY3JvbGxpbmdGb3JGcmFtZVZpZXcoZnJhbWVWaWV3 KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgYm9vbCBpc1Byb2dyYW1tYXRpY1Njcm9s bCA9IGZyYW1lVmlldy5pblByb2dyYW1tYXRpY1Njcm9sbCgpOwotICAgIGlmIChpc1Byb2dyYW1t YXRpY1Njcm9sbCB8fCBmcmFtZVZpZXcuZnJhbWUoKS5kb2N1bWVudCgpLT5wYWdlQ2FjaGVTdGF0 ZSgpICE9IERvY3VtZW50OjpOb3RJblBhZ2VDYWNoZSkKLSAgICAgICAgdXBkYXRlU2Nyb2xsUG9z aXRpb25BZnRlckFzeW5jU2Nyb2xsKGZyYW1lVmlldy5zY3JvbGxpbmdOb2RlSUQoKSwgc2Nyb2xs UG9zaXRpb24sIFdURjo6bnVsbG9wdCwgaXNQcm9ncmFtbWF0aWNTY3JvbGwsIFNjcm9sbGluZ0xh eWVyUG9zaXRpb25BY3Rpb246OlNldCk7CisgICAgYm9vbCBpblBhZ2VDYWNoZSA9IGZyYW1lVmll dy5mcmFtZSgpLmRvY3VtZW50KCktPnBhZ2VDYWNoZVN0YXRlKCkgIT0gRG9jdW1lbnQ6Ok5vdElu UGFnZUNhY2hlOworICAgIGJvb2wgaW5Qcm9ncmFtbWF0aWNTY3JvbGwgPSBmcmFtZVZpZXcuaW5Q cm9ncmFtbWF0aWNTY3JvbGwoKTsKKyAgICBpZiAoaW5Qcm9ncmFtbWF0aWNTY3JvbGwgfHwgaW5Q YWdlQ2FjaGUpCisgICAgICAgIHVwZGF0ZVNjcm9sbFBvc2l0aW9uQWZ0ZXJBc3luY1Njcm9sbChm cmFtZVZpZXcuc2Nyb2xsaW5nTm9kZUlEKCksIHNjcm9sbFBvc2l0aW9uLCB7IH0sIFNjcm9sbFR5 cGU6OlByb2dyYW1tYXRpYywgU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbjo6U2V0KTsKIAog ICAgIC8vIElmIHRoaXMgZnJhbWUgdmlldydzIGRvY3VtZW50IGlzIGJlaW5nIHB1dCBpbnRvIHRo ZSBwYWdlIGNhY2hlLCB3ZSBkb24ndCB3YW50IHRvIHVwZGF0ZSBvdXIKICAgICAvLyBtYWluIGZy YW1lIHNjcm9sbCBwb3NpdGlvbi4gSnVzdCBsZXQgdGhlIEZyYW1lVmlldyB0aGluayB0aGF0IHdl IGRpZC4KLSAgICBpZiAoZnJhbWVWaWV3LmZyYW1lKCkuZG9jdW1lbnQoKS0+cGFnZUNhY2hlU3Rh dGUoKSAhPSBEb2N1bWVudDo6Tm90SW5QYWdlQ2FjaGUpCisgICAgaWYgKGluUGFnZUNhY2hlKQog ICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIGF1dG8qIHN0YXRlTm9kZSA9IGRvd25jYXN0PFNj cm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZT4obV9zY3JvbGxpbmdTdGF0ZVRyZWUtPnN0YXRlTm9k ZUZvcklEKGZyYW1lVmlldy5zY3JvbGxpbmdOb2RlSUQoKSkpOwogICAgIGlmICghc3RhdGVOb2Rl KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBzdGF0ZU5vZGUtPnNldFJlcXVlc3RlZFNj cm9sbFBvc2l0aW9uKHNjcm9sbFBvc2l0aW9uLCBpc1Byb2dyYW1tYXRpY1Njcm9sbCk7CisgICAg c3RhdGVOb2RlLT5zZXRSZXF1ZXN0ZWRTY3JvbGxQb3NpdGlvbihzY3JvbGxQb3NpdGlvbiwgaW5Q cm9ncmFtbWF0aWNTY3JvbGwpOwogICAgIHJldHVybiB0cnVlOwogfQogCkBAIC0yMzQsMTQgKzIz NSwxMCBAQCB2b2lkIEFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OmFwcGx5U2Nyb2xsaW5nVHJl ZUxheWVyUG9zaXRpb25zKCkKICAgICBtX3Njcm9sbGluZ1RyZWUtPmFwcGx5TGF5ZXJQb3NpdGlv bnMoKTsKIH0KIAotdm9pZCBBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjpzY2hlZHVsZVVwZGF0 ZVNjcm9sbFBvc2l0aW9uQWZ0ZXJBc3luY1Njcm9sbChTY3JvbGxpbmdOb2RlSUQgbm9kZUlELCBj b25zdCBGbG9hdFBvaW50JiBzY3JvbGxQb3NpdGlvbiwgY29uc3QgT3B0aW9uYWw8RmxvYXRQb2lu dD4mIGxheW91dFZpZXdwb3J0T3JpZ2luLCBib29sIHByb2dyYW1tYXRpY1Njcm9sbCwgU2Nyb2xs aW5nTGF5ZXJQb3NpdGlvbkFjdGlvbiBzY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uKQordm9p ZCBBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjpzY2hlZHVsZVVwZGF0ZVNjcm9sbFBvc2l0aW9u QWZ0ZXJBc3luY1Njcm9sbChTY3JvbGxpbmdOb2RlSUQgbm9kZUlELCBjb25zdCBGbG9hdFBvaW50 JiBzY3JvbGxQb3NpdGlvbiwgY29uc3QgT3B0aW9uYWw8RmxvYXRQb2ludD4mIGxheW91dFZpZXdw b3J0T3JpZ2luLCBTY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uIHNjcm9sbGluZ0xheWVyUG9z aXRpb25BY3Rpb24pCiB7Ci0gICAgU2NoZWR1bGVkU2Nyb2xsVXBkYXRlIHNjcm9sbFVwZGF0ZShu b2RlSUQsIHNjcm9sbFBvc2l0aW9uLCBsYXlvdXRWaWV3cG9ydE9yaWdpbiwgcHJvZ3JhbW1hdGlj U2Nyb2xsLCBzY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uKTsKKyAgICBTY2hlZHVsZWRTY3Jv bGxVcGRhdGUgc2Nyb2xsVXBkYXRlKG5vZGVJRCwgc2Nyb2xsUG9zaXRpb24sIGxheW91dFZpZXdw b3J0T3JpZ2luLCBzY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uKTsKICAgICAKLSAgICAvLyBG b3IgcHJvZ3JhbW1hdGljIHNjcm9sbHMsIHJlcXVlc3RTY3JvbGxQb3NpdGlvblVwZGF0ZSgpIGhh cyBhbHJlYWR5IGNhbGxlZCB1cGRhdGVTY3JvbGxQb3NpdGlvbkFmdGVyQXN5bmNTY3JvbGwoKS4K LSAgICBpZiAocHJvZ3JhbW1hdGljU2Nyb2xsKQotICAgICAgICByZXR1cm47Ci0KICAgICBpZiAo bV91cGRhdGVOb2RlU2Nyb2xsUG9zaXRpb25UaW1lci5pc0FjdGl2ZSgpKSB7CiAgICAgICAgIGlm IChtX3NjaGVkdWxlZFNjcm9sbFVwZGF0ZS5tYXRjaGVzVXBkYXRlVHlwZShzY3JvbGxVcGRhdGUp KSB7CiAgICAgICAgICAgICBtX3NjaGVkdWxlZFNjcm9sbFVwZGF0ZS5zY3JvbGxQb3NpdGlvbiA9 IHNjcm9sbFBvc2l0aW9uOwpAQCAtMjUxLDggKzI0OCw4IEBAIHZvaWQgQXN5bmNTY3JvbGxpbmdD b29yZGluYXRvcjo6c2NoZWR1bGVVcGRhdGVTY3JvbGxQb3NpdGlvbkFmdGVyQXN5bmNTY3JvbGwo U2NyCiAgICAgCiAgICAgICAgIC8vIElmIHRoZSBwYXJhbWV0ZXJzIGRvbid0IG1hdGNoIHdoYXQg d2FzIHByZXZpb3VzbHkgc2NoZWR1bGVkLCBkaXNwYXRjaCBpbW1lZGlhdGVseS4KICAgICAgICAg bV91cGRhdGVOb2RlU2Nyb2xsUG9zaXRpb25UaW1lci5zdG9wKCk7Ci0gICAgICAgIHVwZGF0ZVNj cm9sbFBvc2l0aW9uQWZ0ZXJBc3luY1Njcm9sbChtX3NjaGVkdWxlZFNjcm9sbFVwZGF0ZS5ub2Rl SUQsIG1fc2NoZWR1bGVkU2Nyb2xsVXBkYXRlLnNjcm9sbFBvc2l0aW9uLCBtX3NjaGVkdWxlZFNj cm9sbFVwZGF0ZS5sYXlvdXRWaWV3cG9ydE9yaWdpbiwgbV9zY2hlZHVsZWRTY3JvbGxVcGRhdGUu aXNQcm9ncmFtbWF0aWNTY3JvbGwsIG1fc2NoZWR1bGVkU2Nyb2xsVXBkYXRlLnVwZGF0ZUxheWVy UG9zaXRpb25BY3Rpb24pOwotICAgICAgICB1cGRhdGVTY3JvbGxQb3NpdGlvbkFmdGVyQXN5bmNT Y3JvbGwobm9kZUlELCBzY3JvbGxQb3NpdGlvbiwgbGF5b3V0Vmlld3BvcnRPcmlnaW4sIHByb2dy YW1tYXRpY1Njcm9sbCwgc2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbik7CisgICAgICAgIHVw ZGF0ZVNjcm9sbFBvc2l0aW9uQWZ0ZXJBc3luY1Njcm9sbChtX3NjaGVkdWxlZFNjcm9sbFVwZGF0 ZS5ub2RlSUQsIG1fc2NoZWR1bGVkU2Nyb2xsVXBkYXRlLnNjcm9sbFBvc2l0aW9uLCBtX3NjaGVk dWxlZFNjcm9sbFVwZGF0ZS5sYXlvdXRWaWV3cG9ydE9yaWdpbiwgU2Nyb2xsVHlwZTo6VXNlciwg bV9zY2hlZHVsZWRTY3JvbGxVcGRhdGUudXBkYXRlTGF5ZXJQb3NpdGlvbkFjdGlvbik7CisgICAg ICAgIHVwZGF0ZVNjcm9sbFBvc2l0aW9uQWZ0ZXJBc3luY1Njcm9sbChub2RlSUQsIHNjcm9sbFBv c2l0aW9uLCBsYXlvdXRWaWV3cG9ydE9yaWdpbiwgU2Nyb2xsVHlwZTo6VXNlciwgc2Nyb2xsaW5n TGF5ZXJQb3NpdGlvbkFjdGlvbik7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTI2Miw3 ICsyNTksNyBAQCB2b2lkIEFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnNjaGVkdWxlVXBkYXRl U2Nyb2xsUG9zaXRpb25BZnRlckFzeW5jU2Nyb2xsKFNjcgogCiB2b2lkIEFzeW5jU2Nyb2xsaW5n Q29vcmRpbmF0b3I6OnVwZGF0ZVNjcm9sbFBvc2l0aW9uQWZ0ZXJBc3luY1Njcm9sbFRpbWVyRmly ZWQoKQogewotICAgIHVwZGF0ZVNjcm9sbFBvc2l0aW9uQWZ0ZXJBc3luY1Njcm9sbChtX3NjaGVk dWxlZFNjcm9sbFVwZGF0ZS5ub2RlSUQsIG1fc2NoZWR1bGVkU2Nyb2xsVXBkYXRlLnNjcm9sbFBv c2l0aW9uLCBtX3NjaGVkdWxlZFNjcm9sbFVwZGF0ZS5sYXlvdXRWaWV3cG9ydE9yaWdpbiwgbV9z Y2hlZHVsZWRTY3JvbGxVcGRhdGUuaXNQcm9ncmFtbWF0aWNTY3JvbGwsIG1fc2NoZWR1bGVkU2Ny b2xsVXBkYXRlLnVwZGF0ZUxheWVyUG9zaXRpb25BY3Rpb24pOworICAgIHVwZGF0ZVNjcm9sbFBv c2l0aW9uQWZ0ZXJBc3luY1Njcm9sbChtX3NjaGVkdWxlZFNjcm9sbFVwZGF0ZS5ub2RlSUQsIG1f c2NoZWR1bGVkU2Nyb2xsVXBkYXRlLnNjcm9sbFBvc2l0aW9uLCBtX3NjaGVkdWxlZFNjcm9sbFVw ZGF0ZS5sYXlvdXRWaWV3cG9ydE9yaWdpbiwgU2Nyb2xsVHlwZTo6VXNlciwgbV9zY2hlZHVsZWRT Y3JvbGxVcGRhdGUudXBkYXRlTGF5ZXJQb3NpdGlvbkFjdGlvbik7CiB9CiAKIEZyYW1lVmlldyog QXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6ZnJhbWVWaWV3Rm9yU2Nyb2xsaW5nTm9kZShTY3Jv bGxpbmdOb2RlSUQgc2Nyb2xsaW5nTm9kZUlEKSBjb25zdApAQCAtMjk3LDcgKzI5NCw3IEBAIEZy YW1lVmlldyogQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6ZnJhbWVWaWV3Rm9yU2Nyb2xsaW5n Tm9kZShTY3JvbGxpbmdOb2RlSUQKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAotdm9pZCBBc3lu Y1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjp1cGRhdGVTY3JvbGxQb3NpdGlvbkFmdGVyQXN5bmNTY3Jv bGwoU2Nyb2xsaW5nTm9kZUlEIHNjcm9sbGluZ05vZGVJRCwgY29uc3QgRmxvYXRQb2ludCYgc2Ny b2xsUG9zaXRpb24sIE9wdGlvbmFsPEZsb2F0UG9pbnQ+IGxheW91dFZpZXdwb3J0T3JpZ2luLCBi b29sIHByb2dyYW1tYXRpY1Njcm9sbCwgU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbiBzY3Jv bGxpbmdMYXllclBvc2l0aW9uQWN0aW9uKQordm9pZCBBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9y Ojp1cGRhdGVTY3JvbGxQb3NpdGlvbkFmdGVyQXN5bmNTY3JvbGwoU2Nyb2xsaW5nTm9kZUlEIHNj cm9sbGluZ05vZGVJRCwgY29uc3QgRmxvYXRQb2ludCYgc2Nyb2xsUG9zaXRpb24sIE9wdGlvbmFs PEZsb2F0UG9pbnQ+IGxheW91dFZpZXdwb3J0T3JpZ2luLCBTY3JvbGxUeXBlIHNjcm9sbFR5cGUs IFNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb24gc2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlv bikKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogCkBAIC0zMTMsNyArMzEwLDcgQEAg dm9pZCBBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjp1cGRhdGVTY3JvbGxQb3NpdGlvbkFmdGVy QXN5bmNTY3JvbGwoU2Nyb2xsaW5nTm8KICAgICBhdXRvJiBmcmFtZVZpZXcgPSAqZnJhbWVWaWV3 UHRyOwogCiAgICAgaWYgKHNjcm9sbGluZ05vZGVJRCA9PSBmcmFtZVZpZXcuc2Nyb2xsaW5nTm9k ZUlEKCkpIHsKLSAgICAgICAgcmVjb25jaWxlU2Nyb2xsaW5nU3RhdGUoZnJhbWVWaWV3LCBzY3Jv bGxQb3NpdGlvbiwgbGF5b3V0Vmlld3BvcnRPcmlnaW4sIHByb2dyYW1tYXRpY1Njcm9sbCwgVmll d3BvcnRSZWN0U3RhYmlsaXR5OjpTdGFibGUsIHNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb24p OworICAgICAgICByZWNvbmNpbGVTY3JvbGxpbmdTdGF0ZShmcmFtZVZpZXcsIHNjcm9sbFBvc2l0 aW9uLCBsYXlvdXRWaWV3cG9ydE9yaWdpbiwgc2Nyb2xsVHlwZSwgVmlld3BvcnRSZWN0U3RhYmls aXR5OjpTdGFibGUsIHNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb24pOwogCiAjaWYgUExBVEZP Uk0oQ09DT0EpCiAgICAgICAgIGlmIChtX3BhZ2UtPmV4cGVjdHNXaGVlbEV2ZW50VHJpZ2dlcnMo KSkgewpAQCAtMzQ0LDEyICszNDEsMTIgQEAgdm9pZCBBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9y Ojp1cGRhdGVTY3JvbGxQb3NpdGlvbkFmdGVyQXN5bmNTY3JvbGwoU2Nyb2xsaW5nTm8KICAgICB9 CiB9CiAKLXZvaWQgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6cmVjb25jaWxlU2Nyb2xsaW5n U3RhdGUoRnJhbWVWaWV3JiBmcmFtZVZpZXcsIGNvbnN0IEZsb2F0UG9pbnQmIHNjcm9sbFBvc2l0 aW9uLCBjb25zdCBMYXlvdXRWaWV3cG9ydE9yaWdpbk9yT3ZlcnJpZGVSZWN0JiBsYXlvdXRWaWV3 cG9ydE9yaWdpbk9yT3ZlcnJpZGVSZWN0LCBib29sIHByb2dyYW1tYXRpY1Njcm9sbCwgVmlld3Bv cnRSZWN0U3RhYmlsaXR5IHZpZXdwb3J0UmVjdFN0YWJpbGl0eSwgU2Nyb2xsaW5nTGF5ZXJQb3Np dGlvbkFjdGlvbiBzY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uKQordm9pZCBBc3luY1Njcm9s bGluZ0Nvb3JkaW5hdG9yOjpyZWNvbmNpbGVTY3JvbGxpbmdTdGF0ZShGcmFtZVZpZXcmIGZyYW1l VmlldywgY29uc3QgRmxvYXRQb2ludCYgc2Nyb2xsUG9zaXRpb24sIGNvbnN0IExheW91dFZpZXdw b3J0T3JpZ2luT3JPdmVycmlkZVJlY3QmIGxheW91dFZpZXdwb3J0T3JpZ2luT3JPdmVycmlkZVJl Y3QsIFNjcm9sbFR5cGUgc2Nyb2xsVHlwZSwgVmlld3BvcnRSZWN0U3RhYmlsaXR5IHZpZXdwb3J0 UmVjdFN0YWJpbGl0eSwgU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbiBzY3JvbGxpbmdMYXll clBvc2l0aW9uQWN0aW9uKQogewogICAgIGJvb2wgb2xkUHJvZ3JhbW1hdGljU2Nyb2xsID0gZnJh bWVWaWV3LmluUHJvZ3JhbW1hdGljU2Nyb2xsKCk7Ci0gICAgZnJhbWVWaWV3LnNldEluUHJvZ3Jh bW1hdGljU2Nyb2xsKHByb2dyYW1tYXRpY1Njcm9sbCk7CisgICAgZnJhbWVWaWV3LnNldEluUHJv Z3JhbW1hdGljU2Nyb2xsKHNjcm9sbFR5cGUgPT0gU2Nyb2xsVHlwZTo6UHJvZ3JhbW1hdGljKTsK IAotICAgIExPR19XSVRIX1NUUkVBTShTY3JvbGxpbmcsIHN0cmVhbSA8PCBnZXRDdXJyZW50UHJv Y2Vzc0lEKCkgPDwgIiBBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yICIgPDwgdGhpcyA8PCAiIHJl Y29uY2lsZVNjcm9sbGluZ1N0YXRlIHNjcm9sbFBvc2l0aW9uICIgPDwgc2Nyb2xsUG9zaXRpb24g PDwgIiBwcm9ncmFtbWF0aWNTY3JvbGwgIiA8PCBwcm9ncmFtbWF0aWNTY3JvbGwgPDwgIiBzdGFi aWxpdHkgIiA8PCB2aWV3cG9ydFJlY3RTdGFiaWxpdHkgPDwgIiAiIDw8IHNjcm9sbGluZ0xheWVy UG9zaXRpb25BY3Rpb24pOworICAgIExPR19XSVRIX1NUUkVBTShTY3JvbGxpbmcsIHN0cmVhbSA8 PCBnZXRDdXJyZW50UHJvY2Vzc0lEKCkgPDwgIiBBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yICIg PDwgdGhpcyA8PCAiIHJlY29uY2lsZVNjcm9sbGluZ1N0YXRlIHNjcm9sbFBvc2l0aW9uICIgPDwg c2Nyb2xsUG9zaXRpb24gPDwgIiB0eXBlICIgPDwgc2Nyb2xsVHlwZSA8PCAiIHN0YWJpbGl0eSAi IDw8IHZpZXdwb3J0UmVjdFN0YWJpbGl0eSA8PCAiICIgPDwgc2Nyb2xsaW5nTGF5ZXJQb3NpdGlv bkFjdGlvbik7CiAKICAgICBPcHRpb25hbDxGbG9hdFJlY3Q+IGxheW91dFZpZXdwb3J0UmVjdDsK IApAQCAtMzcyLDcgKzM2OSw3IEBAIHZvaWQgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6cmVj b25jaWxlU2Nyb2xsaW5nU3RhdGUoRnJhbWVWaWV3JiBmcmFtZVZpZXcsIGNvCiAgICAgZnJhbWVW aWV3LnNldENvbnN0cmFpbnNTY3JvbGxpbmdUb0NvbnRlbnRFZGdlKHRydWUpOwogICAgIGZyYW1l Vmlldy5zZXRJblByb2dyYW1tYXRpY1Njcm9sbChvbGRQcm9ncmFtbWF0aWNTY3JvbGwpOwogCi0g ICAgaWYgKCFwcm9ncmFtbWF0aWNTY3JvbGwgJiYgc2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlv biAhPSBTY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uOjpTZXQpIHsKKyAgICBpZiAoc2Nyb2xs VHlwZSA9PSBTY3JvbGxUeXBlOjpVc2VyICYmIHNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb24g IT0gU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbjo6U2V0KSB7CiAgICAgICAgIGF1dG8gc2Ny b2xsaW5nTm9kZUlEID0gZnJhbWVWaWV3LnNjcm9sbGluZ05vZGVJRCgpOwogICAgICAgICBpZiAo dmlld3BvcnRSZWN0U3RhYmlsaXR5ID09IFZpZXdwb3J0UmVjdFN0YWJpbGl0eTo6U3RhYmxlKQog ICAgICAgICAgICAgcmVjb25jaWxlVmlld3BvcnRDb25zdHJhaW5lZExheWVyUG9zaXRpb25zKHNj cm9sbGluZ05vZGVJRCwgZnJhbWVWaWV3LnJlY3RGb3JGaXhlZFBvc2l0aW9uTGF5b3V0KCksIHNj cm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb24pOwpAQCAtNDAzLDcgKzQwMCw3IEBAIHZvaWQgQXN5 bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6cmVjb25jaWxlU2Nyb2xsaW5nU3RhdGUoRnJhbWVWaWV3 JiBmcmFtZVZpZXcsIGNvCiAgICAgRmxvYXRQb2ludCBwb3NpdGlvbkZvckZvb3RlckxheWVyID0g RmxvYXRQb2ludChzY3JvbGxQb3NpdGlvbkZvckZpeGVkLngoKSwKICAgICAgICAgRnJhbWVWaWV3 Ojp5UG9zaXRpb25Gb3JGb290ZXJMYXllcihzY3JvbGxQb3NpdGlvbiwgdG9wQ29udGVudEluc2V0 LCBmcmFtZVZpZXcudG90YWxDb250ZW50c1NpemUoKS5oZWlnaHQoKSwgZnJhbWVWaWV3LmZvb3Rl ckhlaWdodCgpKSk7CiAKLSAgICBpZiAocHJvZ3JhbW1hdGljU2Nyb2xsIHx8IHNjcm9sbGluZ0xh eWVyUG9zaXRpb25BY3Rpb24gPT0gU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbjo6U2V0KSB7 CisgICAgaWYgKHNjcm9sbFR5cGUgPT0gU2Nyb2xsVHlwZTo6UHJvZ3JhbW1hdGljIHx8IHNjcm9s bGluZ0xheWVyUG9zaXRpb25BY3Rpb24gPT0gU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbjo6 U2V0KSB7CiAgICAgICAgIHJlY29uY2lsZVNjcm9sbFBvc2l0aW9uKGZyYW1lVmlldywgU2Nyb2xs aW5nTGF5ZXJQb3NpdGlvbkFjdGlvbjo6U2V0KTsKIAogICAgICAgICBpZiAoY291bnRlclNjcm9s bGluZ0xheWVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5 bmNTY3JvbGxpbmdDb29yZGluYXRvci5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv QXN5bmNTY3JvbGxpbmdDb29yZGluYXRvci5oCmluZGV4IGYwMGU2MDBiM2QxZjM2YzczZTRhMDI1 ODljMTVlODA2MmNiYzE1YjEuLjUxYzQ1ZDYyMjQyM2UwODIxMGY0NmUxYWIyYzYxZDBlYmViMzM4 ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xs aW5nQ29vcmRpbmF0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3lu Y1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgKQEAgLTUxLDcgKzUxLDcgQEAgcHVibGljOgogCiAgICAg dm9pZCBzY3JvbGxpbmdTdGF0ZVRyZWVQcm9wZXJ0aWVzQ2hhbmdlZCgpOwogCi0gICAgV0VCQ09S RV9FWFBPUlQgdm9pZCBzY2hlZHVsZVVwZGF0ZVNjcm9sbFBvc2l0aW9uQWZ0ZXJBc3luY1Njcm9s bChTY3JvbGxpbmdOb2RlSUQsIGNvbnN0IEZsb2F0UG9pbnQmLCBjb25zdCBPcHRpb25hbDxGbG9h dFBvaW50PiYgbGF5b3V0Vmlld3BvcnRPcmlnaW4sIGJvb2wgcHJvZ3JhbW1hdGljU2Nyb2xsLCBT Y3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uKTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNj aGVkdWxlVXBkYXRlU2Nyb2xsUG9zaXRpb25BZnRlckFzeW5jU2Nyb2xsKFNjcm9sbGluZ05vZGVJ RCwgY29uc3QgRmxvYXRQb2ludCYsIGNvbnN0IE9wdGlvbmFsPEZsb2F0UG9pbnQ+JiBsYXlvdXRW aWV3cG9ydE9yaWdpbiwgU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbik7CiAKICNpZiBQTEFU Rk9STShDT0NPQSkKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldEFjdGl2ZVNjcm9sbFNuYXBJ bmRpY2VzKFNjcm9sbGluZ05vZGVJRCwgdW5zaWduZWQgaG9yaXpvbnRhbEluZGV4LCB1bnNpZ25l ZCB2ZXJ0aWNhbEluZGV4KTsKQEAgLTc3LDcgKzc3LDcgQEAgcHJvdGVjdGVkOgogCiAgICAgUmVm UHRyPFNjcm9sbGluZ1RyZWU+IHJlbGVhc2VTY3JvbGxpbmdUcmVlKCkgeyByZXR1cm4gV1RGTW92 ZShtX3Njcm9sbGluZ1RyZWUpOyB9CiAKLSAgICB2b2lkIHVwZGF0ZVNjcm9sbFBvc2l0aW9uQWZ0 ZXJBc3luY1Njcm9sbChTY3JvbGxpbmdOb2RlSUQsIGNvbnN0IEZsb2F0UG9pbnQmLCBPcHRpb25h bDxGbG9hdFBvaW50PiBsYXlvdXRWaWV3cG9ydE9yaWdpbiwgYm9vbCBwcm9ncmFtbWF0aWNTY3Jv bGwsIFNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb24pOworICAgIHZvaWQgdXBkYXRlU2Nyb2xs UG9zaXRpb25BZnRlckFzeW5jU2Nyb2xsKFNjcm9sbGluZ05vZGVJRCwgY29uc3QgRmxvYXRQb2lu dCYsIE9wdGlvbmFsPEZsb2F0UG9pbnQ+IGxheW91dFZpZXdwb3J0T3JpZ2luLCBTY3JvbGxUeXBl LCBTY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uKTsKIAogICAgIFdFQkNPUkVfRVhQT1JUIFN0 cmluZyBzY3JvbGxpbmdTdGF0ZVRyZWVBc1RleHQoU2Nyb2xsaW5nU3RhdGVUcmVlQXNUZXh0QmVo YXZpb3IgPSBTY3JvbGxpbmdTdGF0ZVRyZWVBc1RleHRCZWhhdmlvck5vcm1hbCkgY29uc3Qgb3Zl cnJpZGU7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCB3aWxsQ29tbWl0VHJlZSgpIG92ZXJyaWRl OwpAQCAtMTE4LDcgKzExOCw3IEBAIHByaXZhdGU6CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBz ZXRQb3NpdGlvbmVkTm9kZUdlb21ldHJ5KFNjcm9sbGluZ05vZGVJRCwgY29uc3QgTGF5b3V0Q29u c3RyYWludHMmKSBvdmVycmlkZTsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldFJlbGF0ZWRP dmVyZmxvd1Njcm9sbGluZ05vZGVzKFNjcm9sbGluZ05vZGVJRCwgVmVjdG9yPFNjcm9sbGluZ05v ZGVJRD4mJikgb3ZlcnJpZGU7CiAKLSAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHJlY29uY2lsZVNj cm9sbGluZ1N0YXRlKEZyYW1lVmlldyYsIGNvbnN0IEZsb2F0UG9pbnQmLCBjb25zdCBMYXlvdXRW aWV3cG9ydE9yaWdpbk9yT3ZlcnJpZGVSZWN0JiwgYm9vbCBwcm9ncmFtbWF0aWNTY3JvbGwsIFZp ZXdwb3J0UmVjdFN0YWJpbGl0eSwgU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbikgb3ZlcnJp ZGU7CisgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCByZWNvbmNpbGVTY3JvbGxpbmdTdGF0ZShGcmFt ZVZpZXcmLCBjb25zdCBGbG9hdFBvaW50JiwgY29uc3QgTGF5b3V0Vmlld3BvcnRPcmlnaW5Pck92 ZXJyaWRlUmVjdCYsIFNjcm9sbFR5cGUsIFZpZXdwb3J0UmVjdFN0YWJpbGl0eSwgU2Nyb2xsaW5n TGF5ZXJQb3NpdGlvbkFjdGlvbikgb3ZlcnJpZGU7CiAgICAgdm9pZCByZWNvbmNpbGVTY3JvbGxQ b3NpdGlvbihGcmFtZVZpZXcmLCBTY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uKTsKIAogICAg IGJvb2wgaXNSdWJiZXJCYW5kSW5Qcm9ncmVzcygpIGNvbnN0IG92ZXJyaWRlOwpAQCAtMTQ3LDI1 ICsxNDcsMjEgQEAgcHJpdmF0ZToKIAogICAgIHN0cnVjdCBTY2hlZHVsZWRTY3JvbGxVcGRhdGUg ewogICAgICAgICBTY2hlZHVsZWRTY3JvbGxVcGRhdGUoKSA9IGRlZmF1bHQ7Ci0gICAgICAgIFNj aGVkdWxlZFNjcm9sbFVwZGF0ZShTY3JvbGxpbmdOb2RlSUQgc2Nyb2xsaW5nTm9kZUlELCBGbG9h dFBvaW50IHBvaW50LCBPcHRpb25hbDxGbG9hdFBvaW50PiB2aWV3cG9ydE9yaWdpbiwgYm9vbCBp c1Byb2dyYW1tYXRpYywgU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbiB1ZHBhdGVBY3Rpb24p CisgICAgICAgIFNjaGVkdWxlZFNjcm9sbFVwZGF0ZShTY3JvbGxpbmdOb2RlSUQgc2Nyb2xsaW5n Tm9kZUlELCBGbG9hdFBvaW50IHBvaW50LCBPcHRpb25hbDxGbG9hdFBvaW50PiB2aWV3cG9ydE9y aWdpbiwgU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbiB1ZHBhdGVBY3Rpb24pCiAgICAgICAg ICAgICA6IG5vZGVJRChzY3JvbGxpbmdOb2RlSUQpCiAgICAgICAgICAgICAsIHNjcm9sbFBvc2l0 aW9uKHBvaW50KQogICAgICAgICAgICAgLCBsYXlvdXRWaWV3cG9ydE9yaWdpbih2aWV3cG9ydE9y aWdpbikKLSAgICAgICAgICAgICwgaXNQcm9ncmFtbWF0aWNTY3JvbGwoaXNQcm9ncmFtbWF0aWMp CiAgICAgICAgICAgICAsIHVwZGF0ZUxheWVyUG9zaXRpb25BY3Rpb24odWRwYXRlQWN0aW9uKQog ICAgICAgICB7IH0KIAogICAgICAgICBTY3JvbGxpbmdOb2RlSUQgbm9kZUlEIHsgMCB9OwogICAg ICAgICBGbG9hdFBvaW50IHNjcm9sbFBvc2l0aW9uOwogICAgICAgICBPcHRpb25hbDxGbG9hdFBv aW50PiBsYXlvdXRWaWV3cG9ydE9yaWdpbjsKLSAgICAgICAgYm9vbCBpc1Byb2dyYW1tYXRpY1Nj cm9sbCB7IGZhbHNlIH07CiAgICAgICAgIFNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb24gdXBk YXRlTGF5ZXJQb3NpdGlvbkFjdGlvbiB7IFNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb246OlN5 bmMgfTsKICAgICAgICAgCiAgICAgICAgIGJvb2wgbWF0Y2hlc1VwZGF0ZVR5cGUoY29uc3QgU2No ZWR1bGVkU2Nyb2xsVXBkYXRlJiBvdGhlcikgY29uc3QKICAgICAgICAgewotICAgICAgICAgICAg cmV0dXJuIG5vZGVJRCA9PSBvdGhlci5ub2RlSUQKLSAgICAgICAgICAgICAgICAmJiBpc1Byb2dy YW1tYXRpY1Njcm9sbCA9PSBvdGhlci5pc1Byb2dyYW1tYXRpY1Njcm9sbAotICAgICAgICAgICAg ICAgICYmIHVwZGF0ZUxheWVyUG9zaXRpb25BY3Rpb24gPT0gb3RoZXIudXBkYXRlTGF5ZXJQb3Np dGlvbkFjdGlvbjsKKyAgICAgICAgICAgIHJldHVybiBub2RlSUQgPT0gb3RoZXIubm9kZUlEICYm IHVwZGF0ZUxheWVyUG9zaXRpb25BY3Rpb24gPT0gb3RoZXIudXBkYXRlTGF5ZXJQb3NpdGlvbkFj dGlvbjsKICAgICAgICAgfQogICAgIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcAppbmRleCAyMzU1NjRmZTJjYWYy YjllMTA1ZjNmODA4NzE2YWEyNGNlZWVmYWRkLi41ZjUzOGFlZWQ3ZDgwNWRiNmM0MGRmZjdjY2Zk YWNjYzA4ZmZlZTQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9T Y3JvbGxpbmdDb29yZGluYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCkBAIC01MDksNCArNTA5LDEzIEBAIFRleHRTdHJl YW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYgdHMsIFZpZXdwb3J0UmVjdFN0YWJpbGl0eSBzdGFi aWxpdHkpCiAgICAgcmV0dXJuIHRzOwogfQogCitUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRT dHJlYW0mIHRzLCBTY3JvbGxUeXBlIHNjcm9sbFR5cGUpCit7CisgICAgc3dpdGNoIChzY3JvbGxU eXBlKSB7CisgICAgY2FzZSBTY3JvbGxUeXBlOjpVc2VyOiB0cyA8PCAidXNlciI7IGJyZWFrOwor ICAgIGNhc2UgU2Nyb2xsVHlwZTo6UHJvZ3JhbW1hdGljOiB0cyA8PCAicHJvZ3JhbW1hdGljIjsg YnJlYWs7CisgICAgfQorICAgIHJldHVybiB0czsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29v cmRpbmF0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3Jk aW5hdG9yLmgKaW5kZXggY2Y0Mzg4MzRjMTMxOTZjMjBhNGExMDRlOWJmNzE2OTQ0Y2I3YThlOC4u MTk3ZDA0YjQ5Mjg5MGYwODE3NTQxMzQ3NWViYzVhNjI5YjFhNTg0MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5oCkBAIC04 Nyw3ICs4Nyw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZnJhbWVWaWV3TGF5b3V0VXBk YXRlZChGcmFtZVZpZXcmKSB7IH0KIAogICAgIHVzaW5nIExheW91dFZpZXdwb3J0T3JpZ2luT3JP dmVycmlkZVJlY3QgPSBXVEY6OlZhcmlhbnQ8T3B0aW9uYWw8RmxvYXRQb2ludD4sIE9wdGlvbmFs PEZsb2F0UmVjdD4+OwotICAgIHZpcnR1YWwgdm9pZCByZWNvbmNpbGVTY3JvbGxpbmdTdGF0ZShG cmFtZVZpZXcmLCBjb25zdCBGbG9hdFBvaW50JiwgY29uc3QgTGF5b3V0Vmlld3BvcnRPcmlnaW5P ck92ZXJyaWRlUmVjdCYsIGJvb2wgLyogcHJvZ3JhbW1hdGljU2Nyb2xsICovLCBWaWV3cG9ydFJl Y3RTdGFiaWxpdHksIFNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb24pIHsgfQorICAgIHZpcnR1 YWwgdm9pZCByZWNvbmNpbGVTY3JvbGxpbmdTdGF0ZShGcmFtZVZpZXcmLCBjb25zdCBGbG9hdFBv aW50JiwgY29uc3QgTGF5b3V0Vmlld3BvcnRPcmlnaW5Pck92ZXJyaWRlUmVjdCYsIFNjcm9sbFR5 cGUsIFZpZXdwb3J0UmVjdFN0YWJpbGl0eSwgU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbikg eyB9CiAKICAgICAvLyBTaG91bGQgYmUgY2FsbGVkIHdoZW5ldmVyIHRoZSBzbG93IHJlcGFpbnQg b2JqZWN0cyBjb3VudGVyIGNoYW5nZXMgYmV0d2VlbiB6ZXJvIGFuZCBvbmUuCiAgICAgdm9pZCBm cmFtZVZpZXdIYXNTbG93UmVwYWludE9iamVjdHNEaWRDaGFuZ2UoRnJhbWVWaWV3Jik7CkBAIC0y MTQsNiArMjE0LDcgQEAgV0VCQ09SRV9FWFBPUlQgV1RGOjpUZXh0U3RyZWFtJiBvcGVyYXRvcjw8 KFdURjo6VGV4dFN0cmVhbSYsIFNjcm9sbGFibGVBcmVhUGFyYW0KIFdFQkNPUkVfRVhQT1JUIFdU Rjo6VGV4dFN0cmVhbSYgb3BlcmF0b3I8PChXVEY6OlRleHRTdHJlYW0mLCBTY3JvbGxpbmdOb2Rl VHlwZSk7CiBXRUJDT1JFX0VYUE9SVCBXVEY6OlRleHRTdHJlYW0mIG9wZXJhdG9yPDwoV1RGOjpU ZXh0U3RyZWFtJiwgU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbik7CiBXRUJDT1JFX0VYUE9S VCBXVEY6OlRleHRTdHJlYW0mIG9wZXJhdG9yPDwoV1RGOjpUZXh0U3RyZWFtJiwgVmlld3BvcnRS ZWN0U3RhYmlsaXR5KTsKK1dFQkNPUkVfRVhQT1JUIFdURjo6VGV4dFN0cmVhbSYgb3BlcmF0b3I8 PChXVEY6OlRleHRTdHJlYW0mLCBTY3JvbGxUeXBlKTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9UaHJlYWRlZFNj cm9sbGluZ1RyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvVGhyZWFkZWRT Y3JvbGxpbmdUcmVlLmNwcAppbmRleCAwZTQ1NWExMTMzODRlMmM3ZGRhNzMwZWI2OGQ0YWIxODg5 MGQ3NjcyLi45ZmFjM2M0OGU1OWU4YmY2ZTIzODgxNmJmYjVmZWYyODllMjI4ZmMyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9UaHJlYWRlZFNjcm9sbGluZ1RyZWUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5n VHJlZS5jcHAKQEAgLTEwMywxMiArMTAzLDE1IEBAIHZvaWQgVGhyZWFkZWRTY3JvbGxpbmdUcmVl OjpzY3JvbGxpbmdUcmVlTm9kZURpZFNjcm9sbChTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kCiAg ICAgaWYgKG5vZGUuaXNSb290Tm9kZSgpKQogICAgICAgICBzZXRNYWluRnJhbWVTY3JvbGxQb3Np dGlvbihzY3JvbGxQb3NpdGlvbik7CiAKKyAgICBpZiAoaXNIYW5kbGluZ1Byb2dyYW1tYXRpY1Nj cm9sbCgpKQorICAgICAgICByZXR1cm47CisKICAgICBPcHRpb25hbDxGbG9hdFBvaW50PiBsYXlv dXRWaWV3cG9ydE9yaWdpbjsKICAgICBpZiAoaXM8U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5n Tm9kZT4obm9kZSkpCiAgICAgICAgIGxheW91dFZpZXdwb3J0T3JpZ2luID0gZG93bmNhc3Q8U2Ny b2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZT4obm9kZSkubGF5b3V0Vmlld3BvcnQoKS5sb2Nh dGlvbigpOwogCi0gICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtzY3JvbGxpbmdDb29yZGlu YXRvciA9IG1fc2Nyb2xsaW5nQ29vcmRpbmF0b3IsIG5vZGVJRCA9IG5vZGUuc2Nyb2xsaW5nTm9k ZUlEKCksIHNjcm9sbFBvc2l0aW9uLCBsYXlvdXRWaWV3cG9ydE9yaWdpbiwgbG9jYWxJc0hhbmRs aW5nUHJvZ3JhbW1hdGljU2Nyb2xsID0gaXNIYW5kbGluZ1Byb2dyYW1tYXRpY1Njcm9sbCgpLCBz Y3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uXSB7Ci0gICAgICAgIHNjcm9sbGluZ0Nvb3JkaW5h dG9yLT5zY2hlZHVsZVVwZGF0ZVNjcm9sbFBvc2l0aW9uQWZ0ZXJBc3luY1Njcm9sbChub2RlSUQs IHNjcm9sbFBvc2l0aW9uLCBsYXlvdXRWaWV3cG9ydE9yaWdpbiwgbG9jYWxJc0hhbmRsaW5nUHJv Z3JhbW1hdGljU2Nyb2xsLCBzY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uKTsKKyAgICBSdW5M b29wOjptYWluKCkuZGlzcGF0Y2goW3Njcm9sbGluZ0Nvb3JkaW5hdG9yID0gbV9zY3JvbGxpbmdD b29yZGluYXRvciwgbm9kZUlEID0gbm9kZS5zY3JvbGxpbmdOb2RlSUQoKSwgc2Nyb2xsUG9zaXRp b24sIGxheW91dFZpZXdwb3J0T3JpZ2luLCBzY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uXSB7 CisgICAgICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5zY2hlZHVsZVVwZGF0ZVNjcm9sbFBvc2l0 aW9uQWZ0ZXJBc3luY1Njcm9sbChub2RlSUQsIHNjcm9sbFBvc2l0aW9uLCBsYXlvdXRWaWV3cG9y dE9yaWdpbiwgc2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbik7CiAgICAgfSk7CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1JlbW90ZUxheWVyVHJl ZS9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvci5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQYWdlL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvci5tbQpp bmRleCA5YmM1MWNhYmE5YTQwMDdjZTc0ZGRhMGUxY2RiYTRhNTM1NDNkYjZkLi5kN2NkMjBmYTBj MGJmZWYzYzRmY2NkMDA3ZmQzOGM0MWQ5NGM5MTdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nQ29vcmRp bmF0b3IubW0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvUmVtb3RlTGF5 ZXJUcmVlL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yLm1tCkBAIC05Niw3ICs5Niw3IEBAIHZv aWQgUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OmJ1aWxkVHJhbnNhY3Rpb24oUmVtb3RlU2Ny b2xsaW5nQ29vcmRpbmF0b3JUcmFuCiAvLyBOb3RpZmljYXRpb24gZnJvbSB0aGUgVUkgcHJvY2Vz cyB0aGF0IHdlIHNjcm9sbGVkLgogdm9pZCBSZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvcjo6c2Ny b2xsUG9zaXRpb25DaGFuZ2VkRm9yTm9kZShTY3JvbGxpbmdOb2RlSUQgbm9kZUlELCBjb25zdCBG bG9hdFBvaW50JiBzY3JvbGxQb3NpdGlvbiwgYm9vbCBzeW5jTGF5ZXJQb3NpdGlvbikKIHsKLSAg ICBzY2hlZHVsZVVwZGF0ZVNjcm9sbFBvc2l0aW9uQWZ0ZXJBc3luY1Njcm9sbChub2RlSUQsIHNj cm9sbFBvc2l0aW9uLCBXVEY6Om51bGxvcHQsIGZhbHNlIC8qIEZJWE1FICovLCBzeW5jTGF5ZXJQ b3NpdGlvbiA/IFNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb246OlN5bmMgOiBTY3JvbGxpbmdM YXllclBvc2l0aW9uQWN0aW9uOjpTZXQpOworICAgIHNjaGVkdWxlVXBkYXRlU2Nyb2xsUG9zaXRp b25BZnRlckFzeW5jU2Nyb2xsKG5vZGVJRCwgc2Nyb2xsUG9zaXRpb24sIFdURjo6bnVsbG9wdCwg c3luY0xheWVyUG9zaXRpb24gPyBTY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uOjpTeW5jIDog U2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbjo6U2V0KTsKIH0KIAogdm9pZCBSZW1vdGVTY3Jv bGxpbmdDb29yZGluYXRvcjo6Y3VycmVudFNuYXBQb2ludEluZGljZXNDaGFuZ2VkRm9yTm9kZShT Y3JvbGxpbmdOb2RlSUQgbm9kZUlELCB1bnNpZ25lZCBob3Jpem9udGFsLCB1bnNpZ25lZCB2ZXJ0 aWNhbCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9X ZWJQYWdlSU9TLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBh Z2VJT1MubW0KaW5kZXggMGJlMDdmMjgxNTgzMGNlZDZhZmIwNDAwYjU1ZDFjODlmNjE0NjUzOS4u YzYwMGE4ZDY1OGQ1MGFmZDljOTFjNjkzMWU2N2E2MzZjMzQ1NmEzNyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KKysrIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KQEAgLTMyNDcs NyArMzI0Nyw3IEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0cyhjb25z dCBWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvJiB2aXNpCiAgICAgICAgICAgICB2aWV3cG9y dFN0YWJpbGl0eSA9IFZpZXdwb3J0UmVjdFN0YWJpbGl0eTo6VW5zdGFibGU7CiAgICAgICAgICAg ICBsYXllckFjdGlvbiA9IFNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb246OlNldEFwcHJveGlt YXRlOwogICAgICAgICB9Ci0gICAgICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5yZWNvbmNpbGVT Y3JvbGxpbmdTdGF0ZShmcmFtZVZpZXcsIHNjcm9sbFBvc2l0aW9uLCB2aXNpYmxlQ29udGVudFJl Y3RVcGRhdGVJbmZvLmN1c3RvbUZpeGVkUG9zaXRpb25SZWN0KCksIGZhbHNlLCB2aWV3cG9ydFN0 YWJpbGl0eSwgbGF5ZXJBY3Rpb24pOworICAgICAgICBzY3JvbGxpbmdDb29yZGluYXRvci0+cmVj b25jaWxlU2Nyb2xsaW5nU3RhdGUoZnJhbWVWaWV3LCBzY3JvbGxQb3NpdGlvbiwgdmlzaWJsZUNv bnRlbnRSZWN0VXBkYXRlSW5mby5jdXN0b21GaXhlZFBvc2l0aW9uUmVjdCgpLCBTY3JvbGxUeXBl OjpVc2VyLCB2aWV3cG9ydFN0YWJpbGl0eSwgbGF5ZXJBY3Rpb24pOwogICAgIH0KIH0KIAo=