211315 2020-05-01 13:11:04 -0700 handleWheelEventPhase() should include the relevant ScrollingNodeID 2020-05-02 12:33:20 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser cmarcelo ews-watchlist fred.wang jamesr luiz simon.fraser thorton tonikitoo webkit-bug-importer oldest_to_newest 1648011 0 simon.fraser 2020-05-01 13:11:04 -0700 handleWheelEventPhase() should include the relevant ScrollingNodeID 1648012 1 398223 simon.fraser 2020-05-01 13:13:44 -0700 Created attachment 398223 Patch 1648261 2 ews-feeder 2020-05-02 12:32:30 -0700 Committed r261052: <https://trac.webkit.org/changeset/261052> All reviewed patches have been landed. Closing bug and clearing flags on attachment 398223. 1648263 3 webkit-bug-importer 2020-05-02 12:33:20 -0700 <rdar://problem/62771947> 398223 2020-05-01 13:13:44 -0700 2020-05-02 12:32:31 -0700 Patch bug-211315-20200501131343.patch text/plain 14512 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxMDA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzgyNGJlNjFhNmY1NTkx YzNjNmU2NzkxMzA0ZGEyYTg0MDZiNjAxYi4uMTUxZmNhOTE4ZjRhMDZjMTBkZTZkYTc1MDg0ZDg4 ZWFmNjJmYzk4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIwLTA1LTAxICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIGhhbmRsZVdoZWVs RXZlbnRQaGFzZSgpIHNob3VsZCBpbmNsdWRlIHRoZSByZWxldmFudCBTY3JvbGxpbmdOb2RlSUQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMTMxNQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGhhbmRsZVdo ZWVsRXZlbnRQaGFzZSgpIGlzIHVzZWQgdG8gc2VuZCBpbmZvcm1hdGlvbiBhYm91dCB3aGVlbCBl dmVudCBwaGFzZXMKKyAgICAgICAgdG8gdGhlIG1haW4gdGhyZWFkLCB3aGljaCBtYWtlIHRoZWly IHdheSB0byBTY3JvbGxBbmltYXRvck1hYzo6aGFuZGxlV2hlZWxFdmVudFBoYXNlKCkKKyAgICAg ICAgYW5kIGFyZSB1c2VkIHRvIHVwZGF0ZSB0aGUgc3RhdGUgb2Ygb3ZlcmxheSBzY3JvbGxiYXJz LiBJbiBvcmRlciB0byB0YWxrIHRvIHRoZQorICAgICAgICBjb3JyZWN0IHNldCBvZiBzY3JvbGxi YXJzIHdpdGggb3ZlcmZsb3c6c2Nyb2xsLCB3ZSBuZWVkIHRvIHNlbmQgYWxvbmcgdGhlIFNjcm9s bGluZ05vZGVJRAorICAgICAgICBhbmQgbWFwIHRoYXQgdG8gdGhlIGFwcHJvcHJpYXRlIFNjcm9s bGFibGVBcmVhLgorCisgICAgICAgIFdpbGwgYmUgdGVzdGVkIGJ5IGZ1dHVyZSBvdmVybGF5IHNj cm9sbGJhciB0ZXN0cy4KKworICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5n Q29vcmRpbmF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXN5bmNTY3JvbGxpbmdDb29yZGlu YXRvcjo6aGFuZGxlV2hlZWxFdmVudFBoYXNlKToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9B c3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmg6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nQ29vcmRpbmF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nQ29vcmRp bmF0b3I6OmhhbmRsZVdoZWVsRXZlbnRQaGFzZSk6IERlbGV0ZWQuCisgICAgICAgICogcGFnZS9z Y3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9s bGluZ0Nvb3JkaW5hdG9yOjpoYW5kbGVXaGVlbEV2ZW50UGhhc2UpOgorICAgICAgICAqIHBhZ2Uv c2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuaDoKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9UaHJl YWRlZFNjcm9sbGluZ1RyZWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGhyZWFkZWRTY3JvbGxp bmdUcmVlOjpoYW5kbGVXaGVlbEV2ZW50UGhhc2UpOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5n L1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5oOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL21hYy9T Y3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6 U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1hYzo6aGFuZGxlV2hlZWxFdmVudCk6Cisg ICAgICAgICogcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGlu Z05vZGVNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3Jv bGxpbmdOb2RlTWFjOjpoYW5kbGVXaGVlbEV2ZW50KToKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMv U2Nyb2xsQW5pbWF0b3JNYWMubW06CisKIDIwMjAtMDUtMDEgIFNpbW9uIEZyYXNlciAgPHNpbW9u LmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgc2Nyb2xsYWJsZUFyZWFGb3JTY3JvbGxpbmdO b2RlSUQoKSBnaXZlcyB0aGUgd3JvbmcgYW5zd2VyIGZvciB0aGUgRnJhbWVWaWV3CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmlu ZGV4IGMwMDc3N2U4OWQ5NjIyMTIwMjE4ZGE0ODJjMzA0OGQ5YjBlMjU5YzUuLjBhYTI3ZmU1YTFm NGY3MmExZTYzYWZjMDQ5MDM1ZDdiZmZjMWYzZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAK KzIwMjAtMDUtMDEgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAg ICAgICAgaGFuZGxlV2hlZWxFdmVudFBoYXNlKCkgc2hvdWxkIGluY2x1ZGUgdGhlIHJlbGV2YW50 IFNjcm9sbGluZ05vZGVJRAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjExMzE1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgaGFuZGxlV2hlZWxFdmVudFBoYXNlKCkgaXMgdXNlZCB0byBzZW5kIGluZm9ybWF0 aW9uIGFib3V0IHdoZWVsIGV2ZW50IHBoYXNlcworICAgICAgICB0byB0aGUgbWFpbiB0aHJlYWQs IHdoaWNoIG1ha2UgdGhlaXIgd2F5IHRvIFNjcm9sbEFuaW1hdG9yTWFjOjpoYW5kbGVXaGVlbEV2 ZW50UGhhc2UoKQorICAgICAgICBhbmQgYXJlIHVzZWQgdG8gdXBkYXRlIHRoZSBzdGF0ZSBvZiBv dmVybGF5IHNjcm9sbGJhcnMuIEluIG9yZGVyIHRvIHRhbGsgdG8gdGhlCisgICAgICAgIGNvcnJl Y3Qgc2V0IG9mIHNjcm9sbGJhcnMgd2l0aCBvdmVyZmxvdzpzY3JvbGwsIHdlIG5lZWQgdG8gc2Vu ZCBhbG9uZyB0aGUgU2Nyb2xsaW5nTm9kZUlECisgICAgICAgIGFuZCBtYXAgdGhhdCB0byB0aGUg YXBwcm9wcmlhdGUgU2Nyb2xsYWJsZUFyZWEuCisKKyAgICAgICAgV2lsbCBiZSB0ZXN0ZWQgYnkg ZnV0dXJlIG92ZXJsYXkgc2Nyb2xsYmFyIHRlc3RzLgorCisgICAgICAgICogVUlQcm9jZXNzL1Jl bW90ZUxheWVyVHJlZS9SZW1vdGVTY3JvbGxpbmdUcmVlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 UmVtb3RlU2Nyb2xsaW5nVHJlZTo6aGFuZGxlV2hlZWxFdmVudFBoYXNlKToKKyAgICAgICAgKiBV SVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZVNjcm9sbGluZ1RyZWUuaDoKKwogMjAyMC0w NS0wMSAgUGVuZyBMaXUgIDxwZW5nLmxpdTZAYXBwbGUuY29tPgogCiAgICAgICAgIEEgUGlQIHdp bmRvdyBkb2VzbuKAmXQgYWN0dWFsbHkgZGlzbWlzcyBhZnRlciB0aGUgYnJvd3NlciBuYXZpZ2F0 ZXMgdG8gYSBkaWZmZXJlbnQgcGFnZSB3aXRoaW4gdGhlIHNhbWUgZG9tYWluCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9y LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRp bmF0b3IuY3BwCmluZGV4IGE4ZjdhYTFiZTAzYzQ5ZWRhZWQwMGY0MDkzNWZkNTY4NDhiMjc4OTUu Ljg1NDRkMGJjYWE1YjQ0Yzk4OTUxNzg4NzZjOWUxZWZkMWJhNWVmZDAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRp bmF0b3IuY3BwCkBAIC03MCw2ICs3MCwyMyBAQCB2b2lkIEFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0 b3I6OnNjcm9sbGluZ1N0YXRlVHJlZVByb3BlcnRpZXNDaGFuZ2VkKCkKICAgICBzY2hlZHVsZVRy ZWVTdGF0ZUNvbW1pdCgpOwogfQogCisjaWYgUExBVEZPUk0oQ09DT0EpCit2b2lkIEFzeW5jU2Ny b2xsaW5nQ29vcmRpbmF0b3I6OmhhbmRsZVdoZWVsRXZlbnRQaGFzZShTY3JvbGxpbmdOb2RlSUQg bm9kZUlELCBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZSBwaGFzZSkKK3sKKyAgICBBU1NFUlQoaXNN YWluVGhyZWFkKCkpOworCisgICAgaWYgKCFtX3BhZ2UpCisgICAgICAgIHJldHVybjsKKworICAg IGF1dG8qIGZyYW1lVmlldyA9IGZyYW1lVmlld0ZvclNjcm9sbGluZ05vZGUobm9kZUlEKTsKKyAg ICBpZiAoIWZyYW1lVmlldykKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKGF1dG8qIHNjcm9s bGFibGVBcmVhID0gZnJhbWVWaWV3LT5zY3JvbGxhYmxlQXJlYUZvclNjcm9sbGluZ05vZGVJRChu b2RlSUQpKQorICAgICAgICBzY3JvbGxhYmxlQXJlYS0+c2Nyb2xsQW5pbWF0b3IoKS5oYW5kbGVX aGVlbEV2ZW50UGhhc2UocGhhc2UpOworfQorI2VuZGlmCisKICNpZiBFTkFCTEUoQ1NTX1NDUk9M TF9TTkFQKQogc3RhdGljIGlubGluZSB2b2lkIHNldFN0YXRlU2Nyb2xsaW5nTm9kZVNuYXBPZmZz ZXRzQXNGbG9hdChTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUmIG5vZGUsIFNjcm9sbEV2ZW50 QXhpcyBheGlzLCBjb25zdCBWZWN0b3I8TGF5b3V0VW5pdD4qIHNuYXBPZmZzZXRzLCBjb25zdCBW ZWN0b3I8U2Nyb2xsT2Zmc2V0UmFuZ2U8TGF5b3V0VW5pdD4+KiBzbmFwT2Zmc2V0UmFuZ2VzLCBm bG9hdCBkZXZpY2VTY2FsZUZhY3RvcikKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaCBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaAppbmRleCAwODdiMGYy ZWFlMWMxMGY1ZGVkNzYwNDVmOTE2OGIzYWQ5NmVmOTEwLi43YzNlNDY4YjZhOWJmMDBlNDcwZDI4 NWEwMDUzMmI5ZTY1OTVjMzE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s bGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvci5oCkBAIC01NCw2ICs1NCw4IEBA IHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNjaGVkdWxlVXBkYXRlU2Nyb2xsUG9z aXRpb25BZnRlckFzeW5jU2Nyb2xsKFNjcm9sbGluZ05vZGVJRCwgY29uc3QgRmxvYXRQb2ludCYs IGNvbnN0IE9wdGlvbmFsPEZsb2F0UG9pbnQ+JiBsYXlvdXRWaWV3cG9ydE9yaWdpbiwgU2Nyb2xs aW5nTGF5ZXJQb3NpdGlvbkFjdGlvbik7CiAKICNpZiBQTEFURk9STShDT0NPQSkKKyAgICBXRUJD T1JFX0VYUE9SVCB2b2lkIGhhbmRsZVdoZWVsRXZlbnRQaGFzZShTY3JvbGxpbmdOb2RlSUQsIFBs YXRmb3JtV2hlZWxFdmVudFBoYXNlKSBmaW5hbDsKKwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQg c2V0QWN0aXZlU2Nyb2xsU25hcEluZGljZXMoU2Nyb2xsaW5nTm9kZUlELCB1bnNpZ25lZCBob3Jp em9udGFsSW5kZXgsIHVuc2lnbmVkIHZlcnRpY2FsSW5kZXgpOwogI2VuZGlmCiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNw cAppbmRleCBkNWRhYTA5YzBmNDYxOGQxMjc2ZjVjZGU5MzA5ODAyODJlNzJlYjdmLi42Yzk2YTMw ZTQ5ZGM4MTIwYjJhOWYzOTEyZDA2N2Q3ZWZjY2Q3ZDY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCkBAIC0yOTQs MjIgKzI5NCw2IEBAIHZvaWQgU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OmZyYW1lVmlld1Jvb3RMYXll ckRpZENoYW5nZShGcmFtZVZpZXcmIGZyYW1lVmlldykKICAgICB1cGRhdGVTeW5jaHJvbm91c1Nj cm9sbGluZ1JlYXNvbnMoZnJhbWVWaWV3KTsKIH0KIAotI2lmIFBMQVRGT1JNKENPQ09BKQotdm9p ZCBTY3JvbGxpbmdDb29yZGluYXRvcjo6aGFuZGxlV2hlZWxFdmVudFBoYXNlKFBsYXRmb3JtV2hl ZWxFdmVudFBoYXNlIHBoYXNlKQotewotICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Ci0KLSAg ICBpZiAoIW1fcGFnZSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgYXV0byogZnJhbWVWaWV3ID0g bV9wYWdlLT5tYWluRnJhbWUoKS52aWV3KCk7Ci0gICAgaWYgKCFmcmFtZVZpZXcpCi0gICAgICAg IHJldHVybjsKLQotICAgIGZyYW1lVmlldy0+c2Nyb2xsQW5pbWF0b3IoKS5oYW5kbGVXaGVlbEV2 ZW50UGhhc2UocGhhc2UpOwotfQotI2VuZGlmCi0KIGJvb2wgU2Nyb2xsaW5nQ29vcmRpbmF0b3I6 Omhhc1Zpc2libGVTbG93UmVwYWludFZpZXdwb3J0Q29uc3RyYWluZWRPYmplY3RzKGNvbnN0IEZy YW1lVmlldyYgZnJhbWVWaWV3KSBjb25zdAogewogICAgIGF1dG8qIHZpZXdwb3J0Q29uc3RyYWlu ZWRPYmplY3RzID0gZnJhbWVWaWV3LnZpZXdwb3J0Q29uc3RyYWluZWRPYmplY3RzKCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRv ci5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3Iu aAppbmRleCBmOGJjOTg3ZDZhNzI4NDM1MzM4NTVjN2ZhMTgxNGMyNWYyZGRhODJkLi4xYjQyYmFi MzU4MDg3N2Q2MTM4M2I1NmVjZjAyMzY3NDU2OGQ1MzI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgKQEAgLTExNCw5ICsx MTQsOSBAQCBwdWJsaWM6CiAgICAgLy8gVGFrZXMgc2Nyb2xsIHBvc2l0aW9ucyBmcm9tIHRoZSBz Y3JvbGxpbmcgdHJlZSBhbmQgYXBwbGllcyB0aGVtIHRvIFNjcm9sbGFibGVBcmVhcy4KICAgICB2 aXJ0dWFsIHZvaWQgc3luY2hyb25pemVTdGF0ZUZyb21TY3JvbGxpbmdUcmVlKCkgeyB9CiAKLSNp ZiBQTEFURk9STShDT0NPQSkKKyNpZiBFTkFCTEUoS0lORVRJQ19TQ1JPTExJTkcpCiAgICAgLy8g RGlzcGF0Y2hlZCBieSB0aGUgc2Nyb2xsaW5nIHRyZWUgZHVyaW5nIGhhbmRsZVdoZWVsRXZlbnQu IFRoaXMgaXMgcmVxdWlyZWQgYXMgbG9uZyBhcyBzY3JvbGxiYXJzIGFyZSBwYWludGVkIG9uIHRo ZSBtYWluIHRocmVhZC4KLSAgICB2b2lkIGhhbmRsZVdoZWVsRXZlbnRQaGFzZShQbGF0Zm9ybVdo ZWVsRXZlbnRQaGFzZSk7CisgICAgdmlydHVhbCB2b2lkIGhhbmRsZVdoZWVsRXZlbnRQaGFzZShT Y3JvbGxpbmdOb2RlSUQsIFBsYXRmb3JtV2hlZWxFdmVudFBoYXNlKSB7IH0KICNlbmRpZgogCiAg ICAgLy8gRm9yY2UgYWxsIHNjcm9sbCBsYXllciBwb3NpdGlvbiB1cGRhdGVzIHRvIGhhcHBlbiBv biB0aGUgbWFpbiB0aHJlYWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s bGluZy9TY3JvbGxpbmdUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3Jv bGxpbmdUcmVlLmgKaW5kZXggZTAwMGUyODY2MDYxZGM5MDMzNmFjZTMzNmVmNjliMDEyMzBlZGM2 YS4uODYwOTdkMzQxNmI4NTNlYzEzMWE1ZGY1YmI0OTNiZDIwY2ZhZGE0OCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuaApAQCAtMTE2LDcgKzExNiw3 IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCBUcmFja2luZ1R5cGUgZXZlbnRUcmFja2lu Z1R5cGVGb3JQb2ludChjb25zdCBBdG9tU3RyaW5nJiBldmVudE5hbWUsIEludFBvaW50KTsKIAog I2lmIFBMQVRGT1JNKE1BQykKLSAgICB2aXJ0dWFsIHZvaWQgaGFuZGxlV2hlZWxFdmVudFBoYXNl KFBsYXRmb3JtV2hlZWxFdmVudFBoYXNlKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIGhhbmRsZVdo ZWVsRXZlbnRQaGFzZShTY3JvbGxpbmdOb2RlSUQsIFBsYXRmb3JtV2hlZWxFdmVudFBoYXNlKSA9 IDA7CiAgICAgdmlydHVhbCB2b2lkIHNldEFjdGl2ZVNjcm9sbFNuYXBJbmRpY2VzKFNjcm9sbGlu Z05vZGVJRCwgdW5zaWduZWQgLypob3Jpem9udGFsSW5kZXgqLywgdW5zaWduZWQgLyp2ZXJ0aWNh bEluZGV4Ki8pIHsgfQogCiAgICAgdmlydHVhbCB2b2lkIHNldFdoZWVsRXZlbnRUZXN0TW9uaXRv cihSZWZQdHI8V2hlZWxFdmVudFRlc3RNb25pdG9yPiYmKSB7IH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9UaHJlYWRlZFNjcm9sbGluZ1RyZWUuY3BwCmluZGV4 IGNjZWU3ZTRlZmQ0YzExN2ViZGNmMmZjNjE1ZjFiOTk1MzAyZmMyMmYuLjQ3OGNhYWRmZTJhNTYy OTdkMTljNTE1YjViMWQxMDA2NDY2OWQ4MzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvVGhyZWFkZWRTY3JvbGxpbmdUcmVlLmNwcApAQCAtMTY1LDEzICsx NjUsMTMgQEAgdm9pZCBUaHJlYWRlZFNjcm9sbGluZ1RyZWU6OmN1cnJlbnRTbmFwUG9pbnRJbmRp Y2VzRGlkQ2hhbmdlKFNjcm9sbGluZ05vZGVJRCBub2QKICNlbmRpZgogCiAjaWYgUExBVEZPUk0o TUFDKQotdm9pZCBUaHJlYWRlZFNjcm9sbGluZ1RyZWU6OmhhbmRsZVdoZWVsRXZlbnRQaGFzZShQ bGF0Zm9ybVdoZWVsRXZlbnRQaGFzZSBwaGFzZSkKK3ZvaWQgVGhyZWFkZWRTY3JvbGxpbmdUcmVl OjpoYW5kbGVXaGVlbEV2ZW50UGhhc2UoU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCwgUGxhdGZvcm1X aGVlbEV2ZW50UGhhc2UgcGhhc2UpCiB7CiAgICAgaWYgKCFtX3Njcm9sbGluZ0Nvb3JkaW5hdG9y KQogICAgICAgICByZXR1cm47CiAKLSAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3Njcm9s bGluZ0Nvb3JkaW5hdG9yID0gbV9zY3JvbGxpbmdDb29yZGluYXRvciwgcGhhc2VdIHsKLSAgICAg ICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPmhhbmRsZVdoZWVsRXZlbnRQaGFzZShwaGFzZSk7Cisg ICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtzY3JvbGxpbmdDb29yZGluYXRvciA9IG1fc2Ny b2xsaW5nQ29vcmRpbmF0b3IsIG5vZGVJRCwgcGhhc2VdIHsKKyAgICAgICAgc2Nyb2xsaW5nQ29v cmRpbmF0b3ItPmhhbmRsZVdoZWVsRXZlbnRQaGFzZShub2RlSUQsIHBoYXNlKTsKICAgICB9KTsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvVGhyZWFkZWRT Y3JvbGxpbmdUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9UaHJlYWRlZFNj cm9sbGluZ1RyZWUuaAppbmRleCAwNjZhMDZlM2JhZWM5ZWY4Yzk5YjVjMzM0YjYwMjQ4YTcwMjVm NDA1Li42NTFmNTNiNGI4Y2MyNmI0YTU4MDgwMjgyZmRjZDkwMWVhMGRmOWQ3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9UaHJlYWRlZFNjcm9sbGluZ1RyZWUuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9UaHJlYWRlZFNjcm9sbGluZ1RyZWUu aApAQCAtNTgsNyArNTgsNyBAQCBwcm90ZWN0ZWQ6CiAKICAgICB2b2lkIHNjcm9sbGluZ1RyZWVO b2RlRGlkU2Nyb2xsKFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlJiwgU2Nyb2xsaW5nTGF5ZXJQ b3NpdGlvbkFjdGlvbiA9IFNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb246OlN5bmMpIG92ZXJy aWRlOwogI2lmIFBMQVRGT1JNKE1BQykKLSAgICB2b2lkIGhhbmRsZVdoZWVsRXZlbnRQaGFzZShQ bGF0Zm9ybVdoZWVsRXZlbnRQaGFzZSkgb3ZlcnJpZGU7CisgICAgdm9pZCBoYW5kbGVXaGVlbEV2 ZW50UGhhc2UoU2Nyb2xsaW5nTm9kZUlELCBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZSkgb3ZlcnJp ZGU7CiAgICAgdm9pZCBzZXRBY3RpdmVTY3JvbGxTbmFwSW5kaWNlcyhTY3JvbGxpbmdOb2RlSUQs IHVuc2lnbmVkIGhvcml6b250YWxJbmRleCwgdW5zaWduZWQgdmVydGljYWxJbmRleCkgb3ZlcnJp ZGU7CiAgICAgdm9pZCBzY3JvbGxpbmdUcmVlTm9kZVJlcXVlc3RzU2Nyb2xsKFNjcm9sbGluZ05v ZGVJRCwgY29uc3QgRmxvYXRQb2ludCYgLypzY3JvbGxQb3NpdGlvbiovLCBTY3JvbGxUeXBlLCBT Y3JvbGxDbGFtcGluZykgb3ZlcnJpZGU7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFj Lm1tIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGcmFt ZVNjcm9sbGluZ05vZGVNYWMubW0KaW5kZXggZGExODNjOTBmYzA1YmNlY2M3OTlhMDc1MmU4YmNm NDg0ZDAwOWEyYS4uN2ZiYjk0NDVkOGUyOTIyMDliMjllZjMxMDY4MWUyNDYyM2FhMjllNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVG cmFtZVNjcm9sbGluZ05vZGVNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvbWFjL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVNYWMubW0KQEAgLTEyNSw3ICsx MjUsNyBAQCBTY3JvbGxpbmdFdmVudFJlc3VsdCBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdO b2RlTWFjOjpoYW5kbGVXaGVlbEV2ZW50KGNvbnN0CiAgICAgaWYgKG1fZGVsZWdhdGUuYWN0aXZl U2Nyb2xsU25hcEluZGV4RGlkQ2hhbmdlKCkpCiAgICAgICAgIHNjcm9sbGluZ1RyZWUoKS5zZXRB Y3RpdmVTY3JvbGxTbmFwSW5kaWNlcyhzY3JvbGxpbmdOb2RlSUQoKSwgbV9kZWxlZ2F0ZS5hY3Rp dmVTY3JvbGxTbmFwSW5kZXhGb3JBeGlzKFNjcm9sbEV2ZW50QXhpczo6SG9yaXpvbnRhbCksIG1f ZGVsZWdhdGUuYWN0aXZlU2Nyb2xsU25hcEluZGV4Rm9yQXhpcyhTY3JvbGxFdmVudEF4aXM6OlZl cnRpY2FsKSk7CiAjZW5kaWYKLSAgICBzY3JvbGxpbmdUcmVlKCkuaGFuZGxlV2hlZWxFdmVudFBo YXNlKHdoZWVsRXZlbnQucGhhc2UoKSk7CisgICAgc2Nyb2xsaW5nVHJlZSgpLmhhbmRsZVdoZWVs RXZlbnRQaGFzZShzY3JvbGxpbmdOb2RlSUQoKSwgd2hlZWxFdmVudC5waGFzZSgpKTsKICAgICAK ICAgICByZXR1cm4gaGFuZGxlZCA/IFNjcm9sbGluZ0V2ZW50UmVzdWx0OjpEaWRIYW5kbGVFdmVu dCA6IFNjcm9sbGluZ0V2ZW50UmVzdWx0OjpEaWROb3RIYW5kbGVFdmVudDsKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlT3ZlcmZs b3dTY3JvbGxpbmdOb2RlTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFj L1Njcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVNYWMubW0KaW5kZXggZjhiMGNiZTU4 ZTVlZmRlN2QwYTlmZTBjMGUxYmJmMTgxYTI4Mzk3MC4uN2ZjYWQxMzUyN2I5Mzg5OWY1MWU5YTIz N2E4YzMwZDkwOWEwY2I2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvbWFjL1Njcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVNYWMubW0KKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9s bGluZ05vZGVNYWMubW0KQEAgLTc3LDE0ICs3NywxMSBAQCBTY3JvbGxpbmdFdmVudFJlc3VsdCBT Y3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlTWFjOjpoYW5kbGVXaGVlbEV2ZW50KGNv bgogICAgIGlmICghY2FuU2Nyb2xsV2l0aFdoZWVsRXZlbnQod2hlZWxFdmVudCkpCiAgICAgICAg IHJldHVybiBTY3JvbGxpbmdFdmVudFJlc3VsdDo6RGlkTm90SGFuZGxlRXZlbnQ7CiAKLSAgICBt X2RlbGVnYXRlLmhhbmRsZVdoZWVsRXZlbnQod2hlZWxFdmVudCk7CisgICAgYm9vbCBoYW5kbGVk ID0gbV9kZWxlZ2F0ZS5oYW5kbGVXaGVlbEV2ZW50KHdoZWVsRXZlbnQpOwogCi0gICAgLy8gRklY TUU6IFNjcm9sbCBzbmFwCi0KLSAgICBzY3JvbGxpbmdUcmVlKCkuaGFuZGxlV2hlZWxFdmVudFBo YXNlKHdoZWVsRXZlbnQucGhhc2UoKSk7CisgICAgc2Nyb2xsaW5nVHJlZSgpLmhhbmRsZVdoZWVs RXZlbnRQaGFzZShzY3JvbGxpbmdOb2RlSUQoKSwgd2hlZWxFdmVudC5waGFzZSgpKTsKICAgICAK LSAgICAvLyBGSVhNRTogVGhpcyBuZWVkcyB0byByZXR1cm4gd2hldGhlciB0aGUgZXZlbnQgd2Fz IGhhbmRsZWQuCi0gICAgcmV0dXJuIFNjcm9sbGluZ0V2ZW50UmVzdWx0OjpEaWRIYW5kbGVFdmVu dDsKKyAgICByZXR1cm4gaGFuZGxlZCA/IFNjcm9sbGluZ0V2ZW50UmVzdWx0OjpEaWRIYW5kbGVF dmVudCA6IFNjcm9sbGluZ0V2ZW50UmVzdWx0OjpEaWROb3RIYW5kbGVFdmVudDsKIH0KIAogRmxv YXRQb2ludCBTY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlTWFjOjphZGp1c3RlZFNj cm9sbFBvc2l0aW9uKGNvbnN0IEZsb2F0UG9pbnQmIHBvc2l0aW9uLCBTY3JvbGxDbGFtcGluZyBj bGFtcCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3Jv bGxBbmltYXRvck1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmlt YXRvck1hYy5tbQppbmRleCAyOTE5NmQyNjQyZmJhYTM1ZGM5N2VlMThkZWVkZDQwZWVmNDE0NDVm Li44YTFlMDhkMTZkMmI5MWZiMWQwZjhmMWZhY2I5ZDYxM2NiOWY2ZGQ1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW0KKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tCkBAIC01OCw3ICs1 OCw3IEBAIHN0YXRpYyBOU1Njcm9sbGVySW1wICpzY3JvbGxlckltcEZvclNjcm9sbGJhcihTY3Jv bGxiYXImIHNjcm9sbGJhcikKICAgICByZXR1cm4gbmlsOwogfQogCi19Cit9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCiAKIHVzaW5nIFdlYkNvcmU6OlNjcm9sbGFibGVBcmVhOwogdXNpbmcgV2ViQ29y ZTo6U2Nyb2xsQW5pbWF0b3JNYWM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nVHJlZS5jcHAgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nVHJlZS5jcHAKaW5kZXgg YmQ3OGNkN2QwMTQ4NjBhODhhMmVjNDFhYmZmOGRhYTc3OTk3OThhMS4uZGI0YTNhODYxZjBjYjRj N2JiMTdiMzAzZTI4NWNmZDhiYTM5YmVhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZVNjcm9sbGluZ1RyZWUuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVTY3JvbGxpbmdUcmVlLmNw cApAQCAtNzQsNyArNzQsNyBAQCBTY3JvbGxpbmdFdmVudFJlc3VsdCBSZW1vdGVTY3JvbGxpbmdU cmVlOjp0cnlUb0hhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaAogfQogCiAjaWYgUExB VEZPUk0oTUFDKQotdm9pZCBSZW1vdGVTY3JvbGxpbmdUcmVlOjpoYW5kbGVXaGVlbEV2ZW50UGhh c2UoUGxhdGZvcm1XaGVlbEV2ZW50UGhhc2UgcGhhc2UpCit2b2lkIFJlbW90ZVNjcm9sbGluZ1Ry ZWU6OmhhbmRsZVdoZWVsRXZlbnRQaGFzZShTY3JvbGxpbmdOb2RlSUQsIFBsYXRmb3JtV2hlZWxF dmVudFBoYXNlKQogewogICAgIC8vIEZJWE1FOiBoYW5kIG9mZiB0byBtX3Njcm9sbGluZ0Nvb3Jk aW5hdG9yUHJveHk/CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1v dGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nVHJlZS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZVNjcm9sbGluZ1RyZWUuaAppbmRleCBjZTMxOTJlY2Uz MWM3YTRjMmVjNGU5YzFiZDA1OTA2MjYwNTVhZGYxLi41OGFmMmVlNjNiZDZmYzE2MmExMzliNGE4 OWIyYzY4ZWUyMzRmNGVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1v dGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nVHJlZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVTY3JvbGxpbmdUcmVlLmgKQEAgLTYwLDcgKzYw LDcgQEAgcHJpdmF0ZToKICAgICBleHBsaWNpdCBSZW1vdGVTY3JvbGxpbmdUcmVlKFJlbW90ZVNj cm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkmKTsKIAogI2lmIFBMQVRGT1JNKE1BQykKLSAgICB2b2lk IGhhbmRsZVdoZWVsRXZlbnRQaGFzZShXZWJDb3JlOjpQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZSkg b3ZlcnJpZGU7CisgICAgdm9pZCBoYW5kbGVXaGVlbEV2ZW50UGhhc2UoV2ViQ29yZTo6U2Nyb2xs aW5nTm9kZUlELCBXZWJDb3JlOjpQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZSkgb3ZlcnJpZGU7CiAj ZW5kaWYKIAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCg==