211045 2020-04-26 04:45:14 -0700 [GTK4] Add support for scroll events 2020-06-01 05:02:44 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=212593 Gtk P2 Normal --- 210967 210100 211073 1 cgarcia webkit-unassigned aperez berto bugs-noreply ews-watchlist gustavo oldest_to_newest 1645767 0 cgarcia 2020-04-26 04:45:14 -0700 . 1645769 1 397616 cgarcia 2020-04-26 04:47:29 -0700 Created attachment 397616 Patch 1645972 2 397674 cgarcia 2020-04-27 05:59:29 -0700 Created attachment 397674 Patch 1646445 3 397828 cgarcia 2020-04-28 04:38:30 -0700 Created attachment 397828 Patch for landing 1646446 4 ews-watchlist 2020-04-28 04:39:13 -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 1646448 5 cgarcia 2020-04-28 04:50:46 -0700 Committed r260817: <https://trac.webkit.org/changeset/260817> 397616 2020-04-26 04:47:29 -0700 2020-04-27 05:59:29 -0700 Patch wkgtk4-scroll.diff text/plain 4898 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggNmIzYTZlZGUwZGU1Li4zZTc3ZWZmNjRkZjUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTcgQEAKKzIwMjAtMDQtMjYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtHVEs0XSBBZGQgc3VwcG9ydCBmb3Igc2Nyb2xsIGV2ZW50cwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExMDQ1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIGFuIGV2 ZW50IGNvbnRyb2xsZXIgdG8gY29ubmVjdCB0byBzY3JvbGwgc2lnbmFsIGFuZCBnZXQgdGhlIEdk a0V2ZW50LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2Uu Y3BwOgorICAgICAgICAod2Via2l0V2ViVmlld0Jhc2VIYW5kbGVXaGVlbEV2ZW50KToKKyAgICAg ICAgKHdlYmtpdFdlYlZpZXdCYXNlU2Nyb2xsKToKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNl Q29uc3RydWN0ZWQpOgorCiAyMDIwLTA0LTI1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJj aWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLNF1bV2F5bGFuZF0gQWRkIHN1cHBvcnQgZm9y IHJlbmRlcmluZyB3ZWIgdmlldyBjb250ZW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcAppbmRleCBiYTI0NGM3NGEyMjMu LmU2YmJhMmQ5NjgwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKQEAgLTU5NywyNCArNTk3LDYgQEAgc3RhdGljIHZv aWQgd2Via2l0V2ViVmlld0Jhc2VEaXNwb3NlKEdPYmplY3QqIGdvYmplY3QpCiAgICAgR19PQkpF Q1RfQ0xBU1Mod2Via2l0X3dlYl92aWV3X2Jhc2VfcGFyZW50X2NsYXNzKS0+ZGlzcG9zZShnb2Jq ZWN0KTsKIH0KIAotc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VDb25zdHJ1Y3RlZChHT2Jq ZWN0KiBvYmplY3QpCi17Ci0gICAgR19PQkpFQ1RfQ0xBU1Mod2Via2l0X3dlYl92aWV3X2Jhc2Vf cGFyZW50X2NsYXNzKS0+Y29uc3RydWN0ZWQob2JqZWN0KTsKLQotICAgIEd0a1dpZGdldCogdmll d1dpZGdldCA9IEdUS19XSURHRVQob2JqZWN0KTsKLSAgICBndGtfd2lkZ2V0X3NldF9jYW5fZm9j dXModmlld1dpZGdldCwgVFJVRSk7Ci0gICAgZ3RrX3dpZGdldF9zZXRfdmV4cGFuZCh2aWV3V2lk Z2V0LCBUUlVFKTsKLSNpZiAhVVNFKEdUSzQpCi0gICAgZ3RrX2RyYWdfZGVzdF9zZXQodmlld1dp ZGdldCwgc3RhdGljX2Nhc3Q8R3RrRGVzdERlZmF1bHRzPigwKSwgbnVsbHB0ciwgMCwKLSAgICAg ICAgc3RhdGljX2Nhc3Q8R2RrRHJhZ0FjdGlvbj4oR0RLX0FDVElPTl9DT1BZIHwgR0RLX0FDVElP Tl9NT1ZFIHwgR0RLX0FDVElPTl9MSU5LIHwgR0RLX0FDVElPTl9QUklWQVRFKSk7Ci0gICAgZ3Rr X2RyYWdfZGVzdF9zZXRfdGFyZ2V0X2xpc3Qodmlld1dpZGdldCwgUGFzdGVib2FyZEhlbHBlcjo6 c2luZ2xldG9uKCkudGFyZ2V0TGlzdCgpKTsKLSNlbmRpZgotCi0gICAgV2ViS2l0V2ViVmlld0Jh c2VQcml2YXRlKiBwcml2ID0gV0VCS0lUX1dFQl9WSUVXX0JBU0Uob2JqZWN0KS0+cHJpdjsKLSAg ICBwcml2LT5wYWdlQ2xpZW50ID0gbWFrZVVuaXF1ZTxQYWdlQ2xpZW50SW1wbD4odmlld1dpZGdl dCk7Ci0gICAgcHJpdi0+ZGlhbG9nID0gbnVsbHB0cjsKLX0KLQogI2lmIFVTRShHVEs0KQogdm9p ZCB3ZWJraXRXZWJWaWV3QmFzZVNuYXBzaG90KEd0a1dpZGdldCogd2lkZ2V0LCBHdGtTbmFwc2hv dCogc25hcHNob3QpCiB7CkBAIC05NzUsMTIgKzk1NywxNSBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Vi a2l0V2ViVmlld0Jhc2VCdXR0b25SZWxlYXNlRXZlbnQoR3RrV2lkZ2V0KiB3aWRnZXQsIEdka0V2 ZW50QgogCiAgICAgcmV0dXJuIEdES19FVkVOVF9TVE9QOwogfQorI2VuZGlmCiAKIHN0YXRpYyB2 b2lkIHdlYmtpdFdlYlZpZXdCYXNlSGFuZGxlV2hlZWxFdmVudChXZWJLaXRXZWJWaWV3QmFzZSog d2ViVmlld0Jhc2UsIEdka0V2ZW50KiBldmVudCwgT3B0aW9uYWw8V2ViV2hlZWxFdmVudDo6UGhh c2U+IHBoYXNlID0gV1RGOjpudWxsb3B0LCBPcHRpb25hbDxXZWJXaGVlbEV2ZW50OjpQaGFzZT4g bW9tZW50dW0gPSBXVEY6Om51bGxvcHQpCiB7CisjaWYgIVVTRShHVEs0KQogICAgIFZpZXdHZXN0 dXJlQ29udHJvbGxlciogY29udHJvbGxlciA9IHdlYmtpdFdlYlZpZXdCYXNlVmlld0dlc3R1cmVD b250cm9sbGVyKHdlYlZpZXdCYXNlKTsKICAgICBpZiAoY29udHJvbGxlciAmJiBjb250cm9sbGVy LT5pc1N3aXBlR2VzdHVyZUVuYWJsZWQoKSAmJiBjb250cm9sbGVyLT5oYW5kbGVTY3JvbGxXaGVl bEV2ZW50KHJlaW50ZXJwcmV0X2Nhc3Q8R2RrRXZlbnRTY3JvbGwqPihldmVudCkpKQogICAgICAg ICByZXR1cm47CisjZW5kaWYKIAogICAgIFdlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9 IHdlYlZpZXdCYXNlLT5wcml2OwogICAgIEFTU0VSVCghcHJpdi0+ZGlhbG9nKTsKQEAgLTk5MCw2 ICs5NzUsMjAgQEAgc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VIYW5kbGVXaGVlbEV2ZW50 KFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3QmFzZSwgR2QKICAgICAgICAgcHJpdi0+cGFnZVBy b3h5LT5oYW5kbGVXaGVlbEV2ZW50KE5hdGl2ZVdlYldoZWVsRXZlbnQoZXZlbnQpKTsKIH0KIAor I2lmIFVTRShHVEs0KQorc3RhdGljIGdib29sZWFuIHdlYmtpdFdlYlZpZXdCYXNlU2Nyb2xsKFdl YktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3QmFzZSwgZG91YmxlLCBkb3VibGUsIEd0a0V2ZW50Q29u dHJvbGxlciogY29udHJvbGxlcikKK3sKKyAgICBpZiAod2ViVmlld0Jhc2UtPnByaXYtPmRpYWxv ZykKKyAgICAgICAgcmV0dXJuIEdES19FVkVOVF9QUk9QQUdBVEU7CisKKyAgICAvLyBGSVhNRTog aW52ZXJ0IGF4aXMgaW4gY2FzZSBvZiBTSElGVC4KKyAgICB3ZWJraXRXZWJWaWV3QmFzZUhhbmRs ZVdoZWVsRXZlbnQod2ViVmlld0Jhc2UsIGd0a19ldmVudF9jb250cm9sbGVyX2dldF9jdXJyZW50 X2V2ZW50KGNvbnRyb2xsZXIpKTsKKworICAgIHJldHVybiBHREtfRVZFTlRfU1RPUDsKK30KKwor I2Vsc2UKKwogc3RhdGljIGdib29sZWFuIHdlYmtpdFdlYlZpZXdCYXNlU2Nyb2xsRXZlbnQoR3Rr V2lkZ2V0KiB3aWRnZXQsIEdka0V2ZW50U2Nyb2xsKiBldmVudCkKIHsKICAgICBXZWJLaXRXZWJW aWV3QmFzZSogd2ViVmlld0Jhc2UgPSBXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3aWRnZXQpOwpAQCAt MTUwNCw2ICsxNTAzLDI5IEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlRGVzdHJveShH dGtXaWRnZXQqIHdpZGdldCkKICAgICBHVEtfV0lER0VUX0NMQVNTKHdlYmtpdF93ZWJfdmlld19i YXNlX3BhcmVudF9jbGFzcyktPmRlc3Ryb3kod2lkZ2V0KTsKIH0KIAorc3RhdGljIHZvaWQgd2Vi a2l0V2ViVmlld0Jhc2VDb25zdHJ1Y3RlZChHT2JqZWN0KiBvYmplY3QpCit7CisgICAgR19PQkpF Q1RfQ0xBU1Mod2Via2l0X3dlYl92aWV3X2Jhc2VfcGFyZW50X2NsYXNzKS0+Y29uc3RydWN0ZWQo b2JqZWN0KTsKKworICAgIEd0a1dpZGdldCogdmlld1dpZGdldCA9IEdUS19XSURHRVQob2JqZWN0 KTsKKyAgICBndGtfd2lkZ2V0X3NldF9jYW5fZm9jdXModmlld1dpZGdldCwgVFJVRSk7CisgICAg Z3RrX3dpZGdldF9zZXRfdmV4cGFuZCh2aWV3V2lkZ2V0LCBUUlVFKTsKKyNpZiAhVVNFKEdUSzQp CisgICAgZ3RrX2RyYWdfZGVzdF9zZXQodmlld1dpZGdldCwgc3RhdGljX2Nhc3Q8R3RrRGVzdERl ZmF1bHRzPigwKSwgbnVsbHB0ciwgMCwKKyAgICAgICAgc3RhdGljX2Nhc3Q8R2RrRHJhZ0FjdGlv bj4oR0RLX0FDVElPTl9DT1BZIHwgR0RLX0FDVElPTl9NT1ZFIHwgR0RLX0FDVElPTl9MSU5LIHwg R0RLX0FDVElPTl9QUklWQVRFKSk7CisgICAgZ3RrX2RyYWdfZGVzdF9zZXRfdGFyZ2V0X2xpc3Qo dmlld1dpZGdldCwgUGFzdGVib2FyZEhlbHBlcjo6c2luZ2xldG9uKCkudGFyZ2V0TGlzdCgpKTsK KyNlbmRpZgorCisgICAgV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlKiBwcml2ID0gV0VCS0lUX1dF Ql9WSUVXX0JBU0Uob2JqZWN0KS0+cHJpdjsKKyAgICBwcml2LT5wYWdlQ2xpZW50ID0gbWFrZVVu aXF1ZTxQYWdlQ2xpZW50SW1wbD4odmlld1dpZGdldCk7CisKKyNpZiBVU0UoR1RLNCkKKyAgICBh dXRvKiBjb250cm9sbGVyID0gZ3RrX2V2ZW50X2NvbnRyb2xsZXJfc2Nyb2xsX25ldyhHVEtfRVZF TlRfQ09OVFJPTExFUl9TQ1JPTExfQk9USF9BWEVTKTsKKyAgICBnX3NpZ25hbF9jb25uZWN0X29i amVjdChjb250cm9sbGVyLCAic2Nyb2xsIiwgR19DQUxMQkFDSyh3ZWJraXRXZWJWaWV3QmFzZVNj cm9sbCksIHZpZXdXaWRnZXQsIEdfQ09OTkVDVF9TV0FQUEVEKTsKKyAgICBndGtfd2lkZ2V0X2Fk ZF9jb250cm9sbGVyKHZpZXdXaWRnZXQsIGNvbnRyb2xsZXIpOworI2VuZGlmCit9CisKIHN0YXRp YyB2b2lkIHdlYmtpdF93ZWJfdmlld19iYXNlX2NsYXNzX2luaXQoV2ViS2l0V2ViVmlld0Jhc2VD bGFzcyogd2Via2l0V2ViVmlld0Jhc2VDbGFzcykKIHsKICAgICBHdGtXaWRnZXRDbGFzcyogd2lk Z2V0Q2xhc3MgPSBHVEtfV0lER0VUX0NMQVNTKHdlYmtpdFdlYlZpZXdCYXNlQ2xhc3MpOwo= 397674 2020-04-27 05:59:29 -0700 2020-04-28 04:38:30 -0700 Patch wkgtk4-scroll.diff text/plain 9995 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggNmIzYTZlZGUwZGU1Li4zZTc3ZWZmNjRkZjUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTcgQEAKKzIwMjAtMDQtMjYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtHVEs0XSBBZGQgc3VwcG9ydCBmb3Igc2Nyb2xsIGV2ZW50cwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExMDQ1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIGFuIGV2 ZW50IGNvbnRyb2xsZXIgdG8gY29ubmVjdCB0byBzY3JvbGwgc2lnbmFsIGFuZCBnZXQgdGhlIEdk a0V2ZW50LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2Uu Y3BwOgorICAgICAgICAod2Via2l0V2ViVmlld0Jhc2VIYW5kbGVXaGVlbEV2ZW50KToKKyAgICAg ICAgKHdlYmtpdFdlYlZpZXdCYXNlU2Nyb2xsKToKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNl Q29uc3RydWN0ZWQpOgorCiAyMDIwLTA0LTI1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJj aWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLNF1bV2F5bGFuZF0gQWRkIHN1cHBvcnQgZm9y IHJlbmRlcmluZyB3ZWIgdmlldyBjb250ZW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9T aGFyZWQvTmF0aXZlV2ViV2hlZWxFdmVudC5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvTmF0aXZl V2ViV2hlZWxFdmVudC5oCmluZGV4IDVlNjU1YjQ4MmM2MS4uYTVkYjhiNzQ2MTc3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9OYXRpdmVXZWJXaGVlbEV2ZW50LmgKKysrIGIvU291 cmNlL1dlYktpdC9TaGFyZWQvTmF0aXZlV2ViV2hlZWxFdmVudC5oCkBAIC02MCw2ICs2MCw3IEBA IHB1YmxpYzoKICAgICBOYXRpdmVXZWJXaGVlbEV2ZW50KGNvbnN0IE5hdGl2ZVdlYldoZWVsRXZl bnQmKTsKICAgICBOYXRpdmVXZWJXaGVlbEV2ZW50KEdka0V2ZW50Kik7CiAgICAgTmF0aXZlV2Vi V2hlZWxFdmVudChHZGtFdmVudCosIFdlYldoZWVsRXZlbnQ6OlBoYXNlLCBXZWJXaGVlbEV2ZW50 OjpQaGFzZSBtb21lbnR1bVBoYXNlKTsKKyAgICBOYXRpdmVXZWJXaGVlbEV2ZW50KEdka0V2ZW50 KiwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmKTsKICNlbGlmIFVTRShMSUJXUEUpCiAgICAgTmF0 aXZlV2ViV2hlZWxFdmVudChzdHJ1Y3Qgd3BlX2lucHV0X2F4aXNfZXZlbnQqLCBmbG9hdCBkZXZp Y2VTY2FsZUZhY3RvciwgV2ViV2hlZWxFdmVudDo6UGhhc2UsIFdlYldoZWVsRXZlbnQ6OlBoYXNl IG1vbWVudHVtUGhhc2UpOwogI2VsaWYgUExBVEZPUk0oV0lOKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9TaGFyZWQvZ3RrL05hdGl2ZVdlYldoZWVsRXZlbnRHdGsuY3BwIGIvU291cmNlL1dl YktpdC9TaGFyZWQvZ3RrL05hdGl2ZVdlYldoZWVsRXZlbnRHdGsuY3BwCmluZGV4IGE2MDA0Njc3 YzQxMC4uYjJmNzAxMDA2YWQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9ndGsv TmF0aXZlV2ViV2hlZWxFdmVudEd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvZ3Rr L05hdGl2ZVdlYldoZWVsRXZlbnRHdGsuY3BwCkBAIC00Myw4ICs0MywxNCBAQCBOYXRpdmVXZWJX aGVlbEV2ZW50OjpOYXRpdmVXZWJXaGVlbEV2ZW50KEdka0V2ZW50KiBldmVudCwgV2ViV2hlZWxF dmVudDo6UGhhc2UgcAogewogfQogCitOYXRpdmVXZWJXaGVlbEV2ZW50OjpOYXRpdmVXZWJXaGVl bEV2ZW50KEdka0V2ZW50KiBldmVudCwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHBvc2l0aW9u KQorICAgIDogV2ViV2hlZWxFdmVudChXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYldoZWVsRXZl bnQoZXZlbnQsIHBvc2l0aW9uLCBwb3NpdGlvbiwgV2ViV2hlZWxFdmVudDo6UGhhc2U6OlBoYXNl Q2hhbmdlZCwgV2ViV2hlZWxFdmVudDo6UGhhc2U6OlBoYXNlTm9uZSkpCisgICAgLCBtX25hdGl2 ZUV2ZW50KGdka19ldmVudF9jb3B5KGV2ZW50KSkKK3sKK30KKwogTmF0aXZlV2ViV2hlZWxFdmVu dDo6TmF0aXZlV2ViV2hlZWxFdmVudChjb25zdCBOYXRpdmVXZWJXaGVlbEV2ZW50JiBldmVudCkK LSAgICA6IFdlYldoZWVsRXZlbnQoV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJXaGVlbEV2ZW50 KGV2ZW50Lm5hdGl2ZUV2ZW50KCksIGV2ZW50LnBoYXNlKCksIGV2ZW50Lm1vbWVudHVtUGhhc2Uo KSkpCisgICAgOiBXZWJXaGVlbEV2ZW50KFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViV2hlZWxF dmVudChldmVudC5uYXRpdmVFdmVudCgpLCBldmVudC5wb3NpdGlvbigpLCBldmVudC5nbG9iYWxQ b3NpdGlvbigpLCBldmVudC5waGFzZSgpLCBldmVudC5tb21lbnR1bVBoYXNlKCkpKQogICAgICwg bV9uYXRpdmVFdmVudChnZGtfZXZlbnRfY29weShldmVudC5uYXRpdmVFdmVudCgpKSkKIHsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2d0ay9XZWJFdmVudEZhY3RvcnkuY3Bw IGIvU291cmNlL1dlYktpdC9TaGFyZWQvZ3RrL1dlYkV2ZW50RmFjdG9yeS5jcHAKaW5kZXggNmE0 NDVmN2Q4OWJjLi41NzQzY2FmMThmYmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVk L2d0ay9XZWJFdmVudEZhY3RvcnkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2d0ay9X ZWJFdmVudEZhY3RvcnkuY3BwCkBAIC0zNiw2ICszNiw3IEBACiAjaW5jbHVkZSA8Z2RrL2dkay5o PgogI2luY2x1ZGUgPGdkay9nZGtrZXlzeW1zLmg+CiAjaW5jbHVkZSA8d3RmL0FTQ0lJQ1R5cGUu aD4KKyNpbmNsdWRlIDx3dGYvTWF0aEV4dHJhcy5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIApA QCAtMjA0LDEyICsyMDUsMTcgQEAgV2ViV2hlZWxFdmVudCBXZWJFdmVudEZhY3Rvcnk6OmNyZWF0 ZVdlYldoZWVsRXZlbnQoY29uc3QgR2RrRXZlbnQqIGV2ZW50KQogCiBXZWJXaGVlbEV2ZW50IFdl YkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViV2hlZWxFdmVudChjb25zdCBHZGtFdmVudCogZXZlbnQs IFdlYldoZWVsRXZlbnQ6OlBoYXNlIHBoYXNlLCBXZWJXaGVlbEV2ZW50OjpQaGFzZSBtb21lbnR1 bVBoYXNlKQogewotICAgIEZsb2F0U2l6ZSB3aGVlbFRpY2tzID0gRmxvYXRTaXplKDAsIDApOwog ICAgIGRvdWJsZSB4LCB5OwogICAgIGdka19ldmVudF9nZXRfY29vcmRzKGV2ZW50LCAmeCwgJnkp OwogICAgIGRvdWJsZSB4Um9vdCwgeVJvb3Q7CiAgICAgZ2RrX2V2ZW50X2dldF9yb290X2Nvb3Jk cyhldmVudCwgJnhSb290LCAmeVJvb3QpOwogCisgICAgcmV0dXJuIGNyZWF0ZVdlYldoZWVsRXZl bnQoZXZlbnQsIHsgY2xhbXBUb0ludGVnZXIoeCksIGNsYW1wVG9JbnRlZ2VyKHkpIH0sIHsgY2xh bXBUb0ludGVnZXIoeFJvb3QpLCBjbGFtcFRvSW50ZWdlcih5Um9vdCkgfSwgcGhhc2UsIG1vbWVu dHVtUGhhc2UpOworfQorCitXZWJXaGVlbEV2ZW50IFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2Vi V2hlZWxFdmVudChjb25zdCBHZGtFdmVudCogZXZlbnQsIGNvbnN0IEludFBvaW50JiBwb3NpdGlv biwgY29uc3QgSW50UG9pbnQmIGdsb2JhbFBvc2l0aW9uLCBXZWJXaGVlbEV2ZW50OjpQaGFzZSBw aGFzZSwgV2ViV2hlZWxFdmVudDo6UGhhc2UgbW9tZW50dW1QaGFzZSkKK3sKKyAgICBPcHRpb25h bDxGbG9hdFNpemU+IHdoZWVsVGlja3M7CiAgICAgR2RrU2Nyb2xsRGlyZWN0aW9uIGRpcmVjdGlv bjsKICAgICBpZiAoIWdka19ldmVudF9nZXRfc2Nyb2xsX2RpcmVjdGlvbihldmVudCwgJmRpcmVj dGlvbikpIHsKICAgICAgICAgZGlyZWN0aW9uID0gR0RLX1NDUk9MTF9TTU9PVEg7CkBAIC0yMTgs NyArMjI0LDcgQEAgV2ViV2hlZWxFdmVudCBXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYldoZWVs RXZlbnQoY29uc3QgR2RrRXZlbnQqIGV2ZW50LCBXZWJXaGUKICAgICAgICAgICAgIHdoZWVsVGlj a3MgPSBGbG9hdFNpemUoLWRlbHRhWCwgLWRlbHRhWSk7CiAgICAgfQogCi0gICAgaWYgKHdoZWVs VGlja3MuaXNaZXJvKCkpIHsKKyAgICBpZiAoIXdoZWVsVGlja3MpIHsKICAgICAgICAgc3dpdGNo IChkaXJlY3Rpb24pIHsKICAgICAgICAgY2FzZSBHREtfU0NST0xMX1VQOgogICAgICAgICAgICAg d2hlZWxUaWNrcyA9IEZsb2F0U2l6ZSgwLCAxKTsKQEAgLTIzMywyMiArMjM5LDIxIEBAIFdlYldo ZWVsRXZlbnQgV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJXaGVlbEV2ZW50KGNvbnN0IEdka0V2 ZW50KiBldmVudCwgV2ViV2hlCiAgICAgICAgICAgICB3aGVlbFRpY2tzID0gRmxvYXRTaXplKC0x LCAwKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIEdES19TQ1JPTExfU01PT1RI OgorICAgICAgICAgICAgd2hlZWxUaWNrcyA9IEZsb2F0U2l6ZSgwLCAwKTsKICAgICAgICAgICAg IGJyZWFrOwotICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7CiAgICAgICAgIH0KICAgICB9CiAKICAgICAvLyBGSVhNRTogW0dUS10gQWRkIGEgc2V0dGlu ZyB0byBjaGFuZ2UgdGhlIHBpeGVscyBwZXIgbGluZSB1c2VkIGZvciBzY3JvbGxpbmcKICAgICAv LyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQ4MjYKICAgICBmbG9h dCBzdGVwID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KFNjcm9sbGJhcjo6cGl4ZWxzUGVyTGluZVN0ZXAo KSk7Ci0gICAgRmxvYXRTaXplIGRlbHRhKHdoZWVsVGlja3Mud2lkdGgoKSAqIHN0ZXAsIHdoZWVs VGlja3MuaGVpZ2h0KCkgKiBzdGVwKTsKKyAgICBGbG9hdFNpemUgZGVsdGEod2hlZWxUaWNrcy0+ d2lkdGgoKSAqIHN0ZXAsIHdoZWVsVGlja3MtPmhlaWdodCgpICogc3RlcCk7CiAKICAgICByZXR1 cm4gV2ViV2hlZWxFdmVudChXZWJFdmVudDo6V2hlZWwsCi0gICAgICAgIEludFBvaW50KHgsIHkp LAotICAgICAgICBJbnRQb2ludCh4Um9vdCwgeVJvb3QpLAorICAgICAgICBwb3NpdGlvbiwKKyAg ICAgICAgZ2xvYmFsUG9zaXRpb24sCiAgICAgICAgIGRlbHRhLAotICAgICAgICB3aGVlbFRpY2tz LAorICAgICAgICB3aGVlbFRpY2tzLnZhbHVlKCksCiAgICAgICAgIHBoYXNlLAogICAgICAgICBt b21lbnR1bVBoYXNlLAogICAgICAgICBXZWJXaGVlbEV2ZW50OjpTY3JvbGxCeVBpeGVsV2hlZWxF dmVudCwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2d0ay9XZWJFdmVudEZhY3Rv cnkuaCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2d0ay9XZWJFdmVudEZhY3RvcnkuaAppbmRleCA1 NGRhODllNjA4OTMuLmIyZGQ0NzgwM2JjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFy ZWQvZ3RrL1dlYkV2ZW50RmFjdG9yeS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2d0ay9X ZWJFdmVudEZhY3RvcnkuaApAQCAtNDEsNiArNDEsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFdl Yk1vdXNlRXZlbnQgY3JlYXRlV2ViTW91c2VFdmVudChjb25zdCBHZGtFdmVudCosIGludCwgT3B0 aW9uYWw8V2ViQ29yZTo6SW50UG9pbnQ+KTsKICAgICBzdGF0aWMgV2ViV2hlZWxFdmVudCBjcmVh dGVXZWJXaGVlbEV2ZW50KGNvbnN0IEdka0V2ZW50Kik7CiAgICAgc3RhdGljIFdlYldoZWVsRXZl bnQgY3JlYXRlV2ViV2hlZWxFdmVudChjb25zdCBHZGtFdmVudCosIFdlYldoZWVsRXZlbnQ6OlBo YXNlLCBXZWJXaGVlbEV2ZW50OjpQaGFzZSBtb21lbnR1bVBoYXNlKTsKKyAgICBzdGF0aWMgV2Vi V2hlZWxFdmVudCBjcmVhdGVXZWJXaGVlbEV2ZW50KGNvbnN0IEdka0V2ZW50KiwgY29uc3QgV2Vi Q29yZTo6SW50UG9pbnQmLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYsIFdlYldoZWVsRXZlbnQ6 OlBoYXNlLCBXZWJXaGVlbEV2ZW50OjpQaGFzZSBtb21lbnR1bVBoYXNlKTsKICAgICBzdGF0aWMg V2ViS2V5Ym9hcmRFdmVudCBjcmVhdGVXZWJLZXlib2FyZEV2ZW50KGNvbnN0IEdka0V2ZW50Kiwg Y29uc3QgU3RyaW5nJiwgYm9vbCBoYW5kbGVkQnlJbnB1dE1ldGhvZCwgT3B0aW9uYWw8VmVjdG9y PFdlYkNvcmU6OkNvbXBvc2l0aW9uVW5kZXJsaW5lPj4mJiwgT3B0aW9uYWw8RWRpdGluZ1Jhbmdl PiYmLCBWZWN0b3I8U3RyaW5nPiYmIGNvbW1hbmRzKTsKICNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRT KQogICAgIHN0YXRpYyBXZWJUb3VjaEV2ZW50IGNyZWF0ZVdlYlRvdWNoRXZlbnQoY29uc3QgR2Rr RXZlbnQqLCBWZWN0b3I8V2ViUGxhdGZvcm1Ub3VjaFBvaW50PiYmKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKaW5kZXgg YmEyNDRjNzRhMjIzLi4wZDM0NWMyYjQyOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwCkBAIC02OSw2ICs2OSw3IEBA CiAjaW5jbHVkZSA8cGFsL3N5c3RlbS9TbGVlcERpc2FibGVyLmg+CiAjaW5jbHVkZSA8d3RmL0Nv bXBpbGVyLmg+CiAjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KKyNpbmNsdWRlIDx3dGYvTWF0aEV4 dHJhcy5oPgogI2luY2x1ZGUgPHd0Zi9nbGliL0dSZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYvZ2xp Yi9SdW5Mb29wU291cmNlUHJpb3JpdHkuaD4KICNpbmNsdWRlIDx3dGYvZ2xpYi9XVEZHVHlwZS5o PgpAQCAtNTk3LDI0ICs1OTgsNiBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZURpc3Bv c2UoR09iamVjdCogZ29iamVjdCkKICAgICBHX09CSkVDVF9DTEFTUyh3ZWJraXRfd2ViX3ZpZXdf YmFzZV9wYXJlbnRfY2xhc3MpLT5kaXNwb3NlKGdvYmplY3QpOwogfQogCi1zdGF0aWMgdm9pZCB3 ZWJraXRXZWJWaWV3QmFzZUNvbnN0cnVjdGVkKEdPYmplY3QqIG9iamVjdCkKLXsKLSAgICBHX09C SkVDVF9DTEFTUyh3ZWJraXRfd2ViX3ZpZXdfYmFzZV9wYXJlbnRfY2xhc3MpLT5jb25zdHJ1Y3Rl ZChvYmplY3QpOwotCi0gICAgR3RrV2lkZ2V0KiB2aWV3V2lkZ2V0ID0gR1RLX1dJREdFVChvYmpl Y3QpOwotICAgIGd0a193aWRnZXRfc2V0X2Nhbl9mb2N1cyh2aWV3V2lkZ2V0LCBUUlVFKTsKLSAg ICBndGtfd2lkZ2V0X3NldF92ZXhwYW5kKHZpZXdXaWRnZXQsIFRSVUUpOwotI2lmICFVU0UoR1RL NCkKLSAgICBndGtfZHJhZ19kZXN0X3NldCh2aWV3V2lkZ2V0LCBzdGF0aWNfY2FzdDxHdGtEZXN0 RGVmYXVsdHM+KDApLCBudWxscHRyLCAwLAotICAgICAgICBzdGF0aWNfY2FzdDxHZGtEcmFnQWN0 aW9uPihHREtfQUNUSU9OX0NPUFkgfCBHREtfQUNUSU9OX01PVkUgfCBHREtfQUNUSU9OX0xJTksg fCBHREtfQUNUSU9OX1BSSVZBVEUpKTsKLSAgICBndGtfZHJhZ19kZXN0X3NldF90YXJnZXRfbGlz dCh2aWV3V2lkZ2V0LCBQYXN0ZWJvYXJkSGVscGVyOjpzaW5nbGV0b24oKS50YXJnZXRMaXN0KCkp OwotI2VuZGlmCi0KLSAgICBXZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUqIHByaXYgPSBXRUJLSVRf V0VCX1ZJRVdfQkFTRShvYmplY3QpLT5wcml2OwotICAgIHByaXYtPnBhZ2VDbGllbnQgPSBtYWtl VW5pcXVlPFBhZ2VDbGllbnRJbXBsPih2aWV3V2lkZ2V0KTsKLSAgICBwcml2LT5kaWFsb2cgPSBu dWxscHRyOwotfQotCiAjaWYgVVNFKEdUSzQpCiB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlU25hcHNo b3QoR3RrV2lkZ2V0KiB3aWRnZXQsIEd0a1NuYXBzaG90KiBzbmFwc2hvdCkKIHsKQEAgLTEwMjYs NyArMTAwOSwyMiBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0V2ViVmlld0Jhc2VTY3JvbGxFdmVu dChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRXZlbnRTY3JvbGwqCiAKICAgICByZXR1cm4gR0RLX0VW RU5UX1NUT1A7CiB9CisjZW5kaWYKKworI2lmIFVTRShHVEs0KQorc3RhdGljIGdib29sZWFuIHdl YmtpdFdlYlZpZXdCYXNlU2Nyb2xsKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3QmFzZSwgZG91 YmxlIHgsIGRvdWJsZSB5LCBHdGtFdmVudENvbnRyb2xsZXIqIGNvbnRyb2xsZXIpCit7CisgICAg aWYgKHdlYlZpZXdCYXNlLT5wcml2LT5kaWFsb2cpCisgICAgICAgIHJldHVybiBHREtfRVZFTlRf UFJPUEFHQVRFOworCisgICAgLy8gRklYTUU6IGludmVydCBheGlzIGluIGNhc2Ugb2YgU0hJRlQu CisgICAgd2ViVmlld0Jhc2UtPnByaXYtPnBhZ2VQcm94eS0+aGFuZGxlV2hlZWxFdmVudChOYXRp dmVXZWJXaGVlbEV2ZW50KGd0a19ldmVudF9jb250cm9sbGVyX2dldF9jdXJyZW50X2V2ZW50KGNv bnRyb2xsZXIpLCB7IGNsYW1wVG9JbnRlZ2VyKHgpLCBjbGFtcFRvSW50ZWdlcih5KSB9KSk7CisK KyAgICByZXR1cm4gR0RLX0VWRU5UX1NUT1A7Cit9CisjZW5kaWYKIAorI2lmICFVU0UoR1RLNCkK IHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRXZWJWaWV3QmFzZVBvcHVwTWVudShHdGtXaWRnZXQqIHdp ZGdldCkKIHsKICAgICBXZWJLaXRXZWJWaWV3QmFzZSogd2ViVmlld0Jhc2UgPSBXRUJLSVRfV0VC X1ZJRVdfQkFTRSh3aWRnZXQpOwpAQCAtMTUwNCw2ICsxNTAyLDI5IEBAIHN0YXRpYyB2b2lkIHdl YmtpdFdlYlZpZXdCYXNlRGVzdHJveShHdGtXaWRnZXQqIHdpZGdldCkKICAgICBHVEtfV0lER0VU X0NMQVNTKHdlYmtpdF93ZWJfdmlld19iYXNlX3BhcmVudF9jbGFzcyktPmRlc3Ryb3kod2lkZ2V0 KTsKIH0KIAorc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VDb25zdHJ1Y3RlZChHT2JqZWN0 KiBvYmplY3QpCit7CisgICAgR19PQkpFQ1RfQ0xBU1Mod2Via2l0X3dlYl92aWV3X2Jhc2VfcGFy ZW50X2NsYXNzKS0+Y29uc3RydWN0ZWQob2JqZWN0KTsKKworICAgIEd0a1dpZGdldCogdmlld1dp ZGdldCA9IEdUS19XSURHRVQob2JqZWN0KTsKKyAgICBndGtfd2lkZ2V0X3NldF9jYW5fZm9jdXMo dmlld1dpZGdldCwgVFJVRSk7CisgICAgZ3RrX3dpZGdldF9zZXRfdmV4cGFuZCh2aWV3V2lkZ2V0 LCBUUlVFKTsKKyNpZiAhVVNFKEdUSzQpCisgICAgZ3RrX2RyYWdfZGVzdF9zZXQodmlld1dpZGdl dCwgc3RhdGljX2Nhc3Q8R3RrRGVzdERlZmF1bHRzPigwKSwgbnVsbHB0ciwgMCwKKyAgICAgICAg c3RhdGljX2Nhc3Q8R2RrRHJhZ0FjdGlvbj4oR0RLX0FDVElPTl9DT1BZIHwgR0RLX0FDVElPTl9N T1ZFIHwgR0RLX0FDVElPTl9MSU5LIHwgR0RLX0FDVElPTl9QUklWQVRFKSk7CisgICAgZ3RrX2Ry YWdfZGVzdF9zZXRfdGFyZ2V0X2xpc3Qodmlld1dpZGdldCwgUGFzdGVib2FyZEhlbHBlcjo6c2lu Z2xldG9uKCkudGFyZ2V0TGlzdCgpKTsKKyNlbmRpZgorCisgICAgV2ViS2l0V2ViVmlld0Jhc2VQ cml2YXRlKiBwcml2ID0gV0VCS0lUX1dFQl9WSUVXX0JBU0Uob2JqZWN0KS0+cHJpdjsKKyAgICBw cml2LT5wYWdlQ2xpZW50ID0gbWFrZVVuaXF1ZTxQYWdlQ2xpZW50SW1wbD4odmlld1dpZGdldCk7 CisKKyNpZiBVU0UoR1RLNCkKKyAgICBhdXRvKiBjb250cm9sbGVyID0gZ3RrX2V2ZW50X2NvbnRy b2xsZXJfc2Nyb2xsX25ldyhHVEtfRVZFTlRfQ09OVFJPTExFUl9TQ1JPTExfQk9USF9BWEVTKTsK KyAgICBnX3NpZ25hbF9jb25uZWN0X29iamVjdChjb250cm9sbGVyLCAic2Nyb2xsIiwgR19DQUxM QkFDSyh3ZWJraXRXZWJWaWV3QmFzZVNjcm9sbCksIHZpZXdXaWRnZXQsIEdfQ09OTkVDVF9TV0FQ UEVEKTsKKyAgICBndGtfd2lkZ2V0X2FkZF9jb250cm9sbGVyKHZpZXdXaWRnZXQsIGNvbnRyb2xs ZXIpOworI2VuZGlmCit9CisKIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19iYXNlX2NsYXNz X2luaXQoV2ViS2l0V2ViVmlld0Jhc2VDbGFzcyogd2Via2l0V2ViVmlld0Jhc2VDbGFzcykKIHsK ICAgICBHdGtXaWRnZXRDbGFzcyogd2lkZ2V0Q2xhc3MgPSBHVEtfV0lER0VUX0NMQVNTKHdlYmtp dFdlYlZpZXdCYXNlQ2xhc3MpOwo= 397828 2020-04-28 04:38:30 -0700 2020-04-28 04:38:30 -0700 Patch for landing wkgtk4-scroll.diff text/plain 9909 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggODA2OGFiYjk1NDY3Li5iYjM2NDc3ZWY3MmYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTcgQEAKKzIwMjAtMDQtMjYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtHVEs0XSBBZGQgc3VwcG9ydCBmb3Igc2Nyb2xsIGV2ZW50cwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExMDQ1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgQWRyaWFuIFBlcmV6IGRlIENhc3Ryby4KKworICAgICAgICBV c2UgYW4gZXZlbnQgY29udHJvbGxlciB0byBjb25uZWN0IHRvIHNjcm9sbCBzaWduYWwgYW5kIGdl dCB0aGUgR2RrRXZlbnQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJW aWV3QmFzZS5jcHA6CisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZUhhbmRsZVdoZWVsRXZlbnQp OgorICAgICAgICAod2Via2l0V2ViVmlld0Jhc2VTY3JvbGwpOgorICAgICAgICAod2Via2l0V2Vi Vmlld0Jhc2VDb25zdHJ1Y3RlZCk6CisKIDIwMjAtMDQtMjggIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEs0XVtXYXlsYW5kXSBBZGQgc3Vw cG9ydCBmb3IgcmVuZGVyaW5nIHdlYiB2aWV3IGNvbnRlbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9OYXRpdmVXZWJXaGVlbEV2ZW50LmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJl ZC9OYXRpdmVXZWJXaGVlbEV2ZW50LmgKaW5kZXggNWU2NTViNDgyYzYxLi5hNWRiOGI3NDYxNzcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL05hdGl2ZVdlYldoZWVsRXZlbnQuaAor KysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9OYXRpdmVXZWJXaGVlbEV2ZW50LmgKQEAgLTYwLDYg KzYwLDcgQEAgcHVibGljOgogICAgIE5hdGl2ZVdlYldoZWVsRXZlbnQoY29uc3QgTmF0aXZlV2Vi V2hlZWxFdmVudCYpOwogICAgIE5hdGl2ZVdlYldoZWVsRXZlbnQoR2RrRXZlbnQqKTsKICAgICBO YXRpdmVXZWJXaGVlbEV2ZW50KEdka0V2ZW50KiwgV2ViV2hlZWxFdmVudDo6UGhhc2UsIFdlYldo ZWVsRXZlbnQ6OlBoYXNlIG1vbWVudHVtUGhhc2UpOworICAgIE5hdGl2ZVdlYldoZWVsRXZlbnQo R2RrRXZlbnQqLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYpOwogI2VsaWYgVVNFKExJQldQRSkK ICAgICBOYXRpdmVXZWJXaGVlbEV2ZW50KHN0cnVjdCB3cGVfaW5wdXRfYXhpc19ldmVudCosIGZs b2F0IGRldmljZVNjYWxlRmFjdG9yLCBXZWJXaGVlbEV2ZW50OjpQaGFzZSwgV2ViV2hlZWxFdmVu dDo6UGhhc2UgbW9tZW50dW1QaGFzZSk7CiAjZWxpZiBQTEFURk9STShXSU4pCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9ndGsvTmF0aXZlV2ViV2hlZWxFdmVudEd0ay5jcHAgYi9T b3VyY2UvV2ViS2l0L1NoYXJlZC9ndGsvTmF0aXZlV2ViV2hlZWxFdmVudEd0ay5jcHAKaW5kZXgg YTYwMDQ2NzdjNDEwLi5iMmY3MDEwMDZhZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hh cmVkL2d0ay9OYXRpdmVXZWJXaGVlbEV2ZW50R3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1No YXJlZC9ndGsvTmF0aXZlV2ViV2hlZWxFdmVudEd0ay5jcHAKQEAgLTQzLDggKzQzLDE0IEBAIE5h dGl2ZVdlYldoZWVsRXZlbnQ6Ok5hdGl2ZVdlYldoZWVsRXZlbnQoR2RrRXZlbnQqIGV2ZW50LCBX ZWJXaGVlbEV2ZW50OjpQaGFzZSBwCiB7CiB9CiAKK05hdGl2ZVdlYldoZWVsRXZlbnQ6Ok5hdGl2 ZVdlYldoZWVsRXZlbnQoR2RrRXZlbnQqIGV2ZW50LCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYg cG9zaXRpb24pCisgICAgOiBXZWJXaGVlbEV2ZW50KFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2Vi V2hlZWxFdmVudChldmVudCwgcG9zaXRpb24sIHBvc2l0aW9uLCBXZWJXaGVlbEV2ZW50OjpQaGFz ZTo6UGhhc2VDaGFuZ2VkLCBXZWJXaGVlbEV2ZW50OjpQaGFzZTo6UGhhc2VOb25lKSkKKyAgICAs IG1fbmF0aXZlRXZlbnQoZ2RrX2V2ZW50X2NvcHkoZXZlbnQpKQoreworfQorCiBOYXRpdmVXZWJX aGVlbEV2ZW50OjpOYXRpdmVXZWJXaGVlbEV2ZW50KGNvbnN0IE5hdGl2ZVdlYldoZWVsRXZlbnQm IGV2ZW50KQotICAgIDogV2ViV2hlZWxFdmVudChXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYldo ZWVsRXZlbnQoZXZlbnQubmF0aXZlRXZlbnQoKSwgZXZlbnQucGhhc2UoKSwgZXZlbnQubW9tZW50 dW1QaGFzZSgpKSkKKyAgICA6IFdlYldoZWVsRXZlbnQoV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVX ZWJXaGVlbEV2ZW50KGV2ZW50Lm5hdGl2ZUV2ZW50KCksIGV2ZW50LnBvc2l0aW9uKCksIGV2ZW50 Lmdsb2JhbFBvc2l0aW9uKCksIGV2ZW50LnBoYXNlKCksIGV2ZW50Lm1vbWVudHVtUGhhc2UoKSkp CiAgICAgLCBtX25hdGl2ZUV2ZW50KGdka19ldmVudF9jb3B5KGV2ZW50Lm5hdGl2ZUV2ZW50KCkp KQogewogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvZ3RrL1dlYkV2ZW50RmFj dG9yeS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9ndGsvV2ViRXZlbnRGYWN0b3J5LmNwcApp bmRleCA2YTQ0NWY3ZDg5YmMuLjU3NDNjYWYxOGZiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9TaGFyZWQvZ3RrL1dlYkV2ZW50RmFjdG9yeS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFy ZWQvZ3RrL1dlYkV2ZW50RmFjdG9yeS5jcHAKQEAgLTM2LDYgKzM2LDcgQEAKICNpbmNsdWRlIDxn ZGsvZ2RrLmg+CiAjaW5jbHVkZSA8Z2RrL2dka2tleXN5bXMuaD4KICNpbmNsdWRlIDx3dGYvQVND SUlDVHlwZS5oPgorI2luY2x1ZGUgPHd0Zi9NYXRoRXh0cmFzLmg+CiAKIG5hbWVzcGFjZSBXZWJL aXQgewogCkBAIC0yMDQsMTIgKzIwNSwxNyBAQCBXZWJXaGVlbEV2ZW50IFdlYkV2ZW50RmFjdG9y eTo6Y3JlYXRlV2ViV2hlZWxFdmVudChjb25zdCBHZGtFdmVudCogZXZlbnQpCiAKIFdlYldoZWVs RXZlbnQgV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJXaGVlbEV2ZW50KGNvbnN0IEdka0V2ZW50 KiBldmVudCwgV2ViV2hlZWxFdmVudDo6UGhhc2UgcGhhc2UsIFdlYldoZWVsRXZlbnQ6OlBoYXNl IG1vbWVudHVtUGhhc2UpCiB7Ci0gICAgRmxvYXRTaXplIHdoZWVsVGlja3MgPSBGbG9hdFNpemUo MCwgMCk7CiAgICAgZG91YmxlIHgsIHk7CiAgICAgZ2RrX2V2ZW50X2dldF9jb29yZHMoZXZlbnQs ICZ4LCAmeSk7CiAgICAgZG91YmxlIHhSb290LCB5Um9vdDsKICAgICBnZGtfZXZlbnRfZ2V0X3Jv b3RfY29vcmRzKGV2ZW50LCAmeFJvb3QsICZ5Um9vdCk7CiAKKyAgICByZXR1cm4gY3JlYXRlV2Vi V2hlZWxFdmVudChldmVudCwgeyBjbGFtcFRvSW50ZWdlcih4KSwgY2xhbXBUb0ludGVnZXIoeSkg fSwgeyBjbGFtcFRvSW50ZWdlcih4Um9vdCksIGNsYW1wVG9JbnRlZ2VyKHlSb290KSB9LCBwaGFz ZSwgbW9tZW50dW1QaGFzZSk7Cit9CisKK1dlYldoZWVsRXZlbnQgV2ViRXZlbnRGYWN0b3J5Ojpj cmVhdGVXZWJXaGVlbEV2ZW50KGNvbnN0IEdka0V2ZW50KiBldmVudCwgY29uc3QgSW50UG9pbnQm IHBvc2l0aW9uLCBjb25zdCBJbnRQb2ludCYgZ2xvYmFsUG9zaXRpb24sIFdlYldoZWVsRXZlbnQ6 OlBoYXNlIHBoYXNlLCBXZWJXaGVlbEV2ZW50OjpQaGFzZSBtb21lbnR1bVBoYXNlKQoreworICAg IE9wdGlvbmFsPEZsb2F0U2l6ZT4gd2hlZWxUaWNrczsKICAgICBHZGtTY3JvbGxEaXJlY3Rpb24g ZGlyZWN0aW9uOwogICAgIGlmICghZ2RrX2V2ZW50X2dldF9zY3JvbGxfZGlyZWN0aW9uKGV2ZW50 LCAmZGlyZWN0aW9uKSkgewogICAgICAgICBkaXJlY3Rpb24gPSBHREtfU0NST0xMX1NNT09USDsK QEAgLTIxOCw3ICsyMjQsNyBAQCBXZWJXaGVlbEV2ZW50IFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRl V2ViV2hlZWxFdmVudChjb25zdCBHZGtFdmVudCogZXZlbnQsIFdlYldoZQogICAgICAgICAgICAg d2hlZWxUaWNrcyA9IEZsb2F0U2l6ZSgtZGVsdGFYLCAtZGVsdGFZKTsKICAgICB9CiAKLSAgICBp ZiAod2hlZWxUaWNrcy5pc1plcm8oKSkgeworICAgIGlmICghd2hlZWxUaWNrcykgewogICAgICAg ICBzd2l0Y2ggKGRpcmVjdGlvbikgewogICAgICAgICBjYXNlIEdES19TQ1JPTExfVVA6CiAgICAg ICAgICAgICB3aGVlbFRpY2tzID0gRmxvYXRTaXplKDAsIDEpOwpAQCAtMjMzLDIyICsyMzksMjEg QEAgV2ViV2hlZWxFdmVudCBXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYldoZWVsRXZlbnQoY29u c3QgR2RrRXZlbnQqIGV2ZW50LCBXZWJXaGUKICAgICAgICAgICAgIHdoZWVsVGlja3MgPSBGbG9h dFNpemUoLTEsIDApOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgR0RLX1NDUk9M TF9TTU9PVEg6CisgICAgICAgICAgICB3aGVlbFRpY2tzID0gRmxvYXRTaXplKDAsIDApOwogICAg ICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICBBU1NFUlRfTk9U X1JFQUNIRUQoKTsKICAgICAgICAgfQogICAgIH0KIAogICAgIC8vIEZJWE1FOiBbR1RLXSBBZGQg YSBzZXR0aW5nIHRvIGNoYW5nZSB0aGUgcGl4ZWxzIHBlciBsaW5lIHVzZWQgZm9yIHNjcm9sbGlu ZwogICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NDgyNgog ICAgIGZsb2F0IHN0ZXAgPSBzdGF0aWNfY2FzdDxmbG9hdD4oU2Nyb2xsYmFyOjpwaXhlbHNQZXJM aW5lU3RlcCgpKTsKLSAgICBGbG9hdFNpemUgZGVsdGEod2hlZWxUaWNrcy53aWR0aCgpICogc3Rl cCwgd2hlZWxUaWNrcy5oZWlnaHQoKSAqIHN0ZXApOworICAgIEZsb2F0U2l6ZSBkZWx0YSh3aGVl bFRpY2tzLT53aWR0aCgpICogc3RlcCwgd2hlZWxUaWNrcy0+aGVpZ2h0KCkgKiBzdGVwKTsKIAog ICAgIHJldHVybiBXZWJXaGVlbEV2ZW50KFdlYkV2ZW50OjpXaGVlbCwKLSAgICAgICAgSW50UG9p bnQoeCwgeSksCi0gICAgICAgIEludFBvaW50KHhSb290LCB5Um9vdCksCisgICAgICAgIHBvc2l0 aW9uLAorICAgICAgICBnbG9iYWxQb3NpdGlvbiwKICAgICAgICAgZGVsdGEsCi0gICAgICAgIHdo ZWVsVGlja3MsCisgICAgICAgIHdoZWVsVGlja3MudmFsdWUoKSwKICAgICAgICAgcGhhc2UsCiAg ICAgICAgIG1vbWVudHVtUGhhc2UsCiAgICAgICAgIFdlYldoZWVsRXZlbnQ6OlNjcm9sbEJ5UGl4 ZWxXaGVlbEV2ZW50LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvZ3RrL1dlYkV2 ZW50RmFjdG9yeS5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvZ3RrL1dlYkV2ZW50RmFjdG9yeS5o CmluZGV4IDU0ZGE4OWU2MDg5My4uYjJkZDQ3ODAzYmM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9ndGsvV2ViRXZlbnRGYWN0b3J5LmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFy ZWQvZ3RrL1dlYkV2ZW50RmFjdG9yeS5oCkBAIC00MSw2ICs0MSw3IEBAIHB1YmxpYzoKICAgICBz dGF0aWMgV2ViTW91c2VFdmVudCBjcmVhdGVXZWJNb3VzZUV2ZW50KGNvbnN0IEdka0V2ZW50Kiwg aW50LCBPcHRpb25hbDxXZWJDb3JlOjpJbnRQb2ludD4pOwogICAgIHN0YXRpYyBXZWJXaGVlbEV2 ZW50IGNyZWF0ZVdlYldoZWVsRXZlbnQoY29uc3QgR2RrRXZlbnQqKTsKICAgICBzdGF0aWMgV2Vi V2hlZWxFdmVudCBjcmVhdGVXZWJXaGVlbEV2ZW50KGNvbnN0IEdka0V2ZW50KiwgV2ViV2hlZWxF dmVudDo6UGhhc2UsIFdlYldoZWVsRXZlbnQ6OlBoYXNlIG1vbWVudHVtUGhhc2UpOworICAgIHN0 YXRpYyBXZWJXaGVlbEV2ZW50IGNyZWF0ZVdlYldoZWVsRXZlbnQoY29uc3QgR2RrRXZlbnQqLCBj b25zdCBXZWJDb3JlOjpJbnRQb2ludCYsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiwgV2ViV2hl ZWxFdmVudDo6UGhhc2UsIFdlYldoZWVsRXZlbnQ6OlBoYXNlIG1vbWVudHVtUGhhc2UpOwogICAg IHN0YXRpYyBXZWJLZXlib2FyZEV2ZW50IGNyZWF0ZVdlYktleWJvYXJkRXZlbnQoY29uc3QgR2Rr RXZlbnQqLCBjb25zdCBTdHJpbmcmLCBib29sIGhhbmRsZWRCeUlucHV0TWV0aG9kLCBPcHRpb25h bDxWZWN0b3I8V2ViQ29yZTo6Q29tcG9zaXRpb25VbmRlcmxpbmU+PiYmLCBPcHRpb25hbDxFZGl0 aW5nUmFuZ2U+JiYsIFZlY3RvcjxTdHJpbmc+JiYgY29tbWFuZHMpOwogI2lmIEVOQUJMRShUT1VD SF9FVkVOVFMpCiAgICAgc3RhdGljIFdlYlRvdWNoRXZlbnQgY3JlYXRlV2ViVG91Y2hFdmVudChj b25zdCBHZGtFdmVudCosIFZlY3RvcjxXZWJQbGF0Zm9ybVRvdWNoUG9pbnQ+JiYpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5j cHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNw cAppbmRleCA1N2E3MDlhMmEzMDIuLjhkYTkyODQ5MzU3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKQEAgLTY5LDYg KzY5LDcgQEAKICNpbmNsdWRlIDxwYWwvc3lzdGVtL1NsZWVwRGlzYWJsZXIuaD4KICNpbmNsdWRl IDx3dGYvQ29tcGlsZXIuaD4KICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgorI2luY2x1ZGUgPHd0 Zi9NYXRoRXh0cmFzLmg+CiAjaW5jbHVkZSA8d3RmL2dsaWIvR1JlZlB0ci5oPgogI2luY2x1ZGUg PHd0Zi9nbGliL1J1bkxvb3BTb3VyY2VQcmlvcml0eS5oPgogI2luY2x1ZGUgPHd0Zi9nbGliL1dU RkdUeXBlLmg+CkBAIC01OTcsMjMgKzU5OCw2IEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdC YXNlRGlzcG9zZShHT2JqZWN0KiBnb2JqZWN0KQogICAgIEdfT0JKRUNUX0NMQVNTKHdlYmtpdF93 ZWJfdmlld19iYXNlX3BhcmVudF9jbGFzcyktPmRpc3Bvc2UoZ29iamVjdCk7CiB9CiAKLXN0YXRp YyB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlQ29uc3RydWN0ZWQoR09iamVjdCogb2JqZWN0KQotewot ICAgIEdfT0JKRUNUX0NMQVNTKHdlYmtpdF93ZWJfdmlld19iYXNlX3BhcmVudF9jbGFzcyktPmNv bnN0cnVjdGVkKG9iamVjdCk7Ci0KLSAgICBHdGtXaWRnZXQqIHZpZXdXaWRnZXQgPSBHVEtfV0lE R0VUKG9iamVjdCk7Ci0gICAgZ3RrX3dpZGdldF9zZXRfY2FuX2ZvY3VzKHZpZXdXaWRnZXQsIFRS VUUpOwotI2lmICFVU0UoR1RLNCkKLSAgICBndGtfZHJhZ19kZXN0X3NldCh2aWV3V2lkZ2V0LCBz dGF0aWNfY2FzdDxHdGtEZXN0RGVmYXVsdHM+KDApLCBudWxscHRyLCAwLAotICAgICAgICBzdGF0 aWNfY2FzdDxHZGtEcmFnQWN0aW9uPihHREtfQUNUSU9OX0NPUFkgfCBHREtfQUNUSU9OX01PVkUg fCBHREtfQUNUSU9OX0xJTksgfCBHREtfQUNUSU9OX1BSSVZBVEUpKTsKLSAgICBndGtfZHJhZ19k ZXN0X3NldF90YXJnZXRfbGlzdCh2aWV3V2lkZ2V0LCBQYXN0ZWJvYXJkSGVscGVyOjpzaW5nbGV0 b24oKS50YXJnZXRMaXN0KCkpOwotI2VuZGlmCi0KLSAgICBXZWJLaXRXZWJWaWV3QmFzZVByaXZh dGUqIHByaXYgPSBXRUJLSVRfV0VCX1ZJRVdfQkFTRShvYmplY3QpLT5wcml2OwotICAgIHByaXYt PnBhZ2VDbGllbnQgPSBtYWtlVW5pcXVlPFBhZ2VDbGllbnRJbXBsPih2aWV3V2lkZ2V0KTsKLSAg ICBwcml2LT5kaWFsb2cgPSBudWxscHRyOwotfQotCiAjaWYgVVNFKEdUSzQpCiB2b2lkIHdlYmtp dFdlYlZpZXdCYXNlU25hcHNob3QoR3RrV2lkZ2V0KiB3aWRnZXQsIEd0a1NuYXBzaG90KiBzbmFw c2hvdCkKIHsKQEAgLTEwMjUsNyArMTAwOSwyMiBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0V2Vi Vmlld0Jhc2VTY3JvbGxFdmVudChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRXZlbnRTY3JvbGwqCiAK ICAgICByZXR1cm4gR0RLX0VWRU5UX1NUT1A7CiB9CisjZW5kaWYKKworI2lmIFVTRShHVEs0KQor c3RhdGljIGdib29sZWFuIHdlYmtpdFdlYlZpZXdCYXNlU2Nyb2xsKFdlYktpdFdlYlZpZXdCYXNl KiB3ZWJWaWV3QmFzZSwgZG91YmxlIHgsIGRvdWJsZSB5LCBHdGtFdmVudENvbnRyb2xsZXIqIGNv bnRyb2xsZXIpCit7CisgICAgaWYgKHdlYlZpZXdCYXNlLT5wcml2LT5kaWFsb2cpCisgICAgICAg IHJldHVybiBHREtfRVZFTlRfUFJPUEFHQVRFOworCisgICAgLy8gRklYTUU6IGludmVydCBheGlz IGluIGNhc2Ugb2YgU0hJRlQuCisgICAgd2ViVmlld0Jhc2UtPnByaXYtPnBhZ2VQcm94eS0+aGFu ZGxlV2hlZWxFdmVudChOYXRpdmVXZWJXaGVlbEV2ZW50KGd0a19ldmVudF9jb250cm9sbGVyX2dl dF9jdXJyZW50X2V2ZW50KGNvbnRyb2xsZXIpLCB7IGNsYW1wVG9JbnRlZ2VyKHgpLCBjbGFtcFRv SW50ZWdlcih5KSB9KSk7CisKKyAgICByZXR1cm4gR0RLX0VWRU5UX1NUT1A7Cit9CisjZW5kaWYK IAorI2lmICFVU0UoR1RLNCkKIHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRXZWJWaWV3QmFzZVBvcHVw TWVudShHdGtXaWRnZXQqIHdpZGdldCkKIHsKICAgICBXZWJLaXRXZWJWaWV3QmFzZSogd2ViVmll d0Jhc2UgPSBXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3aWRnZXQpOwpAQCAtMTUwMyw2ICsxNTAyLDI4 IEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlRGVzdHJveShHdGtXaWRnZXQqIHdpZGdl dCkKICAgICBHVEtfV0lER0VUX0NMQVNTKHdlYmtpdF93ZWJfdmlld19iYXNlX3BhcmVudF9jbGFz cyktPmRlc3Ryb3kod2lkZ2V0KTsKIH0KIAorc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VD b25zdHJ1Y3RlZChHT2JqZWN0KiBvYmplY3QpCit7CisgICAgR19PQkpFQ1RfQ0xBU1Mod2Via2l0 X3dlYl92aWV3X2Jhc2VfcGFyZW50X2NsYXNzKS0+Y29uc3RydWN0ZWQob2JqZWN0KTsKKworICAg IEd0a1dpZGdldCogdmlld1dpZGdldCA9IEdUS19XSURHRVQob2JqZWN0KTsKKyAgICBndGtfd2lk Z2V0X3NldF9jYW5fZm9jdXModmlld1dpZGdldCwgVFJVRSk7CisjaWYgIVVTRShHVEs0KQorICAg IGd0a19kcmFnX2Rlc3Rfc2V0KHZpZXdXaWRnZXQsIHN0YXRpY19jYXN0PEd0a0Rlc3REZWZhdWx0 cz4oMCksIG51bGxwdHIsIDAsCisgICAgICAgIHN0YXRpY19jYXN0PEdka0RyYWdBY3Rpb24+KEdE S19BQ1RJT05fQ09QWSB8IEdES19BQ1RJT05fTU9WRSB8IEdES19BQ1RJT05fTElOSyB8IEdES19B Q1RJT05fUFJJVkFURSkpOworICAgIGd0a19kcmFnX2Rlc3Rfc2V0X3RhcmdldF9saXN0KHZpZXdX aWRnZXQsIFBhc3RlYm9hcmRIZWxwZXI6OnNpbmdsZXRvbigpLnRhcmdldExpc3QoKSk7CisjZW5k aWYKKworICAgIFdlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9IFdFQktJVF9XRUJfVklF V19CQVNFKG9iamVjdCktPnByaXY7CisgICAgcHJpdi0+cGFnZUNsaWVudCA9IG1ha2VVbmlxdWU8 UGFnZUNsaWVudEltcGw+KHZpZXdXaWRnZXQpOworCisjaWYgVVNFKEdUSzQpCisgICAgYXV0byog Y29udHJvbGxlciA9IGd0a19ldmVudF9jb250cm9sbGVyX3Njcm9sbF9uZXcoR1RLX0VWRU5UX0NP TlRST0xMRVJfU0NST0xMX0JPVEhfQVhFUyk7CisgICAgZ19zaWduYWxfY29ubmVjdF9vYmplY3Qo Y29udHJvbGxlciwgInNjcm9sbCIsIEdfQ0FMTEJBQ0sod2Via2l0V2ViVmlld0Jhc2VTY3JvbGwp LCB2aWV3V2lkZ2V0LCBHX0NPTk5FQ1RfU1dBUFBFRCk7CisgICAgZ3RrX3dpZGdldF9hZGRfY29u dHJvbGxlcih2aWV3V2lkZ2V0LCBjb250cm9sbGVyKTsKKyNlbmRpZgorfQorCiBzdGF0aWMgdm9p ZCB3ZWJraXRfd2ViX3ZpZXdfYmFzZV9jbGFzc19pbml0KFdlYktpdFdlYlZpZXdCYXNlQ2xhc3Mq IHdlYmtpdFdlYlZpZXdCYXNlQ2xhc3MpCiB7CiAgICAgR3RrV2lkZ2V0Q2xhc3MqIHdpZGdldENs YXNzID0gR1RLX1dJREdFVF9DTEFTUyh3ZWJraXRXZWJWaWV3QmFzZUNsYXNzKTsK