234369 2021-12-15 15:29:15 -0800 Move ownership of the WheelEventDeltaFilter from EventHandler to ThreadedScrollingTree 2021-12-22 15:30:18 -0800 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified NEW InRadar P2 Normal --- 1 simon.fraser simon.fraser cmarcelo ews-watchlist fred.wang jamesr luiz sam simon.fraser tonikitoo webkit-bug-importer oldest_to_newest 1824559 0 simon.fraser 2021-12-15 15:29:15 -0800 Move ownership of the WheelEventDeltaFilter from EventHandler to ThreadedScrollingTree 1824560 1 447291 simon.fraser 2021-12-15 15:30:31 -0800 Created attachment 447291 Patch 1824845 2 447291 sam 2021-12-16 12:36:56 -0800 Comment on attachment 447291 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=447291&action=review > Source/WebKit/WebProcess/WebPage/EventDispatcher.cpp:118 > +#if PLATFORM(COCOA) > + platformWheelEvent = scrollingTree->wheelEventAfterFiltering(platformWheelEvent); > +#endif Can we have all platforms implement wheelEventAfterFiltering() (or the base class) as the identity function if they don't need to do any filtering to remove this #ifdef? 1826419 3 webkit-bug-importer 2021-12-22 15:30:18 -0800 <rdar://problem/86828138> 447291 2021-12-15 15:30:31 -0800 2021-12-16 12:36:56 -0800 Patch bug-234369-20211215153030.patch text/plain 10732 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MDgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2ExNDMxODdlOTcwODA5 MTJiYjBkNGI0NzZhM2VmODRmZmMwMmU1Ni4uNDgyNTAwZmJmM2E2ZDQ0NjBhMWNjN2ViNzJlYTdh ZTdkNTlmNWFiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTEyLTE1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgb3duZXJz aGlwIG9mIHRoZSBXaGVlbEV2ZW50RGVsdGFGaWx0ZXIgZnJvbSBFdmVudEhhbmRsZXIgdG8gVGhy ZWFkZWRTY3JvbGxpbmdUcmVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMzQzNjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBJbiBhIGZ1dHVyZSBwYXRjaCwgY29kZSBjbG9zZXIgdG8gdGhlIHNjcm9sbGlu ZyB0cmVlIHdpbGwgbmVlZCB0byBiZSBhYmxlIHRvIHF1ZXJ5CisgICAgICAgIHRoZSBkZWx0YSBm aWx0ZXIuCisKKyAgICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6IFdo ZWVsRXZlbnREZWx0YUZpbHRlci5oIG5vIGxvbmdlciBuZWVkcyB0byBiZSBQcml2YXRlLgorICAg ICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpUaHJlYWRlZFNjcm9sbGluZ1RyZWU6OlRocmVhZGVkU2Nyb2xsaW5nVHJlZSk6 CisgICAgICAgIChXZWJDb3JlOjpUaHJlYWRlZFNjcm9sbGluZ1RyZWU6OndoZWVsRXZlbnRBZnRl ckZpbHRlcmluZyk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvVGhyZWFkZWRTY3JvbGxpbmdU cmVlLmg6CisKIDIwMjEtMTItMTUgIFlvc2hpYWtpIEppdHN1a2F3YSAgPHlvc2hpYWtpLmppdHN1 a2F3YUBzb255LmNvbT4KIAogICAgICAgICBKUEVHIFhMIGRlY29kZXIgc2hvdWxkIHN1cHBvcnQg dW5kZXJzdGFuZCBjb2xvciBwcm9maWxlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAzYWNhMGM4ZjBmY2I3MGI2YzBh YTdiMjVmOTkwYmI3NjVjOTU1MThhLi4wNjY3MjMzYzI4NGUxZWE0ZDQ0ZThiOTU3Mzc5NjA0Zjdi NjY0NjgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTEyLTE1ICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgb3duZXJzaGlwIG9m IHRoZSBXaGVlbEV2ZW50RGVsdGFGaWx0ZXIgZnJvbSBFdmVudEhhbmRsZXIgdG8gVGhyZWFkZWRT Y3JvbGxpbmdUcmVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzQzNjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBJbiBhIGZ1dHVyZSBwYXRjaCwgY29kZSBjbG9zZXIgdG8gdGhlIHNjcm9sbGluZyB0cmVl IHdpbGwgbmVlZCB0byBiZSBhYmxlIHRvIHF1ZXJ5CisgICAgICAgIHRoZSBkZWx0YSBmaWx0ZXIu CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRXZlbnREaXNwYXRjaGVyLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6RXZlbnREaXNwYXRjaGVyOjpFdmVudERpc3BhdGNoZXIpOgorICAgICAg ICAoV2ViS2l0OjpFdmVudERpc3BhdGNoZXI6OmludGVybmFsV2hlZWxFdmVudCk6CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQYWdlL0V2ZW50RGlzcGF0Y2hlci5oOgorCiAyMDIxLTEyLTE1ICBZ b3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdGVBdWRpb01l ZGlhU3RyZWFtVHJhY2tSZW5kZXJlckludGVybmFsVW5pdE1hbmFnZXI6OlVuaXQgc2hvdWxkIG9u bHkgcmVzZXQgb25jZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJv amVjdC5wYnhwcm9qCmluZGV4IGQ2NmE2ZDFjY2VkZjZlYTViMDE3NWVjNzRiNWZlNmVkMjA5NjEw YzMuLmEzZDAwMDRiMWM5MDIzZGEwMzNjNjhmYmY1ZGNkOGE0YTAzNTE5ZDMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9T b3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTkxMCw3 ICs5MTAsNyBAQAogCQkyRUE3NjgwNDBGRTcxMjY0MDBBQjlDOEEgLyogV29ya2VyU2NyaXB0TG9h ZGVyQ2xpZW50LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSAyRUE3NjgwMzBGRTcxMjY0MDBBQjlDOEEgLyogV29ya2VyU2NyaXB0TG9hZGVyQ2xpZW50Lmgg Ki87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJMkVCNEJD RDMxMjFGMDNFMzAwRUM0ODg1IC8qIEJsb2JSZXNvdXJjZUhhbmRsZS5oIGluIEhlYWRlcnMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMkVCNEJDRDExMjFGMDNFMzAwRUM0ODg1 IC8qIEJsb2JSZXNvdXJjZUhhbmRsZS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFBy aXZhdGUsICk7IH07IH07CiAJCTJFQjc2NzU3MURBMTlCREYwMDNFMjNCNSAvKiBJbnB1dEV2ZW50 LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyRUI3Njc1 NDFEQTE5QjY3MDAzRTIzQjUgLyogSW5wdXRFdmVudC5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJV VEVTID0gKFByaXZhdGUsICk7IH07IH07Ci0JCTJFQkJDM0Q4MUI2NTk4ODMwMEY1MjUzRCAvKiBX aGVlbEV2ZW50RGVsdGFGaWx0ZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDJFQkJDM0Q3MUI2NTk4ODMwMEY1MjUzRCAvKiBXaGVlbEV2ZW50RGVsdGFG aWx0ZXIuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9Owor CQkyRUJCQzNEODFCNjU5ODgzMDBGNTI1M0QgLyogV2hlZWxFdmVudERlbHRhRmlsdGVyLmggaW4g SGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyRUJCQzNENzFCNjU5 ODgzMDBGNTI1M0QgLyogV2hlZWxFdmVudERlbHRhRmlsdGVyLmggKi87IH07CiAJCTJFQ0RCQUQx MjFEODkwMzQwMEYwMEVDRCAvKiBVbmRvTWFuYWdlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMkVDREJBQ0UyMUQ4OTAzNDAwRjAwRUNEIC8qIFVuZG9N YW5hZ2VyLmggKi87IH07CiAJCTJFQ0RCQUQ4MjFEODkwNjMwMEYwMEVDRCAvKiBVbmRvSXRlbS5o IGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMkVDREJBRDUy MUQ4OTA2MzAwRjAwRUNEIC8qIFVuZG9JdGVtLmggKi87IH07CiAJCTJFQ0Y3QUREMTAxNjJCMzgw MDQyN0RFNyAvKiBKU0Vycm9yRXZlbnQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDJFQ0Y3QURCMTAxNjJCMzgwMDQyN0RFNyAvKiBKU0Vycm9yRXZlbnQu aCAqLzsgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1RocmVh ZGVkU2Nyb2xsaW5nVHJlZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9UaHJl YWRlZFNjcm9sbGluZ1RyZWUuY3BwCmluZGV4IDVjOGU2YjY1YjQ0YTM3NjRlZGVlOGVmYjljOTM4 OGZlYzcwNzIxNzAuLmEyNjExNmFmZDhhODk2MjVkMzI2MzEyYTgxMmI1N2EyN2I3Y2UyNzcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1RocmVhZGVkU2Nyb2xsaW5n VHJlZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvVGhyZWFkZWRTY3Jv bGxpbmdUcmVlLmNwcApAQCAtMzcsNiArMzcsNyBAQAogI2luY2x1ZGUgIlNjcm9sbGluZ1RyZWVO b2RlLmgiCiAjaW5jbHVkZSAiU2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsUHJveHlOb2RlLmgi CiAjaW5jbHVkZSAiU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuaCIKKyNpbmNsdWRlICJXaGVl bEV2ZW50RGVsdGFGaWx0ZXIuaCIKICNpbmNsdWRlIDx3dGYvUnVuTG9vcC5oPgogI2luY2x1ZGUg PHd0Zi9TZXRGb3JTY29wZS5oPgogI2luY2x1ZGUgPHd0Zi9TeXN0ZW1UcmFjaW5nLmg+CkBAIC00 Nyw2ICs0OCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogVGhyZWFkZWRTY3JvbGxpbmdUcmVl OjpUaHJlYWRlZFNjcm9sbGluZ1RyZWUoQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvciYgc2Nyb2xs aW5nQ29vcmRpbmF0b3IpCiAgICAgOiBtX3Njcm9sbGluZ0Nvb3JkaW5hdG9yKCZzY3JvbGxpbmdD b29yZGluYXRvcikKKyAgICAsIG1fd2hlZWxFdmVudERlbHRhRmlsdGVyKFdoZWVsRXZlbnREZWx0 YUZpbHRlcjo6Y3JlYXRlKCkpCiAgICAgLCBtX3Njcm9sbEFuaW1hdG9yRW5hYmxlZChzY3JvbGxp bmdDb29yZGluYXRvci5zY3JvbGxBbmltYXRvckVuYWJsZWQoKSkKIHsKIH0KQEAgLTU3LDYgKzU5 LDIwIEBAIFRocmVhZGVkU2Nyb2xsaW5nVHJlZTo6flRocmVhZGVkU2Nyb2xsaW5nVHJlZSgpCiAg ICAgQVNTRVJUKCFtX3Njcm9sbGluZ0Nvb3JkaW5hdG9yKTsKIH0KIAorUGxhdGZvcm1XaGVlbEV2 ZW50IFRocmVhZGVkU2Nyb2xsaW5nVHJlZTo6d2hlZWxFdmVudEFmdGVyRmlsdGVyaW5nKGNvbnN0 IFBsYXRmb3JtV2hlZWxFdmVudCYgd2hlZWxFdmVudCkKK3sKKyAgICBMb2NrZXIgbG9ja2VyIHsg bV93aGVlbEV2ZW50RGVsdGFGaWx0ZXJMb2NrIH07CisKKyAgICBtX3doZWVsRXZlbnREZWx0YUZp bHRlci0+dXBkYXRlRnJvbUV2ZW50KHdoZWVsRXZlbnQpOworICAgIGlmIChXaGVlbEV2ZW50RGVs dGFGaWx0ZXI6OnNob3VsZEFwcGx5RmlsdGVyaW5nRm9yRXZlbnQod2hlZWxFdmVudCkpCisgICAg ICAgIHJldHVybiBtX3doZWVsRXZlbnREZWx0YUZpbHRlci0+ZXZlbnRDb3B5V2l0aEZpbHRlcmVk RGVsdGFzKHdoZWVsRXZlbnQpOworCisgICAgaWYgKFdoZWVsRXZlbnREZWx0YUZpbHRlcjo6c2hv dWxkSW5jbHVkZVZlbG9jaXR5Rm9yRXZlbnQod2hlZWxFdmVudCkpCisgICAgICAgIHJldHVybiBt X3doZWVsRXZlbnREZWx0YUZpbHRlci0+ZXZlbnRDb3B5V2l0aFZlbG9jaXR5KHdoZWVsRXZlbnQp OworCisgICAgcmV0dXJuIHdoZWVsRXZlbnQ7Cit9CisKIFdoZWVsRXZlbnRIYW5kbGluZ1Jlc3Vs dCBUaHJlYWRlZFNjcm9sbGluZ1RyZWU6OmhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1X aGVlbEV2ZW50JiB3aGVlbEV2ZW50LCBPcHRpb25TZXQ8V2hlZWxFdmVudFByb2Nlc3NpbmdTdGVw cz4gcHJvY2Vzc2luZ1N0ZXBzKQogewogICAgIEFTU0VSVChTY3JvbGxpbmdUaHJlYWQ6OmlzQ3Vy cmVudFRocmVhZCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L1RocmVhZGVkU2Nyb2xsaW5nVHJlZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv VGhyZWFkZWRTY3JvbGxpbmdUcmVlLmgKaW5kZXggMmNhZWJlZGNjODRiMDZmMjI5YjNlNDBlMTJl OWU5MDhmNDg5MWYyNC4uZWFmZjU2ZGI5Mzc3ZDUzOTU5OTA5OTZlZjljOTkzYTU0MDgwZjYyZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvVGhyZWFkZWRTY3JvbGxp bmdUcmVlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvVGhyZWFkZWRTY3Jv bGxpbmdUcmVlLmgKQEAgLTM3LDYgKzM3LDcgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xh c3MgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjsKK2NsYXNzIFdoZWVsRXZlbnREZWx0YUZpbHRl cjsKIAogLy8gVGhlIFRocmVhZGVkU2Nyb2xsaW5nVHJlZSBjbGFzcyBsaXZlcyBhbG1vc3QgZXhj bHVzaXZlbHkgb24gdGhlIHNjcm9sbGluZyB0aHJlYWQgYW5kIG1hbmFnZXMgdGhlCiAvLyBoaWVy YXJjaHkgb2Ygc2Nyb2xsYWJsZSByZWdpb25zIG9uIHRoZSBwYWdlLiBJdCdzIGFsc28gcmVzcG9u c2libGUgZm9yIGRpc3BhdGNoaW5nIGV2ZW50cwpAQCAtNDYsNiArNDcsOCBAQCBjbGFzcyBUaHJl YWRlZFNjcm9sbGluZ1RyZWUgOiBwdWJsaWMgU2Nyb2xsaW5nVHJlZSB7CiBwdWJsaWM6CiAgICAg dmlydHVhbCB+VGhyZWFkZWRTY3JvbGxpbmdUcmVlKCk7CiAKKyAgICBXRUJDT1JFX0VYUE9SVCBQ bGF0Zm9ybVdoZWVsRXZlbnQgd2hlZWxFdmVudEFmdGVyRmlsdGVyaW5nKGNvbnN0IFBsYXRmb3Jt V2hlZWxFdmVudCYpOworCiAgICAgV2hlZWxFdmVudEhhbmRsaW5nUmVzdWx0IGhhbmRsZVdoZWVs RXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiwgT3B0aW9uU2V0PFdoZWVsRXZlbnRQcm9j ZXNzaW5nU3RlcHM+KSBvdmVycmlkZTsKIAogICAgIGJvb2wgaGFuZGxlV2hlZWxFdmVudEFmdGVy TWFpblRocmVhZChjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmLCBTY3JvbGxpbmdOb2RlSUQsIHN0 ZDo6b3B0aW9uYWw8V2hlZWxTY3JvbGxHZXN0dXJlU3RhdGU+KTsKQEAgLTEzNCw2ICsxMzcsOSBA QCBwcml2YXRlOgogICAgIC8vIER5bmFtaWNhbGx5IGFsbG9jYXRlZCBiZWNhdXNlIGl0IGhhcyB0 byB1c2UgdGhlIFNjcm9sbGluZ1RocmVhZCdzIHJ1bmxvb3AuCiAgICAgc3RkOjp1bmlxdWVfcHRy PFJ1bkxvb3A6OlRpbWVyPFRocmVhZGVkU2Nyb2xsaW5nVHJlZT4+IG1fZGVsYXllZFJlbmRlcmlu Z1VwZGF0ZURldGVjdGlvblRpbWVyIFdURl9HVUFSREVEX0JZX0xPQ0sobV90cmVlTG9jayk7CiAK KyAgICBMb2NrIG1fd2hlZWxFdmVudERlbHRhRmlsdGVyTG9jazsKKyAgICBzdGQ6OnVuaXF1ZV9w dHI8V2hlZWxFdmVudERlbHRhRmlsdGVyPiBtX3doZWVsRXZlbnREZWx0YUZpbHRlciBXVEZfR1VB UkRFRF9CWV9MT0NLKG1fd2hlZWxFdmVudERlbHRhRmlsdGVyTG9jayk7CisKICAgICBIYXNoTWFw PFNjcm9sbGluZ05vZGVJRCwgUmVxdWVzdGVkU2Nyb2xsRGF0YT4gbV9ub2Rlc1dpdGhQZW5kaW5n U2Nyb2xsQW5pbWF0aW9ucyBXVEZfR1VBUkRFRF9CWV9MT0NLKG1fdHJlZUxvY2spOwogICAgIGNv bnN0IGJvb2wgbV9zY3JvbGxBbmltYXRvckVuYWJsZWQgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9o YXNOb2Rlc1dpdGhTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMgV1RGX0dVQVJERURfQllfTE9D SyhtX3RyZWVMb2NrKSB7IGZhbHNlIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9FdmVudERpc3BhdGNoZXIuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvRXZlbnREaXNwYXRjaGVyLmNwcAppbmRleCAyOTkxOGUzZjUwMzBhMDY2NmQ3 ZjI0NGEwNDFlYjM3YmU0Y2ZmOTA0Li5hZDNjZjg1ZDU1NDlmZDM3N2U3N2E0YjBjNzE2OTA2MDRi MDBhNWU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9FdmVu dERpc3BhdGNoZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0V2 ZW50RGlzcGF0Y2hlci5jcHAKQEAgLTYzLDcgKzYzLDYgQEAgUmVmPEV2ZW50RGlzcGF0Y2hlcj4g RXZlbnREaXNwYXRjaGVyOjpjcmVhdGUoKQogCiBFdmVudERpc3BhdGNoZXI6OkV2ZW50RGlzcGF0 Y2hlcigpCiAgICAgOiBtX3F1ZXVlKFdvcmtRdWV1ZTo6Y3JlYXRlKCJjb20uYXBwbGUuV2ViS2l0 LkV2ZW50RGlzcGF0Y2hlciIsIFdvcmtRdWV1ZTo6UU9TOjpVc2VySW50ZXJhY3RpdmUpKQotICAg ICwgbV9yZWNlbnRXaGVlbEV2ZW50RGVsdGFGaWx0ZXIoV2hlZWxFdmVudERlbHRhRmlsdGVyOjpj cmVhdGUoKSkKICNpZiBFTkFCTEUoTU9NRU5UVU1fRVZFTlRfRElTUEFUQ0hFUikKICAgICAsIG1f bW9tZW50dW1FdmVudERpc3BhdGNoZXIoV1RGOjptYWtlVW5pcXVlPE1vbWVudHVtRXZlbnREaXNw YXRjaGVyPigqdGhpcykpCiAjZW5kaWYKQEAgLTEwNiwyMiArMTA1LDE4IEBAIHZvaWQgRXZlbnRE aXNwYXRjaGVyOjppbnRlcm5hbFdoZWVsRXZlbnQoUGFnZUlkZW50aWZpZXIgcGFnZUlELCBjb25z dCBXZWJXaGVlbEV2CiAgICAgYXV0byBwcm9jZXNzaW5nU3RlcHMgPSBPcHRpb25TZXQ8V2ViQ29y ZTo6V2hlZWxFdmVudFByb2Nlc3NpbmdTdGVwcz4geyBXaGVlbEV2ZW50UHJvY2Vzc2luZ1N0ZXBz OjpNYWluVGhyZWFkRm9yU2Nyb2xsaW5nLCBXaGVlbEV2ZW50UHJvY2Vzc2luZ1N0ZXBzOjpNYWlu VGhyZWFkRm9yQmxvY2tpbmdET01FdmVudERpc3BhdGNoIH07CiAjaWYgRU5BQkxFKFNDUk9MTElO R19USFJFQUQpCiAgICAgZG8gewotICAgICAgICBhdXRvIHBsYXRmb3JtV2hlZWxFdmVudCA9IHBs YXRmb3JtKHdoZWVsRXZlbnQpOwotI2lmIFBMQVRGT1JNKENPQ09BKQotICAgICAgICBtX3JlY2Vu dFdoZWVsRXZlbnREZWx0YUZpbHRlci0+dXBkYXRlRnJvbUV2ZW50KHBsYXRmb3JtV2hlZWxFdmVu dCk7Ci0gICAgICAgIGlmIChXaGVlbEV2ZW50RGVsdGFGaWx0ZXI6OnNob3VsZEFwcGx5RmlsdGVy aW5nRm9yRXZlbnQocGxhdGZvcm1XaGVlbEV2ZW50KSkKLSAgICAgICAgICAgIHBsYXRmb3JtV2hl ZWxFdmVudCA9IG1fcmVjZW50V2hlZWxFdmVudERlbHRhRmlsdGVyLT5ldmVudENvcHlXaXRoRmls dGVyZWREZWx0YXMocGxhdGZvcm1XaGVlbEV2ZW50KTsKLSAgICAgICAgZWxzZSBpZiAoV2hlZWxF dmVudERlbHRhRmlsdGVyOjpzaG91bGRJbmNsdWRlVmVsb2NpdHlGb3JFdmVudChwbGF0Zm9ybVdo ZWVsRXZlbnQpKQotICAgICAgICAgICAgcGxhdGZvcm1XaGVlbEV2ZW50ID0gbV9yZWNlbnRXaGVl bEV2ZW50RGVsdGFGaWx0ZXItPmV2ZW50Q29weVdpdGhWZWxvY2l0eShwbGF0Zm9ybVdoZWVsRXZl bnQpOwotI2VuZGlmCi0KICAgICAgICAgTG9ja2VyIGxvY2tlciB7IG1fc2Nyb2xsaW5nVHJlZXNM b2NrIH07CiAgICAgICAgIGF1dG8gc2Nyb2xsaW5nVHJlZSA9IG1fc2Nyb2xsaW5nVHJlZXMuZ2V0 KHBhZ2VJRCk7CiAgICAgICAgIGlmICghc2Nyb2xsaW5nVHJlZSkgewogICAgICAgICAgICAgZGlz cGF0Y2hXaGVlbEV2ZW50VmlhTWFpblRocmVhZChwYWdlSUQsIHdoZWVsRXZlbnQsIHByb2Nlc3Np bmdTdGVwcywgd2hlZWxFdmVudE9yaWdpbik7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg fQotICAgICAgICAKKworICAgICAgICBhdXRvIHBsYXRmb3JtV2hlZWxFdmVudCA9IHBsYXRmb3Jt KHdoZWVsRXZlbnQpOworI2lmIFBMQVRGT1JNKENPQ09BKQorICAgICAgICBwbGF0Zm9ybVdoZWVs RXZlbnQgPSBzY3JvbGxpbmdUcmVlLT53aGVlbEV2ZW50QWZ0ZXJGaWx0ZXJpbmcocGxhdGZvcm1X aGVlbEV2ZW50KTsKKyNlbmRpZgorCiAgICAgICAgIC8vIEZJWE1FOiBJdCdzIHByZXR0eSBob3Jy aWJsZSB0aGF0IHdlJ3JlIHVwZGF0aW5nIHRoZSBiYWNrL2ZvcndhcmQgc3RhdGUgaGVyZS4KICAg ICAgICAgLy8gV2ViQ29yZSBzaG91bGQgYWx3YXlzIGtub3cgdGhlIGN1cnJlbnQgc3RhdGUgYW5k IGtub3cgd2hlbiBpdCBjaGFuZ2VzIHNvIHRoZQogICAgICAgICAvLyBzY3JvbGxpbmcgdHJlZSBj YW4gYmUgbm90aWZpZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9FdmVudERpc3BhdGNoZXIuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl L0V2ZW50RGlzcGF0Y2hlci5oCmluZGV4IGUzN2EyNDdkZDM0MmUyYzBkZTJlNzhlNjk0Nzk2YzJm Y2Y0N2MzYTguLmEyZmRlNmZlMWNkZWI4ZDcwMzU1YzQ1NTQzMTkwZGZhZjAwOWExMjMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0V2ZW50RGlzcGF0Y2hlci5o CisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0V2ZW50RGlzcGF0Y2hlci5o CkBAIC0zMCw3ICszMCw2IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9QYWdlSWRlbnRpZmllci5oPgog I2luY2x1ZGUgPFdlYkNvcmUvUGxhdGZvcm1XaGVlbEV2ZW50Lmg+CiAjaW5jbHVkZSA8V2ViQ29y ZS9SZWN0RWRnZXMuaD4KLSNpbmNsdWRlIDxXZWJDb3JlL1doZWVsRXZlbnREZWx0YUZpbHRlci5o PgogI2luY2x1ZGUgPG1lbW9yeT4KICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUg PHd0Zi9Mb2NrLmg+CkBAIC0xMzMsNyArMTMyLDYgQEAgcHJpdmF0ZToKICAgICBMb2NrIG1fc2Ny b2xsaW5nVHJlZXNMb2NrOwogICAgIEhhc2hNYXA8V2ViQ29yZTo6UGFnZUlkZW50aWZpZXIsIFJl ZlB0cjxXZWJDb3JlOjpUaHJlYWRlZFNjcm9sbGluZ1RyZWU+PiBtX3Njcm9sbGluZ1RyZWVzIFdU Rl9HVUFSREVEX0JZX0xPQ0sobV9zY3JvbGxpbmdUcmVlc0xvY2spOwogI2VuZGlmCi0gICAgc3Rk Ojp1bmlxdWVfcHRyPFdlYkNvcmU6OldoZWVsRXZlbnREZWx0YUZpbHRlcj4gbV9yZWNlbnRXaGVl bEV2ZW50RGVsdGFGaWx0ZXI7CiAjaWYgRU5BQkxFKElPU19UT1VDSF9FVkVOVFMpCiAgICAgTG9j ayBtX3RvdWNoRXZlbnRzTG9jazsKICAgICBIYXNoTWFwPFdlYkNvcmU6OlBhZ2VJZGVudGlmaWVy LCBUb3VjaEV2ZW50UXVldWU+IG1fdG91Y2hFdmVudHMgV1RGX0dVQVJERURfQllfTE9DSyhtX3Rv dWNoRXZlbnRzTG9jayk7Cg==