213791 2020-06-30 06:37:44 -0700 [GTK4] Support kinetic scrolling 2020-07-03 01:38:02 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 alicem webkit-unassigned berto bugs-noreply cgarcia ews-watchlist gustavo oldest_to_newest 1667548 0 alicem 2020-06-30 06:37:44 -0700 See the patch. 1667551 1 403194 alicem 2020-06-30 06:42:06 -0700 Created attachment 403194 Patch 1667552 2 alicem 2020-06-30 06:42:55 -0700 There's a bug where the velocity is calculated incorrectly. That's https://bugs.webkit.org/show_bug.cgi?id=213789, it happens in GTK3 as well, so a separate bug. 1667553 3 ews-watchlist 2020-06-30 06:43:03 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1668192 4 403194 cgarcia 2020-07-02 02:15:02 -0700 Comment on attachment 403194 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=403194&action=review Thanks! I think it would be easier to refactor the WebEventFactory create functions. > Source/WebKit/Shared/NativeWebWheelEvent.h:64 > NativeWebWheelEvent(GdkEvent*, const WebCore::IntPoint&, const WebCore::FloatSize& wheelTicks); > + NativeWebWheelEvent(GdkEvent*, const WebCore::IntPoint&, const WebCore::FloatSize& wheelTicks, WebWheelEvent::Phase, WebWheelEvent::Phase momentumPhase); I think this new one makes the previous one unused, so better to modify the existing one if needed. > Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp:1278 > + WebWheelEvent::Phase phase = gdk_event_is_scroll_stop_event(event) ? > + WebWheelEvent::Phase::PhaseEnded : > + WebWheelEvent::Phase::PhaseChanged; So, in the end we are passing a fixed momentum phase and phase value that depends on event, so this could be done in WebEventFactory.cpp instead if the parameters currently passed. 1668216 5 alicem 2020-07-02 05:07:30 -0700 Sure, makes sense. 1668240 6 403366 alicem 2020-07-02 07:33:16 -0700 Created attachment 403366 Patch 1668514 7 ews-feeder 2020-07-03 01:38:01 -0700 Committed r263887: <https://trac.webkit.org/changeset/263887> All reviewed patches have been landed. Closing bug and clearing flags on attachment 403366. 403194 2020-06-30 06:42:06 -0700 2020-07-02 07:33:10 -0700 Patch bug-213791-20200630184205.patch text/plain 5510 alicem U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNjUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJkYmFlZTI2OTQ0NzRhZTVh MTc2OWJjZjljMjY4ZDc2MTI0ZmM0MjguLjg5ZDZhM2MwYWNiNDdhYWMwOGU4NjVkMWVkZDQyNjE2 MTkxYzhjMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjAtMDYtMzAgIEFsZXhhbmRl ciBNaWtoYXlsZW5rbyAgPGFsZXhtQGdub21lLm9yZz4KKworICAgICAgICBbR1RLNF0gU3VwcG9y dCBraW5ldGljIHNjcm9sbGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjEzNzkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgR3RrRXZlbnRDb250cm9sbGVyU2Nyb2xsIHNraXBzIHRoZSBsYXN0IGV2ZW50 IGFuZCBleHBvc2VzIGl0IGluIGEgc2VwYXJhdGUgc2lnbmFsLgorICAgICAgICBOb3JtYWxseSBv bmUgd291bGQgYWRkIHRoZSBLSU5FVElDIGZsYWcgYW5kIGxpc3RlbiB0byBkZWNlbGVyYXRlIHNp Z25hbCwgYnV0IHNpbmNlCisgICAgICAgIFdlYktpdCBhbHJlYWR5IGhhcyBjb2RlIGZvciBjYWxj dWxhdGluZyB0aGUgdmVsb2NpdHkgZm9yIEdUSzMsIGp1c3QgdXNlIHRoZSBzYW1lCisgICAgICAg IGNvZGUgcGF0aCBhcyBzY3JvbGwgc2lnbmFsIGhhbmRsZXIsIGJ1dCB3aXRoIGRpZmZlcmVudCBw aGFzZS4KKworICAgICAgICAqIFNoYXJlZC9OYXRpdmVXZWJXaGVlbEV2ZW50Lmg6IEFkZCBhIGNv bnN0cnVjdG9yIGFsbG93aW5nIHRvIHNldCBwaGFzZSBhbmQgbW9tZW50dW0gcGhhc2UKKyAgICAg ICAgKiBTaGFyZWQvZ3RrL05hdGl2ZVdlYldoZWVsRXZlbnRHdGsuY3BwOgorICAgICAgICAoV2Vi S2l0OjpOYXRpdmVXZWJXaGVlbEV2ZW50OjpOYXRpdmVXZWJXaGVlbEV2ZW50KToKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHA6CisgICAgICAgICh3ZWJr aXRXZWJWaWV3QmFzZVNjcm9sbCk6CisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZVNjcm9sbEVu ZCk6CisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZUNvbnN0cnVjdGVkKToKKwogMjAyMC0wNi0y OSAgRWxsaW90ICA8Q2hlZXNlRUJvaUBtYWlsby5jb20+CiAKICAgICAgICAgW0dUS10gRGFyayBt b2RlIGZvciBHVEsgdGhlbWVzIHRoYXQgZW5kIHdpdGggLURhcmsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvU2hhcmVkL05hdGl2ZVdlYldoZWVsRXZlbnQuaCBiL1NvdXJjZS9XZWJLaXQvU2hh cmVkL05hdGl2ZVdlYldoZWVsRXZlbnQuaAppbmRleCA4NGRiMDgzY2VmZTdkMTY2YjI2ZjE1MTYy MGQwOTYwNDdkNjk3MmNlLi43ZTkwZDJhZGEwMzgwNjg4NWE2ZWNiNmZhYzVmZGU2MTUzNGJkMWU5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9OYXRpdmVXZWJXaGVlbEV2ZW50LmgK KysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvTmF0aXZlV2ViV2hlZWxFdmVudC5oCkBAIC02MSw2 ICs2MSw3IEBAIHB1YmxpYzoKICAgICBOYXRpdmVXZWJXaGVlbEV2ZW50KEdka0V2ZW50Kik7CiAg ICAgTmF0aXZlV2ViV2hlZWxFdmVudChHZGtFdmVudCosIFdlYldoZWVsRXZlbnQ6OlBoYXNlLCBX ZWJXaGVlbEV2ZW50OjpQaGFzZSBtb21lbnR1bVBoYXNlKTsKICAgICBOYXRpdmVXZWJXaGVlbEV2 ZW50KEdka0V2ZW50KiwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmLCBjb25zdCBXZWJDb3JlOjpG bG9hdFNpemUmIHdoZWVsVGlja3MpOworICAgIE5hdGl2ZVdlYldoZWVsRXZlbnQoR2RrRXZlbnQq LCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYsIGNvbnN0IFdlYkNvcmU6OkZsb2F0U2l6ZSYgd2hl ZWxUaWNrcywgV2ViV2hlZWxFdmVudDo6UGhhc2UsIFdlYldoZWVsRXZlbnQ6OlBoYXNlIG1vbWVu dHVtUGhhc2UpOwogICAgIE5hdGl2ZVdlYldoZWVsRXZlbnQoY29uc3QgV2ViQ29yZTo6SW50UG9p bnQmIHBvc2l0aW9uLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgZ2xvYmFsUG9zaXRpb24sIGNv bnN0IFdlYkNvcmU6OkZsb2F0U2l6ZSYgZGVsdGEsIGNvbnN0IFdlYkNvcmU6OkZsb2F0U2l6ZSYg d2hlZWxUaWNrcywgV2ViV2hlZWxFdmVudDo6UGhhc2UsIFdlYldoZWVsRXZlbnQ6OlBoYXNlIG1v bWVudHVtUGhhc2UpOwogI2VsaWYgVVNFKExJQldQRSkKICAgICBOYXRpdmVXZWJXaGVlbEV2ZW50 KHN0cnVjdCB3cGVfaW5wdXRfYXhpc19ldmVudCosIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yLCBX ZWJXaGVlbEV2ZW50OjpQaGFzZSwgV2ViV2hlZWxFdmVudDo6UGhhc2UgbW9tZW50dW1QaGFzZSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9ndGsvTmF0aXZlV2ViV2hlZWxFdmVu dEd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9ndGsvTmF0aXZlV2ViV2hlZWxFdmVudEd0 ay5jcHAKaW5kZXggOThmOWYyYjgyNzhhZDMzN2ZjMTU0YzlmYzY5ZTNhMTY4ZDYwYmY1Zi4uYzM4 NzgyZDIwNWI1NTg4YzE1ODVhOTQzZDgzM2UwOTViNDJjZmI1MyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9TaGFyZWQvZ3RrL05hdGl2ZVdlYldoZWVsRXZlbnRHdGsuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvU2hhcmVkL2d0ay9OYXRpdmVXZWJXaGVlbEV2ZW50R3RrLmNwcApAQCAtNDksNiAr NDksMTIgQEAgTmF0aXZlV2ViV2hlZWxFdmVudDo6TmF0aXZlV2ViV2hlZWxFdmVudChHZGtFdmVu dCogZXZlbnQsIGNvbnN0IFdlYkNvcmU6OkludFBvaW4KIHsKIH0KIAorTmF0aXZlV2ViV2hlZWxF dmVudDo6TmF0aXZlV2ViV2hlZWxFdmVudChHZGtFdmVudCogZXZlbnQsIGNvbnN0IFdlYkNvcmU6 OkludFBvaW50JiBwb3NpdGlvbiwgY29uc3QgV2ViQ29yZTo6RmxvYXRTaXplJiB3aGVlbFRpY2tz LCBXZWJXaGVlbEV2ZW50OjpQaGFzZSBwaGFzZSwgV2ViV2hlZWxFdmVudDo6UGhhc2UgbW9tZW50 dW1QaGFzZSkKKyAgICA6IFdlYldoZWVsRXZlbnQoV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJX aGVlbEV2ZW50KGV2ZW50LCBwb3NpdGlvbiwgcG9zaXRpb24sIHdoZWVsVGlja3MsIHBoYXNlLCBt b21lbnR1bVBoYXNlKSkKKyAgICAsIG1fbmF0aXZlRXZlbnQoZ2RrX2V2ZW50X2NvcHkoZXZlbnQp KQoreworfQorCiBOYXRpdmVXZWJXaGVlbEV2ZW50OjpOYXRpdmVXZWJXaGVlbEV2ZW50KGNvbnN0 IFdlYkNvcmU6OkludFBvaW50JiBwb3NpdGlvbiwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIGds b2JhbFBvc2l0aW9uLCBjb25zdCBXZWJDb3JlOjpGbG9hdFNpemUmIGRlbHRhLCBjb25zdCBXZWJD b3JlOjpGbG9hdFNpemUmIHdoZWVsVGlja3MsIFdlYldoZWVsRXZlbnQ6OlBoYXNlIHBoYXNlLCBX ZWJXaGVlbEV2ZW50OjpQaGFzZSBtb21lbnR1bVBoYXNlKQogICAgIDogV2ViV2hlZWxFdmVudChX ZWJFdmVudDo6V2hlZWwsIHBvc2l0aW9uLCBnbG9iYWxQb3NpdGlvbiwgZGVsdGEsIHdoZWVsVGlj a3MsIHBoYXNlLCBtb21lbnR1bVBoYXNlLCBXZWJXaGVlbEV2ZW50OjpTY3JvbGxCeVBpeGVsV2hl ZWxFdmVudCwgeyB9LCBXYWxsVGltZTo6bm93KCkpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcCBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwCmluZGV4IDJhMWE0ODM4 OTA2MzViY2IyZGQ1NWNiMjk4MjYxOTZlNDJmNTVhMTYuLmY2YTY4YjEyMjM5NjRmZTZiMWYyMDQx NTAzYjQ4NTU0YjAxMGUyODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwCkBAIC0xMjczLDEwICsxMjczLDE5IEBAIHN0 YXRpYyBnYm9vbGVhbiB3ZWJraXRXZWJWaWV3QmFzZVNjcm9sbChXZWJLaXRXZWJWaWV3QmFzZSog d2ViVmlld0Jhc2UsIGRvdWJsZSBkCiAgICAgaWYgKGdka19ldmVudF9nZXRfbW9kaWZpZXJfc3Rh dGUoZXZlbnQpICYgR0RLX1NISUZUX01BU0spCiAgICAgICAgIHN0ZDo6c3dhcChkZWx0YVgsIGRl bHRhWSk7CiAKLSAgICBwcml2LT5wYWdlUHJveHktPmhhbmRsZVdoZWVsRXZlbnQoTmF0aXZlV2Vi V2hlZWxFdmVudChldmVudCwgcHJpdi0+bGFzdE1vdGlvbkV2ZW50ID8gSW50UG9pbnQocHJpdi0+ bGFzdE1vdGlvbkV2ZW50LT5wb3NpdGlvbikgOiBJbnRQb2ludCgpLCBGbG9hdFNpemUoLWRlbHRh WCwgLWRlbHRhWSkpKTsKKyAgICBXZWJXaGVlbEV2ZW50OjpQaGFzZSBwaGFzZSA9IGdka19ldmVu dF9pc19zY3JvbGxfc3RvcF9ldmVudChldmVudCkgPworICAgICAgICBXZWJXaGVlbEV2ZW50OjpQ aGFzZTo6UGhhc2VFbmRlZCA6CisgICAgICAgIFdlYldoZWVsRXZlbnQ6OlBoYXNlOjpQaGFzZUNo YW5nZWQ7CisKKyAgICBwcml2LT5wYWdlUHJveHktPmhhbmRsZVdoZWVsRXZlbnQoTmF0aXZlV2Vi V2hlZWxFdmVudChldmVudCwgcHJpdi0+bGFzdE1vdGlvbkV2ZW50ID8gSW50UG9pbnQocHJpdi0+ bGFzdE1vdGlvbkV2ZW50LT5wb3NpdGlvbikgOiBJbnRQb2ludCgpLCBGbG9hdFNpemUoLWRlbHRh WCwgLWRlbHRhWSksIHBoYXNlLCBXZWJXaGVlbEV2ZW50OjpQaGFzZTo6UGhhc2VOb25lKSk7CiAK ICAgICByZXR1cm4gR0RLX0VWRU5UX1NUT1A7CiB9CisKK3N0YXRpYyB2b2lkIHdlYmtpdFdlYlZp ZXdCYXNlU2Nyb2xsRW5kKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3QmFzZSwgR3RrRXZlbnRD b250cm9sbGVyKiBjb250cm9sbGVyKQoreworICAgIHdlYmtpdFdlYlZpZXdCYXNlU2Nyb2xsKHdl YlZpZXdCYXNlLCAwLCAwLCBjb250cm9sbGVyKTsKK30KICNlbmRpZgogCiAjaWYgIVVTRShHVEs0 KQpAQCAtMTkxNiw2ICsxOTI1LDcgQEAgc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VDb25z dHJ1Y3RlZChHT2JqZWN0KiBvYmplY3QpCiAjaWYgVVNFKEdUSzQpCiAgICAgYXV0byogY29udHJv bGxlciA9IGd0a19ldmVudF9jb250cm9sbGVyX3Njcm9sbF9uZXcoR1RLX0VWRU5UX0NPTlRST0xM RVJfU0NST0xMX0JPVEhfQVhFUyk7CiAgICAgZ19zaWduYWxfY29ubmVjdF9vYmplY3QoY29udHJv bGxlciwgInNjcm9sbCIsIEdfQ0FMTEJBQ0sod2Via2l0V2ViVmlld0Jhc2VTY3JvbGwpLCB2aWV3 V2lkZ2V0LCBHX0NPTk5FQ1RfU1dBUFBFRCk7CisgICAgZ19zaWduYWxfY29ubmVjdF9vYmplY3Qo Y29udHJvbGxlciwgInNjcm9sbC1lbmQiLCBHX0NBTExCQUNLKHdlYmtpdFdlYlZpZXdCYXNlU2Ny b2xsRW5kKSwgdmlld1dpZGdldCwgR19DT05ORUNUX1NXQVBQRUQpOwogICAgIGd0a193aWRnZXRf YWRkX2NvbnRyb2xsZXIodmlld1dpZGdldCwgY29udHJvbGxlcik7CiAKICAgICBjb250cm9sbGVy ID0gZ3RrX2V2ZW50X2NvbnRyb2xsZXJfbW90aW9uX25ldygpOwo= 403366 2020-07-02 07:33:16 -0700 2020-07-03 01:38:01 -0700 Patch bug-213791-20200702193315.patch text/plain 6027 alicem U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzODQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDYzNTllMTAxYmM5YjM1NmJl NmJjYzMxMTMwYjkxNzQwYzRjZDg1YjMuLmJhOTljNjBiMWFmNDIwMjE5MjAyOWM2N2JiZDA4Y2Iy MjgxNTNhYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjAtMDctMDIgIEFsZXhhbmRl ciBNaWtoYXlsZW5rbyAgPGFsZXhtQGdub21lLm9yZz4KKworICAgICAgICBbR1RLNF0gU3VwcG9y dCBraW5ldGljIHNjcm9sbGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjEzNzkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgR3RrRXZlbnRDb250cm9sbGVyU2Nyb2xsIHNraXBzIHRoZSBsYXN0IGV2ZW50 IGFuZCBleHBvc2VzIGl0IGluIGEgc2VwYXJhdGUgc2lnbmFsLgorICAgICAgICBOb3JtYWxseSBv bmUgd291bGQgYWRkIHRoZSBLSU5FVElDIGZsYWcgYW5kIGxpc3RlbiB0byBkZWNlbGVyYXRlIHNp Z25hbCwgYnV0IHNpbmNlCisgICAgICAgIFdlYktpdCBhbHJlYWR5IGhhcyBjb2RlIGZvciBjYWxj dWxhdGluZyB0aGUgdmVsb2NpdHkgZm9yIEdUSzMsIGp1c3QgdXNlIHRoZSBzYW1lCisgICAgICAg IGNvZGUgcGF0aCBhcyBzY3JvbGwgc2lnbmFsIGhhbmRsZXIuCisKKyAgICAgICAgKiBTaGFyZWQv Z3RrL05hdGl2ZVdlYldoZWVsRXZlbnRHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpOYXRpdmVX ZWJXaGVlbEV2ZW50OjpOYXRpdmVXZWJXaGVlbEV2ZW50KToKKyAgICAgICAgKiBTaGFyZWQvZ3Rr L1dlYkV2ZW50RmFjdG9yeS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkV2ZW50RmFjdG9yeTo6 Y3JlYXRlV2ViV2hlZWxFdmVudCk6CisgICAgICAgICogU2hhcmVkL2d0ay9XZWJFdmVudEZhY3Rv cnkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHA6 CisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZVNjcm9sbEVuZCk6CisgICAgICAgICh3ZWJraXRX ZWJWaWV3QmFzZUNvbnN0cnVjdGVkKToKKwogMjAyMC0wNy0wMSAgU2FpZCBBYm91LUhhbGxhd2Eg IDxzYWJvdWhhbGxhd2FAYXBwbGUuY29tPgogCiAgICAgICAgIE1JTUVUeXBlUmVnaXN0cnk6Omdl dEV4dGVuc2lvbnNGb3JNSU1FVHlwZSgpIG5lZWRzIHRvIGhhbmRsZSB3aWxkY2FyZCBNSU1FIHR5 cGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9ndGsvTmF0aXZlV2ViV2hlZWxF dmVudEd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9ndGsvTmF0aXZlV2ViV2hlZWxFdmVu dEd0ay5jcHAKaW5kZXggOThmOWYyYjgyNzhhZDMzN2ZjMTU0YzlmYzY5ZTNhMTY4ZDYwYmY1Zi4u NmU5NTY3YzRiOTVhYzg2NjAwNmYzNGMwZDk0MzE4YTM2MWJiMWY3ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9TaGFyZWQvZ3RrL05hdGl2ZVdlYldoZWVsRXZlbnRHdGsuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL2d0ay9OYXRpdmVXZWJXaGVlbEV2ZW50R3RrLmNwcApAQCAtNDQs NyArNDQsNyBAQCBOYXRpdmVXZWJXaGVlbEV2ZW50OjpOYXRpdmVXZWJXaGVlbEV2ZW50KEdka0V2 ZW50KiBldmVudCwgV2ViV2hlZWxFdmVudDo6UGhhc2UgcAogfQogCiBOYXRpdmVXZWJXaGVlbEV2 ZW50OjpOYXRpdmVXZWJXaGVlbEV2ZW50KEdka0V2ZW50KiBldmVudCwgY29uc3QgV2ViQ29yZTo6 SW50UG9pbnQmIHBvc2l0aW9uLCBjb25zdCBXZWJDb3JlOjpGbG9hdFNpemUmIHdoZWVsVGlja3Mp Ci0gICAgOiBXZWJXaGVlbEV2ZW50KFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViV2hlZWxFdmVu dChldmVudCwgcG9zaXRpb24sIHBvc2l0aW9uLCB3aGVlbFRpY2tzLCBXZWJXaGVlbEV2ZW50OjpQ aGFzZTo6UGhhc2VDaGFuZ2VkLCBXZWJXaGVlbEV2ZW50OjpQaGFzZTo6UGhhc2VOb25lKSkKKyAg ICA6IFdlYldoZWVsRXZlbnQoV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJXaGVlbEV2ZW50KGV2 ZW50LCBwb3NpdGlvbiwgcG9zaXRpb24sIHdoZWVsVGlja3MpKQogICAgICwgbV9uYXRpdmVFdmVu dChnZGtfZXZlbnRfY29weShldmVudCkpCiB7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1NoYXJlZC9ndGsvV2ViRXZlbnRGYWN0b3J5LmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2d0 ay9XZWJFdmVudEZhY3RvcnkuY3BwCmluZGV4IGJlZDc4NmE1MzAzMzk1MDk1ZmQ1Y2ViYjVhYjcy MTQ4N2E2NWYzOGIuLmNjOTdjMjE3YmEyZWYzOTA3ZTY5MmYwNzM5YTJmYzA2YWU4MWY5NjkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2d0ay9XZWJFdmVudEZhY3RvcnkuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2d0ay9XZWJFdmVudEZhY3RvcnkuY3BwCkBAIC0yNjUs NiArMjY1LDE0IEBAIFdlYldoZWVsRXZlbnQgV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJXaGVl bEV2ZW50KGNvbnN0IEdka0V2ZW50KiBldmVudCwgY29uc3QKICAgICByZXR1cm4gY3JlYXRlV2Vi V2hlZWxFdmVudChldmVudCwgcG9zaXRpb24sIGdsb2JhbFBvc2l0aW9uLCB3aGVlbFRpY2tzLnZh bHVlKCksIHBoYXNlLCBtb21lbnR1bVBoYXNlKTsKIH0KIAorV2ViV2hlZWxFdmVudCBXZWJFdmVu dEZhY3Rvcnk6OmNyZWF0ZVdlYldoZWVsRXZlbnQoY29uc3QgR2RrRXZlbnQqIGV2ZW50LCBjb25z dCBJbnRQb2ludCYgcG9zaXRpb24sIGNvbnN0IEludFBvaW50JiBnbG9iYWxQb3NpdGlvbiwgY29u c3QgRmxvYXRTaXplJiB3aGVlbFRpY2tzKQoreworICAgIFdlYldoZWVsRXZlbnQ6OlBoYXNlIHBo YXNlID0gZ2RrX2V2ZW50X2lzX3Njcm9sbF9zdG9wX2V2ZW50KGV2ZW50KSA/CisgICAgICAgIFdl YldoZWVsRXZlbnQ6OlBoYXNlOjpQaGFzZUVuZGVkIDoKKyAgICAgICAgV2ViV2hlZWxFdmVudDo6 UGhhc2U6OlBoYXNlQ2hhbmdlZDsKKyAgICByZXR1cm4gY3JlYXRlV2ViV2hlZWxFdmVudChldmVu dCwgcG9zaXRpb24sIGdsb2JhbFBvc2l0aW9uLCB3aGVlbFRpY2tzLCBwaGFzZSwgV2ViV2hlZWxF dmVudDo6UGhhc2U6OlBoYXNlTm9uZSk7Cit9CisKIFdlYldoZWVsRXZlbnQgV2ViRXZlbnRGYWN0 b3J5OjpjcmVhdGVXZWJXaGVlbEV2ZW50KGNvbnN0IEdka0V2ZW50KiBldmVudCwgY29uc3QgSW50 UG9pbnQmIHBvc2l0aW9uLCBjb25zdCBJbnRQb2ludCYgZ2xvYmFsUG9zaXRpb24sIGNvbnN0IEZs b2F0U2l6ZSYgd2hlZWxUaWNrcywgV2ViV2hlZWxFdmVudDo6UGhhc2UgcGhhc2UsIFdlYldoZWVs RXZlbnQ6OlBoYXNlIG1vbWVudHVtUGhhc2UpCiB7CiAgICAgLy8gRklYTUU6IFtHVEtdIEFkZCBh IHNldHRpbmcgdG8gY2hhbmdlIHRoZSBwaXhlbHMgcGVyIGxpbmUgdXNlZCBmb3Igc2Nyb2xsaW5n CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9ndGsvV2ViRXZlbnRGYWN0b3J5Lmgg Yi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9ndGsvV2ViRXZlbnRGYWN0b3J5LmgKaW5kZXggZTBlM2E2 YTQ2NTgzMGU5NjJlNjEwZWI0N2I3YjdlNmZjNjIzOWZlNS4uMzU4ZGM1ZGQzOGI4ZWFmMDk5Mjc4 NzkwN2YzYmM3NGYxNGUwNTU4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvZ3Rr L1dlYkV2ZW50RmFjdG9yeS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2d0ay9XZWJFdmVu dEZhY3RvcnkuaApAQCAtNDMsNiArNDMsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFdlYk1vdXNl RXZlbnQgY3JlYXRlV2ViTW91c2VFdmVudChjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYpOwogICAg IHN0YXRpYyBXZWJXaGVlbEV2ZW50IGNyZWF0ZVdlYldoZWVsRXZlbnQoY29uc3QgR2RrRXZlbnQq KTsKICAgICBzdGF0aWMgV2ViV2hlZWxFdmVudCBjcmVhdGVXZWJXaGVlbEV2ZW50KGNvbnN0IEdk a0V2ZW50KiwgV2ViV2hlZWxFdmVudDo6UGhhc2UsIFdlYldoZWVsRXZlbnQ6OlBoYXNlIG1vbWVu dHVtUGhhc2UpOworICAgIHN0YXRpYyBXZWJXaGVlbEV2ZW50IGNyZWF0ZVdlYldoZWVsRXZlbnQo Y29uc3QgR2RrRXZlbnQqLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYsIGNvbnN0IFdlYkNvcmU6 OkludFBvaW50JiwgY29uc3QgV2ViQ29yZTo6RmxvYXRTaXplJik7CiAgICAgc3RhdGljIFdlYldo ZWVsRXZlbnQgY3JlYXRlV2ViV2hlZWxFdmVudChjb25zdCBHZGtFdmVudCosIGNvbnN0IFdlYkNv cmU6OkludFBvaW50JiwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmLCBXZWJXaGVlbEV2ZW50OjpQ aGFzZSwgV2ViV2hlZWxFdmVudDo6UGhhc2UgbW9tZW50dW1QaGFzZSk7CiAgICAgc3RhdGljIFdl YldoZWVsRXZlbnQgY3JlYXRlV2ViV2hlZWxFdmVudChjb25zdCBHZGtFdmVudCosIGNvbnN0IFdl YkNvcmU6OkludFBvaW50JiwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmLCBjb25zdCBXZWJDb3Jl OjpGbG9hdFNpemUmIHdoZWVsVGlja3MsIFdlYldoZWVsRXZlbnQ6OlBoYXNlLCBXZWJXaGVlbEV2 ZW50OjpQaGFzZSBtb21lbnR1bVBoYXNlKTsKICAgICBzdGF0aWMgV2ViS2V5Ym9hcmRFdmVudCBj cmVhdGVXZWJLZXlib2FyZEV2ZW50KGNvbnN0IEdka0V2ZW50KiwgY29uc3QgU3RyaW5nJiwgYm9v bCBoYW5kbGVkQnlJbnB1dE1ldGhvZCwgT3B0aW9uYWw8VmVjdG9yPFdlYkNvcmU6OkNvbXBvc2l0 aW9uVW5kZXJsaW5lPj4mJiwgT3B0aW9uYWw8RWRpdGluZ1JhbmdlPiYmLCBWZWN0b3I8U3RyaW5n PiYmIGNvbW1hbmRzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKaW5kZXggMTJiMGFiYmUzOGU5YWJlMzc4ZGQ0YWViMDlh MGQ0NGI3Y2MwMDY1OC4uYjg0ODE3ZGZiMWY1NzYxMTUyNWQ0YzI2NDgzMTI2Nzk5NzdmZjY5YiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3 QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJW aWV3QmFzZS5jcHAKQEAgLTEyNzcsNiArMTI3NywxMSBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0 V2ViVmlld0Jhc2VTY3JvbGwoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYlZpZXdCYXNlLCBkb3VibGUg ZAogCiAgICAgcmV0dXJuIEdES19FVkVOVF9TVE9QOwogfQorCitzdGF0aWMgdm9pZCB3ZWJraXRX ZWJWaWV3QmFzZVNjcm9sbEVuZChXZWJLaXRXZWJWaWV3QmFzZSogd2ViVmlld0Jhc2UsIEd0a0V2 ZW50Q29udHJvbGxlciogY29udHJvbGxlcikKK3sKKyAgICB3ZWJraXRXZWJWaWV3QmFzZVNjcm9s bCh3ZWJWaWV3QmFzZSwgMCwgMCwgY29udHJvbGxlcik7Cit9CiAjZW5kaWYKIAogI2lmICFVU0Uo R1RLNCkKQEAgLTE5MTYsNiArMTkyMSw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdCYXNl Q29uc3RydWN0ZWQoR09iamVjdCogb2JqZWN0KQogI2lmIFVTRShHVEs0KQogICAgIGF1dG8qIGNv bnRyb2xsZXIgPSBndGtfZXZlbnRfY29udHJvbGxlcl9zY3JvbGxfbmV3KEdUS19FVkVOVF9DT05U Uk9MTEVSX1NDUk9MTF9CT1RIX0FYRVMpOwogICAgIGdfc2lnbmFsX2Nvbm5lY3Rfb2JqZWN0KGNv bnRyb2xsZXIsICJzY3JvbGwiLCBHX0NBTExCQUNLKHdlYmtpdFdlYlZpZXdCYXNlU2Nyb2xsKSwg dmlld1dpZGdldCwgR19DT05ORUNUX1NXQVBQRUQpOworICAgIGdfc2lnbmFsX2Nvbm5lY3Rfb2Jq ZWN0KGNvbnRyb2xsZXIsICJzY3JvbGwtZW5kIiwgR19DQUxMQkFDSyh3ZWJraXRXZWJWaWV3QmFz ZVNjcm9sbEVuZCksIHZpZXdXaWRnZXQsIEdfQ09OTkVDVF9TV0FQUEVEKTsKICAgICBndGtfd2lk Z2V0X2FkZF9jb250cm9sbGVyKHZpZXdXaWRnZXQsIGNvbnRyb2xsZXIpOwogCiAgICAgY29udHJv bGxlciA9IGd0a19ldmVudF9jb250cm9sbGVyX21vdGlvbl9uZXcoKTsK