212490 2020-05-28 13:59:59 -0700 Simplify EventDispatcher wheel event dispatch 2020-05-28 15:51:20 -0700 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 thorton tonikitoo webkit-bug-importer oldest_to_newest 1657007 0 simon.fraser 2020-05-28 13:59:59 -0700 Simplify EventDispatcher wheel event dispatch 1657009 1 400503 simon.fraser 2020-05-28 14:04:17 -0700 Created attachment 400503 Patch 1657064 2 ews-feeder 2020-05-28 15:50:15 -0700 Committed r262268: <https://trac.webkit.org/changeset/262268> All reviewed patches have been landed. Closing bug and clearing flags on attachment 400503. 1657065 3 webkit-bug-importer 2020-05-28 15:51:20 -0700 <rdar://problem/63736132> 400503 2020-05-28 14:04:17 -0700 2020-05-28 15:50:16 -0700 Patch bug-212490-20200528140416.patch text/plain 14839 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyMjQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDFmMGU5ODEwNzZkOGMy MmVhYTAyNzQyNTU0ZGJiNmRlMTQ1YzIwNS4uZDdkODZkM2U2ZTRkZmQ5MGRiNjU0MzVkZGYzMTU2 ZjcyMTBkMjVjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA1LTI4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFNpbXBsaWZ5IEV2 ZW50RGlzcGF0Y2hlciB3aGVlbCBldmVudCBkaXNwYXRjaAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyNDkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHZhcmlvdXMgY3Jvc3MtdGhyZWFkIGJvdW5j ZXMgYW5kIGNvbXBsZXRpb24gbGFtYmRhcyBpbiBFdmVudERpc3BhdGNoZXI6OndoZWVsRXZlbnQo KQorICAgICAgICBhbmQgU2Nyb2xsaW5nVHJlZSBjb2RlIG1hZGUgdGhlIGxvZ2ljIHZlcnkgaGFy ZCB0byBmb2xsb3cuCisKKyAgICAgICAgTW92aW5nIHRoZSBTY3JvbGxpbmdUaHJlYWQ6OmRpc3Bh dGNoKCkgaW50byBFdmVudEhhbmRsZXIgY29kZSBzaW1wbGlmaWVzIHRoaW5ncyBhIGxpdHRsZSwK KyAgICAgICAgYW5kIGFsbG93cyBmb3IgcmVtb3ZhbCBvZiB0aGUgaG9rZXkgInRyeSB0byBoYW5k bGUiIFNjcm9sbGluZ1RyZWUgZnVuY3Rpb24sIGFzIHdlbGwKKyAgICAgICAgYXMgdGhlIGNsdW5r eSBjb21wbGV0aW9uIGZ1bmN0aW9uLgorCisgICAgICAgIE5vdywgRXZlbnRIYW5kbGVyIGNhbGwg c2hvdWxkSGFuZGxlV2hlZWxFdmVudFN5bmNocm9ub3VzbHkoKSwgdGhlbiBkb2VzIHRoZQorICAg ICAgICBTY3JvbGxpbmdUaHJlYWQ6OmRpc3BhdGNoKCkgd2hpY2ggYWxsb3dzIHRoZSBsYW1iZGEg dG8gZWFzaWx5IGNhbGwgYmFjayBpbnRvCisgICAgICAgIEV2ZW50SGFuZGxlciBmb3IgdGhlIG1h aW4gdGhyZWFkIGRpc3BhdGNoLgorCisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5n VHJlZS5oOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpUaHJlYWRlZFNjcm9sbGluZ1RyZWU6OnRyeVRvSGFuZGxl V2hlZWxFdmVudCk6IERlbGV0ZWQuCisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvVGhyZWFkZWRT Y3JvbGxpbmdUcmVlLmg6CisKIDIwMjAtMDUtMjcgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNl ckBhcHBsZS5jb20+CiAKICAgICAgICAgU2Nyb2xsaW5nVHJlZU1hYzo6ZXZlbnRMaXN0ZW5lclJl Z2lvblR5cGVzRm9yUG9pbnQoKSBuZWVkcyB0byBjb252ZXJ0IHRoZSBwb2ludCB0byBsb2NhbCBj b29yZGluYXRlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZwppbmRleCAyNjk5Nzc4Zjg4NTE1NWQ5MmMzZWRlOWJhNjRkMmYzN2Zk OTZiNTYwLi5hNDkxNDAzZGE1ZDg3ZTY3YzExNmViODA0N2Q0YjY3MDA2ZTc0Yjg2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv ZwpAQCAtMSwzICsxLDM0IEBACisyMDIwLTA1LTI4ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFz ZXJAYXBwbGUuY29tPgorCisgICAgICAgIFNpbXBsaWZ5IEV2ZW50RGlzcGF0Y2hlciB3aGVlbCBl dmVudCBkaXNwYXRjaAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjEyNDkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGhlIHZhcmlvdXMgY3Jvc3MtdGhyZWFkIGJvdW5jZXMgYW5kIGNvbXBsZXRpb24gbGFt YmRhcyBpbiBFdmVudERpc3BhdGNoZXI6OndoZWVsRXZlbnQoKQorICAgICAgICBhbmQgU2Nyb2xs aW5nVHJlZSBjb2RlIG1hZGUgdGhlIGxvZ2ljIHZlcnkgaGFyZCB0byBmb2xsb3cuCisKKyAgICAg ICAgTW92aW5nIHRoZSBTY3JvbGxpbmdUaHJlYWQ6OmRpc3BhdGNoKCkgaW50byBFdmVudEhhbmRs ZXIgY29kZSBzaW1wbGlmaWVzIHRoaW5ncyBhIGxpdHRsZSwKKyAgICAgICAgYW5kIGFsbG93cyBm b3IgcmVtb3ZhbCBvZiB0aGUgaG9rZXkgInRyeSB0byBoYW5kbGUiIFNjcm9sbGluZ1RyZWUgZnVu Y3Rpb24sIGFzIHdlbGwKKyAgICAgICAgYXMgdGhlIGNsdW5reSBjb21wbGV0aW9uIGZ1bmN0aW9u LgorCisgICAgICAgIE5vdywgRXZlbnRIYW5kbGVyIGNhbGwgc2hvdWxkSGFuZGxlV2hlZWxFdmVu dFN5bmNocm9ub3VzbHkoKSwgdGhlbiBkb2VzIHRoZQorICAgICAgICBTY3JvbGxpbmdUaHJlYWQ6 OmRpc3BhdGNoKCkgd2hpY2ggYWxsb3dzIHRoZSBsYW1iZGEgdG8gZWFzaWx5IGNhbGwgYmFjayBp bnRvCisgICAgICAgIEV2ZW50SGFuZGxlciBmb3IgdGhlIG1haW4gdGhyZWFkIGRpc3BhdGNoLgor CisgICAgICAgIFJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkvUmVtb3RlTGF5ZXJUcmVl IGNvZGUgaXMgdW51c2VkIGF0IHByZXNlbnQsIGFuZAorICAgICAgICB3aWxsIG5lZWQgd29yay4K KworICAgICAgICAqIFVJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nQ29v cmRpbmF0b3JQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVNjcm9sbGluZ0Nvb3Jk aW5hdG9yUHJveHk6OmhhbmRsZVdoZWVsRXZlbnQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9SZW1v dGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nVHJlZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJl bW90ZVNjcm9sbGluZ1RyZWU6OnRyeVRvSGFuZGxlV2hlZWxFdmVudCk6IERlbGV0ZWQuCisgICAg ICAgICogVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVTY3JvbGxpbmdUcmVlLmg6Cisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0V2ZW50RGlzcGF0Y2hlci5jcHA6CisgICAgICAg IChXZWJLaXQ6OkV2ZW50RGlzcGF0Y2hlcjo6d2hlZWxFdmVudCk6CisgICAgICAgIChXZWJLaXQ6 OkV2ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0Y2hXaGVlbEV2ZW50VmlhTWFpblRocmVhZCk6CisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0V2ZW50RGlzcGF0Y2hlci5oOgorCiAyMDIwLTA1LTI4 ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdGVBdWRp bzo6YXVkaW9TYW1wbGVzQXZhaWxhYmxlIHNob3VsZCBjaGVjayBmb3IgbV9idWZmZXIgdG8gYmUg bnVsbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5n VHJlZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oCmlu ZGV4IDQ1YjcxNzRmNzU2MjZmOTdjMjhlYmI1Mzc5MDUwYTgyZDg0NTc2ZGIuLjFlNDljMGQ5NDgy ZDM2MmQ4N2RlMDVjYTkyMjMwOGEyOTEyNTgwYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmgKQEAgLTcwLDExICs3MCw5IEBAIHB1YmxpYzoKICAg ICBib29sIGFzeW5jRnJhbWVPck92ZXJmbG93U2Nyb2xsaW5nRW5hYmxlZCgpIGNvbnN0IHsgcmV0 dXJuIG1fYXN5bmNGcmFtZU9yT3ZlcmZsb3dTY3JvbGxpbmdFbmFibGVkOyB9CiAgICAgdm9pZCBz ZXRBc3luY0ZyYW1lT3JPdmVyZmxvd1Njcm9sbGluZ0VuYWJsZWQoYm9vbCk7CiAKLSAgICB1c2lu ZyBDb21wbGV0aW9uRnVuY3Rpb24gPSBXVEY6OkZ1bmN0aW9uPHZvaWQgKFNjcm9sbGluZ0V2ZW50 UmVzdWx0KT47Ci0gICAgLy8gTm90ZSB0aGF0IENvbXBsZXRpb25GdW5jdGlvbiBtYXkgZ2V0IGNh bGxlZCBvbiBhIGRpZmZlcmVudCB0aHJlYWQuCi0gICAgdmlydHVhbCBTY3JvbGxpbmdFdmVudFJl c3VsdCB0cnlUb0hhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiwgQ29t cGxldGlvbkZ1bmN0aW9uJiYgPSBudWxscHRyKSA9IDA7CiAgICAgV0VCQ09SRV9FWFBPUlQgYm9v bCBzaG91bGRIYW5kbGVXaGVlbEV2ZW50U3luY2hyb25vdXNseShjb25zdCBQbGF0Zm9ybVdoZWVs RXZlbnQmKTsKLSAgICAKKyAgICBXRUJDT1JFX0VYUE9SVCB2aXJ0dWFsIFNjcm9sbGluZ0V2ZW50 UmVzdWx0IGhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50Jik7CisKICAg ICB2b2lkIHNldE1haW5GcmFtZUlzUnViYmVyQmFuZGluZyhib29sKTsKICAgICBib29sIGlzUnVi YmVyQmFuZEluUHJvZ3Jlc3MoKTsKICAgICB2b2lkIHNldE1haW5GcmFtZUlzU2Nyb2xsU25hcHBp bmcoYm9vbCk7CkBAIC0xODgsOCArMTg2LDYgQEAgcHJvdGVjdGVkOgogICAgIEZsb2F0UG9pbnQg bWFpbkZyYW1lU2Nyb2xsUG9zaXRpb24oKSBjb25zdDsKICAgICB2b2lkIHNldE1haW5GcmFtZVNj cm9sbFBvc2l0aW9uKEZsb2F0UG9pbnQpOwogCi0gICAgV0VCQ09SRV9FWFBPUlQgdmlydHVhbCBT Y3JvbGxpbmdFdmVudFJlc3VsdCBoYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxF dmVudCYpOwotCiAgICAgT3B0aW9uYWw8dW5zaWduZWQ+IG5vbWluYWxGcmFtZXNQZXJTZWNvbmQo KTsKIAogICAgIHZvaWQgYXBwbHlMYXllclBvc2l0aW9uc0ludGVybmFsKCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9UaHJlYWRlZFNjcm9sbGluZ1RyZWUuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvVGhyZWFkZWRTY3JvbGxpbmdUcmVlLmNw cAppbmRleCA5M2M4MTYwNmY0NTk5NTZjMTYzZjNhYTFmNDQ2OTY4ZmFkNmViNGM5Li45NmI3N2Q1 MzAwOTllNzljNGYyNjAzNjUwMzkwMmE2ODE2NmIwNzUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9UaHJlYWRlZFNjcm9sbGluZ1RyZWUuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5jcHAKQEAgLTU1 LDIxICs1NSw2IEBAIFRocmVhZGVkU2Nyb2xsaW5nVHJlZTo6flRocmVhZGVkU2Nyb2xsaW5nVHJl ZSgpCiAgICAgQVNTRVJUKCFtX3Njcm9sbGluZ0Nvb3JkaW5hdG9yKTsKIH0KIAotU2Nyb2xsaW5n RXZlbnRSZXN1bHQgVGhyZWFkZWRTY3JvbGxpbmdUcmVlOjp0cnlUb0hhbmRsZVdoZWVsRXZlbnQo Y29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZW50LCBDb21wbGV0aW9uRnVuY3Rpb24m JiBjb21wbGV0aW9uRnVuY3Rpb24pCi17Ci0gICAgaWYgKHNob3VsZEhhbmRsZVdoZWVsRXZlbnRT eW5jaHJvbm91c2x5KHdoZWVsRXZlbnQpKQotICAgICAgICByZXR1cm4gU2Nyb2xsaW5nRXZlbnRS ZXN1bHQ6OlNlbmRUb01haW5UaHJlYWQ7Ci0KLSAgICBSZWZQdHI8VGhyZWFkZWRTY3JvbGxpbmdU cmVlPiBwcm90ZWN0ZWRUaGlzKHRoaXMpOwotICAgIFNjcm9sbGluZ1RocmVhZDo6ZGlzcGF0Y2go W3Byb3RlY3RlZFRoaXMsIHdoZWVsRXZlbnQsIGNvbXBsZXRpb25GdW5jID0gV1RGTW92ZShjb21w bGV0aW9uRnVuY3Rpb24pXSB7Ci0gICAgICAgIGF1dG8gcmVzdWx0ID0gcHJvdGVjdGVkVGhpcy0+ aGFuZGxlV2hlZWxFdmVudCh3aGVlbEV2ZW50KTsKLSAgICAgICAgaWYgKGNvbXBsZXRpb25GdW5j KQotICAgICAgICAgICAgY29tcGxldGlvbkZ1bmMocmVzdWx0KTsKLSAgICB9KTsKLSAgICAKLSAg ICByZXR1cm4gU2Nyb2xsaW5nRXZlbnRSZXN1bHQ6OlNlbmRUb1Njcm9sbGluZ1RocmVhZDsKLX0K LQogU2Nyb2xsaW5nRXZlbnRSZXN1bHQgVGhyZWFkZWRTY3JvbGxpbmdUcmVlOjpoYW5kbGVXaGVl bEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgd2hlZWxFdmVudCkKIHsKICAgICBBU1NF UlQoU2Nyb2xsaW5nVGhyZWFkOjppc0N1cnJlbnRUaHJlYWQoKSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9UaHJlYWRlZFNjcm9sbGluZ1RyZWUuaCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5oCmluZGV4IDdj NWEzODJlMWMxMWEyMmM4ZGVlYzQ5YTZkYjYxZDAwZGJiYjE5MjIuLjhmNzFjZDljMTUwNjE3NzMx NWUxODM4ZDAzNzhmMTEzOTIyMTljZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5oCkBAIC00OSwxMSArNDksNiBAQCBw dWJsaWM6CiAKICAgICBTY3JvbGxpbmdFdmVudFJlc3VsdCBoYW5kbGVXaGVlbEV2ZW50QWZ0ZXJN YWluVGhyZWFkKGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYpOwogCi0gICAgLy8gQ2FuIGJlIGNh bGxlZCBmcm9tIGFueSB0aHJlYWQuIFdpbGwgdHJ5IHRvIGhhbmRsZSB0aGUgd2hlZWwgZXZlbnQg b24gdGhlIHNjcm9sbGluZyB0aHJlYWQuCi0gICAgLy8gUmV0dXJucyB0cnVlIGlmIHRoZSB3aGVl bCBldmVudCBjYW4gYmUgaGFuZGxlZCBvbiB0aGUgc2Nyb2xsaW5nIHRocmVhZCBhbmQgZmFsc2Ug aWYgdGhlCi0gICAgLy8gZXZlbnQgbXVzdCBiZSBzZW50IGFnYWluIHRvIHRoZSBXZWJDb3JlIGV2 ZW50IGhhbmRsZXIuCi0gICAgU2Nyb2xsaW5nRXZlbnRSZXN1bHQgdHJ5VG9IYW5kbGVXaGVlbEV2 ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYsIENvbXBsZXRpb25GdW5jdGlvbiYmKSBvdmVy cmlkZTsKLQogICAgIHZvaWQgaW52YWxpZGF0ZSgpIG92ZXJyaWRlOwogCiAgICAgV0VCQ09SRV9F WFBPUlQgdm9pZCBkaXNwbGF5RGlkUmVmcmVzaChQbGF0Zm9ybURpc3BsYXlJRCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Nyb2xs aW5nQ29vcmRpbmF0b3JQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVM YXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eS5jcHAKaW5kZXggMjk1Mzc3 MmIyMTZmNWQ0YjM5MzliY2U3OTY1ZTQ3YTYwMmE1MTQ4Ny4uODFjYjQzMTdhNTNiYzE1MjFlZmM0 NzQxODEzMDVhMGVhZDliYzhiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv UmVtb3RlTGF5ZXJUcmVlL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVTY3JvbGxpbmdD b29yZGluYXRvclByb3h5LmNwcApAQCAtMTc2LDEwICsxNzYsMTggQEAgdm9pZCBSZW1vdGVTY3Jv bGxpbmdDb29yZGluYXRvclByb3h5Ojplc3RhYmxpc2hMYXllclRyZWVTY3JvbGxpbmdSZWxhdGlv bnMoY29uc3QKIAogI2VuZGlmCiAKLWJvb2wgUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94 eTo6aGFuZGxlV2hlZWxFdmVudChjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIGV2ZW50KQorYm9v bCBSZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5OjpoYW5kbGVXaGVlbEV2ZW50KGNvbnN0 IFBsYXRmb3JtV2hlZWxFdmVudCYgd2hlZWxFdmVudCkKIHsKLSAgICBTY3JvbGxpbmdFdmVudFJl c3VsdCByZXN1bHQgPSBtX3Njcm9sbGluZ1RyZWUtPnRyeVRvSGFuZGxlV2hlZWxFdmVudChldmVu dCwgbnVsbHB0cik7Ci0gICAgcmV0dXJuIHJlc3VsdCA9PSBTY3JvbGxpbmdFdmVudFJlc3VsdDo6 RGlkSGFuZGxlRXZlbnQ7IC8vIEZJWE1FOiBoYW5kbGUgb3RoZXIgdmFsdWVzLgorICAgIGlmICgh bV9zY3JvbGxpbmdUcmVlKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAobV9zY3Jv bGxpbmdUcmVlLT5zaG91bGRIYW5kbGVXaGVlbEV2ZW50U3luY2hyb25vdXNseSh3aGVlbEV2ZW50 KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgaWYgKG1fc2Nyb2xsaW5nVHJlZS0+d2ls bFdoZWVsRXZlbnRTdGFydFN3aXBlR2VzdHVyZSh3aGVlbEV2ZW50KSkKKyAgICAgICAgcmV0dXJu IGZhbHNlOworCisgICAgcmV0dXJuIG1fc2Nyb2xsaW5nVHJlZS0+aGFuZGxlV2hlZWxFdmVudCh3 aGVlbEV2ZW50KSA9PSBTY3JvbGxpbmdFdmVudFJlc3VsdDo6RGlkSGFuZGxlRXZlbnQ7CiB9CiAK IHZvaWQgUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eTo6aGFuZGxlTW91c2VFdmVudChj b25zdCBXZWJDb3JlOjpQbGF0Zm9ybU1vdXNlRXZlbnQmIGV2ZW50KQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZVNjcm9sbGluZ1RyZWUu Y3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZVNjcm9s bGluZ1RyZWUuY3BwCmluZGV4IGRiNGEzYTg2MWYwY2I0YzdiYjE3YjMwM2UyODVjZmQ4YmEzOWJl YWIuLjQxODNlYTI0OTRkZDZiYmFjOTNkZWI2NmU1NTllZTQ0YjdmNWE1ZWYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVTY3JvbGxpbmdU cmVlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvUmVt b3RlU2Nyb2xsaW5nVHJlZS5jcHAKQEAgLTYxLDE4ICs2MSw2IEBAIFJlbW90ZVNjcm9sbGluZ1Ry ZWU6On5SZW1vdGVTY3JvbGxpbmdUcmVlKCkKIHsKIH0KIAotU2Nyb2xsaW5nRXZlbnRSZXN1bHQg UmVtb3RlU2Nyb2xsaW5nVHJlZTo6dHJ5VG9IYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFBsYXRmb3Jt V2hlZWxFdmVudCYgd2hlZWxFdmVudCwgQ29tcGxldGlvbkZ1bmN0aW9uJiYpCi17Ci0gICAgaWYg KHNob3VsZEhhbmRsZVdoZWVsRXZlbnRTeW5jaHJvbm91c2x5KHdoZWVsRXZlbnQpKQotICAgICAg ICByZXR1cm4gU2Nyb2xsaW5nRXZlbnRSZXN1bHQ6OlNlbmRUb01haW5UaHJlYWQ7Ci0KLSAgICBp ZiAod2lsbFdoZWVsRXZlbnRTdGFydFN3aXBlR2VzdHVyZSh3aGVlbEV2ZW50KSkKLSAgICAgICAg cmV0dXJuIFNjcm9sbGluZ0V2ZW50UmVzdWx0OjpEaWROb3RIYW5kbGVFdmVudDsKLQotICAgIGhh bmRsZVdoZWVsRXZlbnQod2hlZWxFdmVudCk7Ci0gICAgcmV0dXJuIFNjcm9sbGluZ0V2ZW50UmVz dWx0OjpEaWRIYW5kbGVFdmVudDsKLX0KLQogI2lmIFBMQVRGT1JNKE1BQykKIHZvaWQgUmVtb3Rl U2Nyb2xsaW5nVHJlZTo6aGFuZGxlV2hlZWxFdmVudFBoYXNlKFNjcm9sbGluZ05vZGVJRCwgUGxh dGZvcm1XaGVlbEV2ZW50UGhhc2UpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nVHJlZS5oIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZVNjcm9sbGluZ1RyZWUuaAppbmRleCA1 OGFmMmVlNjNiZDZmYzE2MmExMzliNGE4OWIyYzY4ZWUyMzRmNGVlLi42NTc2MGZjYTEwOTVlNjMx ZTgwNjY4ZDJkN2FiNzg4OGIwMjZiMjdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nVHJlZS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVTY3JvbGxpbmdUcmVlLmgKQEAg LTQ1LDcgKzQ1LDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgflJlbW90ZVNjcm9sbGluZ1RyZWUo KTsKIAogICAgIGJvb2wgaXNSZW1vdGVTY3JvbGxpbmdUcmVlKCkgY29uc3Qgb3ZlcnJpZGUgeyBy ZXR1cm4gdHJ1ZTsgfQotICAgIFdlYkNvcmU6OlNjcm9sbGluZ0V2ZW50UmVzdWx0IHRyeVRvSGFu ZGxlV2hlZWxFdmVudChjb25zdCBXZWJDb3JlOjpQbGF0Zm9ybVdoZWVsRXZlbnQmLCBDb21wbGV0 aW9uRnVuY3Rpb24mJikgb3ZlcnJpZGU7CiAKICAgICB2b2lkIGhhbmRsZU1vdXNlRXZlbnQoY29u c3QgV2ViQ29yZTo6UGxhdGZvcm1Nb3VzZUV2ZW50Jik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0V2ZW50RGlzcGF0Y2hlci5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9FdmVudERpc3BhdGNoZXIuY3BwCmluZGV4IDBlM2VkMjBj Yjk2MGFlN2ZiYWFhZjNhZmZkOTYzZTBiYjM0YjM0MGIuLjc0ZWIyZTBhYWIwZTBmMDNjYzU4MmUx MTc5NWM0MzQwNTMzNzkwMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL0V2ZW50RGlzcGF0Y2hlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlBhZ2UvRXZlbnREaXNwYXRjaGVyLmNwcApAQCAtMTIxLDggKzEyMSwxMyBAQCB2b2lkIEV2 ZW50RGlzcGF0Y2hlcjo6d2hlZWxFdmVudChQYWdlSWRlbnRpZmllciBwYWdlSUQsIGNvbnN0IFdl YldoZWVsRXZlbnQmIHdoZQogI2VuZGlmCiAKICNpZiBFTkFCTEUoU0NST0xMSU5HX1RIUkVBRCkK LSAgICBMb2NrSG9sZGVyIGxvY2tlcihtX3Njcm9sbGluZ1RyZWVzTXV0ZXgpOwotICAgIGlmIChS ZWZQdHI8VGhyZWFkZWRTY3JvbGxpbmdUcmVlPiBzY3JvbGxpbmdUcmVlID0gbV9zY3JvbGxpbmdU cmVlcy5nZXQocGFnZUlEKSkgeworICAgIGF1dG8gc2VudFRvU2Nyb2xsaW5nVGhyZWFkID0gWyZd KCkgeworICAgICAgICBMb2NrSG9sZGVyIGxvY2tlcihtX3Njcm9sbGluZ1RyZWVzTXV0ZXgpOwor CisgICAgICAgIGF1dG8gc2Nyb2xsaW5nVHJlZSA9IG1fc2Nyb2xsaW5nVHJlZXMuZ2V0KHBhZ2VJ RCk7CisgICAgICAgIGlmICghc2Nyb2xsaW5nVHJlZSkKKyAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKKyAgICAgICAgCiAgICAgICAgIC8vIEZJWE1FOiBJdCdzIHByZXR0eSBob3JyaWJsZSB0aGF0 IHdlJ3JlIHVwZGF0aW5nIHRoZSBiYWNrL2ZvcndhcmQgc3RhdGUgaGVyZS4KICAgICAgICAgLy8g V2ViQ29yZSBzaG91bGQgYWx3YXlzIGtub3cgdGhlIGN1cnJlbnQgc3RhdGUgYW5kIGtub3cgd2hl biBpdCBjaGFuZ2VzIHNvIHRoZQogICAgICAgICAvLyBzY3JvbGxpbmcgdHJlZSBjYW4gYmUgbm90 aWZpZWQuCkBAIC0xMzAsMjggKzEzNSwyNiBAQCB2b2lkIEV2ZW50RGlzcGF0Y2hlcjo6d2hlZWxF dmVudChQYWdlSWRlbnRpZmllciBwYWdlSUQsIGNvbnN0IFdlYldoZWVsRXZlbnQmIHdoZQogICAg ICAgICBpZiAocGxhdGZvcm1XaGVlbEV2ZW50LnBoYXNlKCkgPT0gUGxhdGZvcm1XaGVlbEV2ZW50 UGhhc2VCZWdhbikKICAgICAgICAgICAgIHNjcm9sbGluZ1RyZWUtPnNldE1haW5GcmFtZUNhblJ1 YmJlckJhbmQoeyBjYW5SdWJiZXJCYW5kQXRUb3AsIGNhblJ1YmJlckJhbmRBdFJpZ2h0LCBjYW5S dWJiZXJCYW5kQXRCb3R0b20sIGNhblJ1YmJlckJhbmRBdExlZnQgfSk7CiAKLSAgICAgICAgU2Ny b2xsaW5nRXZlbnRSZXN1bHQgcmVzdWx0ID0gc2Nyb2xsaW5nVHJlZS0+dHJ5VG9IYW5kbGVXaGVl bEV2ZW50KHBsYXRmb3JtV2hlZWxFdmVudCwgW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlz KSwgd2hlZWxFdmVudCwgcGFnZUlEXShTY3JvbGxpbmdFdmVudFJlc3VsdCByZXN1bHQpIHsKLSAg ICAgICAgICAgIEFTU0VSVChTY3JvbGxpbmdUaHJlYWQ6OmlzQ3VycmVudFRocmVhZCgpKTsKLSAg ICAgICAgICAgIEFTU0VSVChyZXN1bHQgIT0gU2Nyb2xsaW5nRXZlbnRSZXN1bHQ6OlNlbmRUb1Nj cm9sbGluZ1RocmVhZCk7Ci0gICAgICAgICAgICAKKyAgICAgICAgaWYgKHNjcm9sbGluZ1RyZWUt PnNob3VsZEhhbmRsZVdoZWVsRXZlbnRTeW5jaHJvbm91c2x5KHBsYXRmb3JtV2hlZWxFdmVudCkp CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgU2Nyb2xsaW5nVGhyZWFkOjpk aXNwYXRjaChbc2Nyb2xsaW5nVHJlZSwgd2hlZWxFdmVudCwgcGxhdGZvcm1XaGVlbEV2ZW50LCBw YWdlSUQsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKV0geworICAgICAgICAgICAgYXV0 byByZXN1bHQgPSBzY3JvbGxpbmdUcmVlLT5oYW5kbGVXaGVlbEV2ZW50KHBsYXRmb3JtV2hlZWxF dmVudCk7CisKICAgICAgICAgICAgIGlmIChyZXN1bHQgPT0gU2Nyb2xsaW5nRXZlbnRSZXN1bHQ6 OlNlbmRUb01haW5UaHJlYWQpIHsKLSAgICAgICAgICAgICAgICBSdW5Mb29wOjptYWluKCkuZGlz cGF0Y2goW2lubmVyUHJvdGVjdGVkVGhpcyA9IHByb3RlY3RlZFRoaXMuY29weVJlZigpLCBwYWdl SUQsIHdoZWVsRXZlbnRdKCkgbXV0YWJsZSB7Ci0gICAgICAgICAgICAgICAgICAgIGlubmVyUHJv dGVjdGVkVGhpcy0+ZGlzcGF0Y2hXaGVlbEV2ZW50KHBhZ2VJRCwgd2hlZWxFdmVudCk7Ci0gICAg ICAgICAgICAgICAgfSk7CisgICAgICAgICAgICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlzcGF0Y2hX aGVlbEV2ZW50VmlhTWFpblRocmVhZChwYWdlSUQsIHdoZWVsRXZlbnQpOwogICAgICAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIAotICAgICAgICAgICAgc2Vu ZERpZFJlY2VpdmVFdmVudChwYWdlSUQsIHdoZWVsRXZlbnQudHlwZSgpLCByZXN1bHQgPT0gU2Ny b2xsaW5nRXZlbnRSZXN1bHQ6OkRpZEhhbmRsZUV2ZW50KTsKKworICAgICAgICAgICAgcHJvdGVj dGVkVGhpcy0+c2VuZERpZFJlY2VpdmVFdmVudChwYWdlSUQsIHdoZWVsRXZlbnQudHlwZSgpLCBy ZXN1bHQgPT0gU2Nyb2xsaW5nRXZlbnRSZXN1bHQ6OkRpZEhhbmRsZUV2ZW50KTsKICAgICAgICAg fSk7CiAKLSAgICAgICAgaWYgKHJlc3VsdCA9PSBTY3JvbGxpbmdFdmVudFJlc3VsdDo6U2VuZFRv U2Nyb2xsaW5nVGhyZWFkKQotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gdHJ1 ZTsKKyAgICB9KCk7CisKKyAgICBpZiAoc2VudFRvU2Nyb2xsaW5nVGhyZWFkKQorICAgICAgICBy ZXR1cm47CiAKLSAgICAgICAgaWYgKHJlc3VsdCA9PSBTY3JvbGxpbmdFdmVudFJlc3VsdDo6RGlk SGFuZGxlRXZlbnQgfHwgcmVzdWx0ID09IFNjcm9sbGluZ0V2ZW50UmVzdWx0OjpEaWROb3RIYW5k bGVFdmVudCkgewotICAgICAgICAgICAgc2VuZERpZFJlY2VpdmVFdmVudChwYWdlSUQsIHdoZWVs RXZlbnQudHlwZSgpLCByZXN1bHQgPT0gU2Nyb2xsaW5nRXZlbnRSZXN1bHQ6OkRpZEhhbmRsZUV2 ZW50KTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotICAgIH0KICNlbHNlCiAgICAg VU5VU0VEX1BBUkFNKGNhblJ1YmJlckJhbmRBdExlZnQpOwogICAgIFVOVVNFRF9QQVJBTShjYW5S dWJiZXJCYW5kQXRSaWdodCk7CkBAIC0xNTksOSArMTYyLDcgQEAgdm9pZCBFdmVudERpc3BhdGNo ZXI6OndoZWVsRXZlbnQoUGFnZUlkZW50aWZpZXIgcGFnZUlELCBjb25zdCBXZWJXaGVlbEV2ZW50 JiB3aGUKICAgICBVTlVTRURfUEFSQU0oY2FuUnViYmVyQmFuZEF0Qm90dG9tKTsKICNlbmRpZgog Ci0gICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigq dGhpcyksIHBhZ2VJRCwgd2hlZWxFdmVudF0oKSBtdXRhYmxlIHsKLSAgICAgICAgcHJvdGVjdGVk VGhpcy0+ZGlzcGF0Y2hXaGVlbEV2ZW50KHBhZ2VJRCwgd2hlZWxFdmVudCk7Ci0gICAgfSk7IAor ICAgIGRpc3BhdGNoV2hlZWxFdmVudFZpYU1haW5UaHJlYWQocGFnZUlELCB3aGVlbEV2ZW50KTsK IH0KIAogI2lmIEVOQUJMRShNQUNfR0VTVFVSRV9FVkVOVFMpCkBAIC0yMzEsNiArMjMyLDE0IEBA IHZvaWQgRXZlbnREaXNwYXRjaGVyOjpkaXNwYXRjaFRvdWNoRXZlbnRzKCkKIH0KICNlbmRpZgog Cit2b2lkIEV2ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0Y2hXaGVlbEV2ZW50VmlhTWFpblRocmVhZChX ZWJDb3JlOjpQYWdlSWRlbnRpZmllciBwYWdlSUQsIGNvbnN0IFdlYldoZWVsRXZlbnQmIHdoZWVs RXZlbnQpCit7CisgICAgQVNTRVJUKCFSdW5Mb29wOjppc01haW4oKSk7CisgICAgUnVuTG9vcDo6 bWFpbigpLmRpc3BhdGNoKFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIHBhZ2VJRCwg d2hlZWxFdmVudF0oKSBtdXRhYmxlIHsKKyAgICAgICAgcHJvdGVjdGVkVGhpcy0+ZGlzcGF0Y2hX aGVlbEV2ZW50KHBhZ2VJRCwgd2hlZWxFdmVudCk7CisgICAgfSk7Cit9CisKIHZvaWQgRXZlbnRE aXNwYXRjaGVyOjpkaXNwYXRjaFdoZWVsRXZlbnQoUGFnZUlkZW50aWZpZXIgcGFnZUlELCBjb25z dCBXZWJXaGVlbEV2ZW50JiB3aGVlbEV2ZW50KQogewogICAgIEFTU0VSVChSdW5Mb29wOjppc01h aW4oKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9FdmVu dERpc3BhdGNoZXIuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0V2ZW50RGlz cGF0Y2hlci5oCmluZGV4IGM3OTQ2YjczNzFhNzE0ODU5YTY1NGQ5ZWU4YmM5YzZhOTVhNmE0Y2Uu LjhmYzIxYjQ3MWIwMTljMTJhYTYzMTFiZDBhYzRkMjZiMGIyODU5NDEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0V2ZW50RGlzcGF0Y2hlci5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0V2ZW50RGlzcGF0Y2hlci5oCkBAIC04Nyw2 ICs4Nyw4IEBAIHByaXZhdGU6CiAKICAgICAvLyBUaGlzIGlzIGNhbGxlZCBvbiB0aGUgbWFpbiB0 aHJlYWQuCiAgICAgdm9pZCBkaXNwYXRjaFdoZWVsRXZlbnQoV2ViQ29yZTo6UGFnZUlkZW50aWZp ZXIsIGNvbnN0IFdlYldoZWVsRXZlbnQmKTsKKyAgICB2b2lkIGRpc3BhdGNoV2hlZWxFdmVudFZp YU1haW5UaHJlYWQoV2ViQ29yZTo6UGFnZUlkZW50aWZpZXIsIGNvbnN0IFdlYldoZWVsRXZlbnQm KTsKKwogI2lmIEVOQUJMRShJT1NfVE9VQ0hfRVZFTlRTKQogICAgIHZvaWQgZGlzcGF0Y2hUb3Vj aEV2ZW50cygpOwogI2VuZGlmCg==