212321 2020-05-24 05:48:53 -0700 [GTK4] Make inspector work 2020-06-01 02:24:12 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 210100 1 cgarcia webkit-unassigned aperez berto bugs-noreply ews-watchlist gustavo oldest_to_newest 1655700 0 cgarcia 2020-05-24 05:48:53 -0700 And remote inspector as well. 1657615 1 400664 cgarcia 2020-05-30 05:27:28 -0700 Created attachment 400664 Patch 1657616 2 ews-watchlist 2020-05-30 05:28:30 -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 1657851 3 400664 aperez 2020-06-01 01:57:56 -0700 Comment on attachment 400664 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=400664&action=review > Source/WebKit/ChangeLog:11 > + (webkitWebViewBaseDispose): Use specific functions to remve the children. Typo: remve → remove. 1657858 4 cgarcia 2020-06-01 02:24:12 -0700 Committed r262371: <https://trac.webkit.org/changeset/262371> 400664 2020-05-30 05:27:28 -0700 2020-06-01 01:57:56 -0700 Patch wkgtk4-inspector.diff text/plain 12006 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkMGRhMTAyMWMyNDkuLmE3MzM5MjkxMDI1ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE1IEBACisyMDIwLTA1LTMwICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLNF0gTWFrZSBpbnNwZWN0b3Igd29yaworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyMzIxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGd0a19uYXRpdmVf ZGlhbG9nX3J1bigpIGZvciBHVEs0LgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL0d0a1ZlcnNp b25pbmcuaDoKKyAgICAgICAgKGd0a19uYXRpdmVfZGlhbG9nX3J1bik6CisKIDIwMjAtMDUtMjkg IENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtH VEs0XSBNYWtlIFdlYkRyaXZlciB3b3JrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0 a1ZlcnNpb25pbmcuaAppbmRleCBkZmMyZjM5ZjM1MDQuLjhiODgxYjQ1ZDlmYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oCkBAIC0xODgsNiArMTg4LDI1 IEBAIGdka19ldmVudF9nZXRfa2V5Y29kZShjb25zdCBHZGtFdmVudCogZXZlbnQsIGd1aW50MTYq IGtleWNvZGUpCiAgICAgcmV0dXJuIFRSVUU7CiB9CiAKK3N0YXRpYyBpbmxpbmUgaW50CitndGtf bmF0aXZlX2RpYWxvZ19ydW4oR3RrTmF0aXZlRGlhbG9nKiBkaWFsb2cpCit7CisgICAgc3RydWN0 IFJ1bkRpYWxvZ0NvbnRleHQgeworICAgICAgICBHTWFpbkxvb3AgKmxvb3A7CisgICAgICAgIGlu dCByZXNwb25zZTsKKyAgICB9IGNvbnRleHQgPSB7IGdfbWFpbl9sb29wX25ldyhudWxscHRyLCBG QUxTRSksIDAgfTsKKworICAgIGd0a19uYXRpdmVfZGlhbG9nX3Nob3coZGlhbG9nKTsKKyAgICBn X3NpZ25hbF9jb25uZWN0KGRpYWxvZywgInJlc3BvbnNlIiwgR19DQUxMQkFDSygrW10oR3RrTmF0 aXZlRGlhbG9nKiwgaW50IHJlc3BvbnNlLCBSdW5EaWFsb2dDb250ZXh0KiBjb250ZXh0KSB7Cisg ICAgICAgIGNvbnRleHQtPnJlc3BvbnNlID0gcmVzcG9uc2U7CisgICAgICAgIGdfbWFpbl9sb29w X3F1aXQoY29udGV4dC0+bG9vcCk7CisgICAgfSksICZjb250ZXh0KTsKKyAgICBnX21haW5fbG9v cF9ydW4oY29udGV4dC5sb29wKTsKKyAgICBnX21haW5fbG9vcF91bnJlZihjb250ZXh0Lmxvb3Ap OworCisgICAgcmV0dXJuIGNvbnRleHQucmVzcG9uc2U7Cit9CisKICNlbHNlIC8vIFVTRShHVEs0 KQogCiBzdGF0aWMgaW5saW5lIHZvaWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggZDdlZWFhMjgzYzRjLi5hMWJkOTc5 ODdiM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjAtMDUtMzAgIENhcmxvcyBHYXJj aWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEs0XSBNYWtlIGlu c3BlY3RvciB3b3JrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTIzMjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcDoKKyAgICAgICAg KHdlYmtpdFdlYlZpZXdCYXNlUmVtb3ZlRGlhbG9nKTogQWRkZWQgaW5zdGVhZCBvZiB0aGUgZ2Vu ZXJpYyB3ZWJraXRXZWJWaWV3QmFzZVJlbW92ZUNoaWxkIHRoYXQgaGFzIGJlZW4gcmVtb3ZlZC4K KyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlUmVtb3ZlV2ViSW5zcGVjdG9yKTogSnVzdCB1bnBh cmVudCB0aGUgaW5zcGVjdG9yIHZpZXcgaW5zdGVhZCBvZiBjYWxpbmcgd2Via2l0V2ViVmlld0Jh c2VSZW1vdmVDaGlsZC4KKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlRGlzcG9zZSk6IFVzZSBz cGVjaWZpYyBmdW5jdGlvbnMgdG8gcmVtdmUgdGhlIGNoaWxkcmVuLgorICAgICAgICAod2Via2l0 V2ViVmlld0Jhc2VTbmFwc2hvdCk6IENhbGwgZ3RrX3dpZGdldF9zbmFwc2hvdF9jaGlsZCgpIG9u IGluc3BlY3RvciB2aWV3IGlmIHByZXNlbnQuCisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZVJl bW92ZUNoaWxkKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvSW5zcGVjdG9yL2d0ay9S ZW1vdGVXZWJJbnNwZWN0b3JQcm94eUd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVdl Ykluc3BlY3RvclByb3h5OjpwbGF0Zm9ybVNhdmUpOiBSZW1vdmUgR1RLNCBpZmRlZnMuCisgICAg ICAgICogVUlQcm9jZXNzL0luc3BlY3Rvci9ndGsvV2ViSW5zcGVjdG9yUHJveHlHdGsuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZvcm1TYXZlKTogRGl0dG8u CisgICAgICAgICogVUlQcm9jZXNzL0luc3BlY3Rvci9ndGsvV2ViS2l0SW5zcGVjdG9yV2luZG93 LmNwcDoKKyAgICAgICAgKHdlYmtpdF9pbnNwZWN0b3Jfd2luZG93X2luaXQpOiBTaG93IHRpdGxl IGJ1dHRvbnMgaW4gaW5zcGVjdG9yIHdpbmRvdy4KKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL0Fj Y2VsZXJhdGVkQmFja2luZ1N0b3JlV2F5bGFuZC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkFjY2Vs ZXJhdGVkQmFja2luZ1N0b3JlV2F5bGFuZDo6c25hcHNob3QpOiBVc2UgdGhlIHRleHR1cmUgc2l6 ZSBpbnN0ZWFkIG9mIHRoZSB2aWV3IHNpemUsIHNpbmNlIGl0J3MKKyAgICAgICAgZGlmZmVyZW50 IHdoZW4gdGhlIGluc3BlY3RvciBpcyBhdHRhY2hlZC4KKwogMjAyMC0wNS0yOSAgQ2FybG9zIEdh cmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUSzRdIE1ha2Ug V2ViRHJpdmVyIHdvcmsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKaW5kZXggZTEzNzA0NjU0NjYwLi4yZDE1ZjQzM2QxZmEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmll d0Jhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vi Vmlld0Jhc2UuY3BwCkBAIC01ODMsMjYgKzU4MywxOCBAQCB2b2lkIHdlYmtpdFdlYlZpZXdCYXNl QWRkRGlhbG9nKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3QmFzZSwgR3RrV2lkZ2V0KiBkaWFs bwogfQogCiAjaWYgVVNFKEdUSzQpCi1zdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVJlbW92 ZUNoaWxkKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3QmFzZSwgR3RrV2lkZ2V0KiB3aWRnZXQp CitzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVJlbW92ZURpYWxvZyhXZWJLaXRXZWJWaWV3 QmFzZSogd2ViVmlld0Jhc2UsIEd0a1dpZGdldCogZGlhbG9nKQogewotICAgIGlmICghd2lkZ2V0 KQotICAgICAgICByZXR1cm47Ci0KICAgICBXZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUqIHByaXYg PSB3ZWJWaWV3QmFzZS0+cHJpdjsKLSAgICBpZiAocHJpdi0+aW5zcGVjdG9yVmlldyA9PSB3aWRn ZXQpIHsKLSAgICAgICAgcHJpdi0+aW5zcGVjdG9yVmlldyA9IG51bGxwdHI7Ci0gICAgICAgIHBy aXYtPmluc3BlY3RvclZpZXdTaXplID0gMDsKLSAgICB9IGVsc2UgaWYgKHByaXYtPmRpYWxvZyA9 PSB3aWRnZXQpIHsKLSAgICAgICAgZ19vYmplY3RfcmVtb3ZlX3dlYWtfcG9pbnRlcihHX09CSkVD VCh3aWRnZXQpLCByZWludGVycHJldF9jYXN0PHZvaWQqKj4oJnByaXYtPmRpYWxvZykpOwotICAg ICAgICBwcml2LT5kaWFsb2cgPSBudWxscHRyOwotICAgIH0gZWxzZSBpZiAocHJpdi0+a2V5Qmlu ZGluZ1RyYW5zbGF0b3Iud2lkZ2V0KCkgPT0gd2lkZ2V0KQotICAgICAgICBwcml2LT5rZXlCaW5k aW5nVHJhbnNsYXRvci5pbnZhbGlkYXRlKCk7Ci0gICAgZWxzZQotICAgICAgICBSRUxFQVNFX0FT U0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIGlmICghcHJpdi0+ZGlhbG9nKQorICAgICAgICByZXR1 cm47CiAKLSAgICBndGtfd2lkZ2V0X3VucGFyZW50KHdpZGdldCk7CisgICAgZ19vYmplY3RfcmVt b3ZlX3dlYWtfcG9pbnRlcihHX09CSkVDVChkaWFsb2cpLCByZWludGVycHJldF9jYXN0PHZvaWQq Kj4oJnByaXYtPmRpYWxvZykpOworICAgIGdfY2xlYXJfcG9pbnRlcigmcHJpdi0+ZGlhbG9nLCBn dGtfd2lkZ2V0X3VucGFyZW50KTsKIH0KLSNlbHNlCisjZW5kaWYKKworI2lmICFVU0UoR1RLNCkK IHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlQ29udGFpbmVyUmVtb3ZlKEd0a0NvbnRhaW5l ciogY29udGFpbmVyLCBHdGtXaWRnZXQqIHdpZGdldCkKIHsKICAgICBXZWJLaXRXZWJWaWV3QmFz ZSogd2ViVmlldyA9IFdFQktJVF9XRUJfVklFV19CQVNFKGNvbnRhaW5lcik7CkBAIC02ODIsNyAr Njc0LDcgQEAgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVJlbW92ZVdlYkluc3BlY3RvcihXZWJLaXRX ZWJWaWV3QmFzZSogd2ViVmlld0Jhc2UsIEd0a1dpZGcKICAgICAgICAgcmV0dXJuOwogCiAjaWYg VVNFKEdUSzQpCi0gICAgd2Via2l0V2ViVmlld0Jhc2VSZW1vdmVDaGlsZCh3ZWJWaWV3QmFzZSwg aW5zcGVjdG9yKTsKKyAgICBnX2NsZWFyX3BvaW50ZXIoJndlYlZpZXdCYXNlLT5wcml2LT5pbnNw ZWN0b3JWaWV3LCBndGtfd2lkZ2V0X3VucGFyZW50KTsKICNlbHNlCiAgICAgZ3RrX2NvbnRhaW5l cl9yZW1vdmUoR1RLX0NPTlRBSU5FUih3ZWJWaWV3QmFzZSksIGluc3BlY3Rvcik7CiAjZW5kaWYK QEAgLTcwMCw5ICs2OTIsMTAgQEAgc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VEaXNwb3Nl KEdPYmplY3QqIGdvYmplY3QpCiB7CiAgICAgV2ViS2l0V2ViVmlld0Jhc2UqIHdlYlZpZXcgPSBX RUJLSVRfV0VCX1ZJRVdfQkFTRShnb2JqZWN0KTsKICNpZiBVU0UoR1RLNCkKLSAgICB3ZWJraXRX ZWJWaWV3QmFzZVJlbW92ZUNoaWxkKHdlYlZpZXcsIHdlYlZpZXctPnByaXYtPmRpYWxvZyk7Ci0g ICAgd2Via2l0V2ViVmlld0Jhc2VSZW1vdmVDaGlsZCh3ZWJWaWV3LCB3ZWJWaWV3LT5wcml2LT5p bnNwZWN0b3JWaWV3KTsKLSAgICB3ZWJraXRXZWJWaWV3QmFzZVJlbW92ZUNoaWxkKHdlYlZpZXcs IHdlYlZpZXctPnByaXYtPmtleUJpbmRpbmdUcmFuc2xhdG9yLndpZGdldCgpKTsKKyAgICB3ZWJr aXRXZWJWaWV3QmFzZVJlbW92ZURpYWxvZyh3ZWJWaWV3LCB3ZWJWaWV3LT5wcml2LT5kaWFsb2cp OworICAgIHdlYmtpdFdlYlZpZXdCYXNlUmVtb3ZlV2ViSW5zcGVjdG9yKHdlYlZpZXcsIHdlYlZp ZXctPnByaXYtPmluc3BlY3RvclZpZXcpOworICAgIGlmIChhdXRvKiB3aWRnZXQgPSB3ZWJWaWV3 LT5wcml2LT5rZXlCaW5kaW5nVHJhbnNsYXRvci53aWRnZXQoKSkKKyAgICAgICAgZ3RrX3dpZGdl dF91bnBhcmVudCh3aWRnZXQpOwogI2Vsc2UKICAgICBnX2NsZWFyX3BvaW50ZXIoJndlYlZpZXct PnByaXYtPmRpYWxvZywgZ3RrX3dpZGdldF9kZXN0cm95KTsKICNlbmRpZgpAQCAtNzQxLDYgKzcz NCw5IEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlU25hcHNob3QoR3RrV2lkZ2V0KiB3 aWRnZXQsIEd0a1NuYXBzaG90KiBzbmFwc2hvdCkKICAgICBBU1NFUlQoZHJhd2luZ0FyZWEtPmlz SW5BY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpKTsKICAgICB3ZWJWaWV3QmFzZS0+cHJpdi0+ YWNjZWxlcmF0ZWRCYWNraW5nU3RvcmUtPnNuYXBzaG90KHNuYXBzaG90KTsKIAorICAgIGlmICh3 ZWJWaWV3QmFzZS0+cHJpdi0+aW5zcGVjdG9yVmlldykKKyAgICAgICAgZ3RrX3dpZGdldF9zbmFw c2hvdF9jaGlsZCh3aWRnZXQsIHdlYlZpZXdCYXNlLT5wcml2LT5pbnNwZWN0b3JWaWV3LCBzbmFw c2hvdCk7CisKICAgICBpZiAod2ViVmlld0Jhc2UtPnByaXYtPmRpYWxvZykKICAgICAgICAgZ3Rr X3dpZGdldF9zbmFwc2hvdF9jaGlsZCh3aWRnZXQsIHdlYlZpZXdCYXNlLT5wcml2LT5kaWFsb2cs IHNuYXBzaG90KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3Bl Y3Rvci9ndGsvUmVtb3RlV2ViSW5zcGVjdG9yUHJveHlHdGsuY3BwIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvSW5zcGVjdG9yL2d0ay9SZW1vdGVXZWJJbnNwZWN0b3JQcm94eUd0ay5jcHAKaW5k ZXggM2YzZjQ4MDkyZTQ5Li43NzhhMzljODE1YmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0luc3BlY3Rvci9ndGsvUmVtb3RlV2ViSW5zcGVjdG9yUHJveHlHdGsuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rvci9ndGsvUmVtb3RlV2ViSW5zcGVj dG9yUHJveHlHdGsuY3BwCkBAIC0xMjAsMTMgKzEyMCwxNCBAQCBzdGF0aWMgdm9pZCByZW1vdGVG aWxlUmVwbGFjZUNvbnRlbnRzQ2FsbGJhY2soR09iamVjdCogc291cmNlT2JqZWN0LCBHQXN5bmNS ZXN1bAogdm9pZCBSZW1vdGVXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZvcm1TYXZlKGNvbnN0IFN0 cmluZyYgc3VnZ2VzdGVkVVJMLCBjb25zdCBTdHJpbmcmIGNvbnRlbnQsIGJvb2wgYmFzZTY0RW5j b2RlZCwgYm9vbCBmb3JjZVNhdmVEaWFsb2cpCiB7CiAgICAgVU5VU0VEX1BBUkFNKGZvcmNlU2F2 ZURpYWxvZyk7Ci0jaWYgIVVTRShHVEs0KQogCiAgICAgR1JlZlB0cjxHdGtGaWxlQ2hvb3Nlck5h dGl2ZT4gZGlhbG9nID0gYWRvcHRHUmVmKGd0a19maWxlX2Nob29zZXJfbmF0aXZlX25ldygiU2F2 ZSBGaWxlIiwKICAgICAgICAgR1RLX1dJTkRPVyhtX3dpbmRvdyksIEdUS19GSUxFX0NIT09TRVJf QUNUSU9OX1NBVkUsICJTYXZlIiwgIkNhbmNlbCIpKTsKIAogICAgIEd0a0ZpbGVDaG9vc2VyKiBj aG9vc2VyID0gR1RLX0ZJTEVfQ0hPT1NFUihkaWFsb2cuZ2V0KCkpOworI2lmICFVU0UoR1RLNCkK ICAgICBndGtfZmlsZV9jaG9vc2VyX3NldF9kb19vdmVyd3JpdGVfY29uZmlybWF0aW9uKGNob29z ZXIsIFRSVUUpOworI2VuZGlmCiAKICAgICAvLyBTb21lIGluc3BlY3RvciB2aWV3cyAoQXVkaXRz IGZvciBpbnN0YW5jZSkgdXNlIGEgY3VzdG9tIFVSSSBzY2hlbWUsIHN1Y2gKICAgICAvLyBhcyB3 ZWItaW5zcGVjdG9yLiBTbyB3ZSBjYW4ndCByZWx5IG9uIHRoZSBVUkwgYmVpbmcgYSB2YWxpZCBm aWxlOi8vLyBVUkwKQEAgLTE1Myw3ICsxNTQsNiBAQCB2b2lkIFJlbW90ZVdlYkluc3BlY3RvclBy b3h5OjpwbGF0Zm9ybVNhdmUoY29uc3QgU3RyaW5nJiBzdWdnZXN0ZWRVUkwsIGNvbnN0IFN0cgog ICAgIEdVbmlxdWVQdHI8Y2hhcj4gcGF0aChnX2ZpbGVfZ2V0X3BhdGgoZmlsZS5nZXQoKSkpOwog ICAgIGdfZmlsZV9yZXBsYWNlX2NvbnRlbnRzX2FzeW5jKGZpbGUuZ2V0KCksIGRhdGEsIGRhdGFM ZW5ndGgsIG51bGxwdHIsIGZhbHNlLAogICAgICAgICBHX0ZJTEVfQ1JFQVRFX1JFUExBQ0VfREVT VElOQVRJT04sIG51bGxwdHIsIHJlbW90ZUZpbGVSZXBsYWNlQ29udGVudHNDYWxsYmFjaywgbV9p bnNwZWN0b3JQYWdlKTsKLSNlbmRpZgogfQogCiB2b2lkIFJlbW90ZVdlYkluc3BlY3RvclByb3h5 OjpwbGF0Zm9ybUFwcGVuZChjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL2d0ay9XZWJJbnNwZWN0b3JQcm94 eUd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9JbnNwZWN0b3IvZ3RrL1dlYkluc3Bl Y3RvclByb3h5R3RrLmNwcAppbmRleCA0NzllMDJjZGRjZTEuLmY0MWNhNDRlYjJkNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL2d0ay9XZWJJbnNwZWN0b3JQ cm94eUd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL2d0ay9X ZWJJbnNwZWN0b3JQcm94eUd0ay5jcHAKQEAgLTQ5NCw3ICs0OTQsNyBAQCBzdGF0aWMgdm9pZCBm aWxlUmVwbGFjZUNvbnRlbnRzQ2FsbGJhY2soR09iamVjdCogc291cmNlT2JqZWN0LCBHQXN5bmNS ZXN1bHQqIHJlcwogdm9pZCBXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZvcm1TYXZlKGNvbnN0IFN0 cmluZyYgc3VnZ2VzdGVkVVJMLCBjb25zdCBTdHJpbmcmIGNvbnRlbnQsIGJvb2wgYmFzZTY0RW5j b2RlZCwgYm9vbCBmb3JjZVNhdmVEaWFsb2cpCiB7CiAgICAgVU5VU0VEX1BBUkFNKGZvcmNlU2F2 ZURpYWxvZyk7Ci0jaWYgIVVTRShHVEs0KQorCiAgICAgR3RrV2lkZ2V0KiBwYXJlbnQgPSBndGtf d2lkZ2V0X2dldF90b3BsZXZlbChtX2luc3BlY3RvclZpZXcpOwogICAgIGlmICghV2ViQ29yZTo6 d2lkZ2V0SXNPbnNjcmVlblRvcGxldmVsV2luZG93KHBhcmVudCkpCiAgICAgICAgIHJldHVybjsK QEAgLTUwMyw3ICs1MDMsOSBAQCB2b2lkIFdlYkluc3BlY3RvclByb3h5OjpwbGF0Zm9ybVNhdmUo Y29uc3QgU3RyaW5nJiBzdWdnZXN0ZWRVUkwsIGNvbnN0IFN0cmluZyYgYwogICAgICAgICBHVEtf V0lORE9XKHBhcmVudCksIEdUS19GSUxFX0NIT09TRVJfQUNUSU9OX1NBVkUsICJTYXZlIiwgIkNh bmNlbCIpKTsKIAogICAgIEd0a0ZpbGVDaG9vc2VyKiBjaG9vc2VyID0gR1RLX0ZJTEVfQ0hPT1NF UihkaWFsb2cuZ2V0KCkpOworI2lmICFVU0UoR1RLNCkKICAgICBndGtfZmlsZV9jaG9vc2VyX3Nl dF9kb19vdmVyd3JpdGVfY29uZmlybWF0aW9uKGNob29zZXIsIFRSVUUpOworI2VuZGlmCiAKICAg ICAvLyBTb21lIGluc3BlY3RvciB2aWV3cyAoQXVkaXRzIGZvciBpbnN0YW5jZSkgdXNlIGEgY3Vz dG9tIFVSSSBzY2hlbWUsIHN1Y2gKICAgICAvLyBhcyB3ZWItaW5zcGVjdG9yLiBTbyB3ZSBjYW4n dCByZWx5IG9uIHRoZSBVUkwgYmVpbmcgYSB2YWxpZCBmaWxlOi8vLyBVUkwKQEAgLTUzMCw3ICs1 MzIsNiBAQCB2b2lkIFdlYkluc3BlY3RvclByb3h5OjpwbGF0Zm9ybVNhdmUoY29uc3QgU3RyaW5n JiBzdWdnZXN0ZWRVUkwsIGNvbnN0IFN0cmluZyYgYwogICAgIEdVbmlxdWVQdHI8Y2hhcj4gcGF0 aChnX2ZpbGVfZ2V0X3BhdGgoZmlsZS5nZXQoKSkpOwogICAgIGdfZmlsZV9yZXBsYWNlX2NvbnRl bnRzX2FzeW5jKGZpbGUuZ2V0KCksIGRhdGEsIGRhdGFMZW5ndGgsIG51bGxwdHIsIGZhbHNlLAog ICAgICAgICBHX0ZJTEVfQ1JFQVRFX1JFUExBQ0VfREVTVElOQVRJT04sIG51bGxwdHIsIGZpbGVS ZXBsYWNlQ29udGVudHNDYWxsYmFjaywgbV9pbnNwZWN0b3JQYWdlKTsKLSNlbmRpZgogfQogCiB2 b2lkIFdlYkluc3BlY3RvclByb3h5OjpwbGF0Zm9ybUFwcGVuZChjb25zdCBTdHJpbmcmLCBjb25z dCBTdHJpbmcmKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9y L2d0ay9XZWJLaXRJbnNwZWN0b3JXaW5kb3cuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv SW5zcGVjdG9yL2d0ay9XZWJLaXRJbnNwZWN0b3JXaW5kb3cuY3BwCmluZGV4IGYwMDIwY2Y2NjBj Mi4uZWNkMjZhYmJiNDNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9JbnNw ZWN0b3IvZ3RrL1dlYktpdEluc3BlY3RvcldpbmRvdy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvSW5zcGVjdG9yL2d0ay9XZWJLaXRJbnNwZWN0b3JXaW5kb3cuY3BwCkBAIC03Niw2 ICs3Niw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9pbnNwZWN0b3Jfd2luZG93X2luaXQoV2ViS2l0 SW5zcGVjdG9yV2luZG93KiB3aW5kb3cpCiAgICAgZ3RrX3dpZGdldF9oaWRlKHdpbmRvdy0+c3Vi dGl0bGVMYWJlbCk7CiAKICAgICBndGtfaGVhZGVyX2Jhcl9zZXRfdGl0bGVfd2lkZ2V0KEdUS19I RUFERVJfQkFSKHdpbmRvdy0+aGVhZGVyQmFyKSwgYm94KTsKKyAgICBndGtfaGVhZGVyX2Jhcl9z ZXRfc2hvd190aXRsZV9idXR0b25zKEdUS19IRUFERVJfQkFSKHdpbmRvdy0+aGVhZGVyQmFyKSwg VFJVRSk7CiAjZWxzZQogICAgIGd0a19oZWFkZXJfYmFyX3NldF90aXRsZShHVEtfSEVBREVSX0JB Uih3aW5kb3ctPmhlYWRlckJhciksIF8oIldlYiBJbnNwZWN0b3IiKSk7CiAgICAgZ3RrX2hlYWRl cl9iYXJfc2V0X3Nob3dfY2xvc2VfYnV0dG9uKEdUS19IRUFERVJfQkFSKHdpbmRvdy0+aGVhZGVy QmFyKSwgVFJVRSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvQWNj ZWxlcmF0ZWRCYWNraW5nU3RvcmVXYXlsYW5kLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2d0ay9BY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVdheWxhbmQuY3BwCmluZGV4IDAwYmNjNmNiMmJk ZS4uYzA2ZGRhYmU5MjYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsv QWNjZWxlcmF0ZWRCYWNraW5nU3RvcmVXYXlsYW5kLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9ndGsvQWNjZWxlcmF0ZWRCYWNraW5nU3RvcmVXYXlsYW5kLmNwcApAQCAtMzcyLDE4 ICszNzIsMTYgQEAgdm9pZCBBY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVdheWxhbmQ6OnNuYXBzaG90 KEd0a1NuYXBzaG90KiBndGtTbmFwc2hvdCkKICAgICBpZiAoIXRyeUVuc3VyZVRleHR1cmUodGV4 dHVyZSwgdGV4dHVyZVNpemUpKQogICAgICAgICByZXR1cm47CiAKLSAgICBGbG9hdFNpemUgdmll d1NpemUoZ3RrX3dpZGdldF9nZXRfd2lkdGgobV93ZWJQYWdlLnZpZXdXaWRnZXQoKSksIGd0a193 aWRnZXRfZ2V0X2hlaWdodChtX3dlYlBhZ2Uudmlld1dpZGdldCgpKSk7CisgICAgZ3JhcGhlbmVf cmVjdF90IGJvdW5kcyA9IEdSQVBIRU5FX1JFQ1RfSU5JVCgwLCAwLCBzdGF0aWNfY2FzdDxmbG9h dD4odGV4dHVyZVNpemUud2lkdGgoKSksIHN0YXRpY19jYXN0PGZsb2F0Pih0ZXh0dXJlU2l6ZS5o ZWlnaHQoKSkpOwogICAgIGlmIChtX2dka0dMQ29udGV4dCkgewogICAgICAgICBHUmVmUHRyPEdk a1RleHR1cmU+IGdka1RleHR1cmUgPSBhZG9wdEdSZWYoZ2RrX2dsX3RleHR1cmVfbmV3KG1fZ2Rr R0xDb250ZXh0LmdldCgpLCB0ZXh0dXJlLCB0ZXh0dXJlU2l6ZS53aWR0aCgpLCB0ZXh0dXJlU2l6 ZS5oZWlnaHQoKSwgbnVsbHB0ciwgbnVsbHB0cikpOwotICAgICAgICBncmFwaGVuZV9yZWN0X3Qg cmVjdCA9IEdSQVBIRU5FX1JFQ1RfSU5JVCgwLCAwLCB2aWV3U2l6ZS53aWR0aCgpLCB2aWV3U2l6 ZS5oZWlnaHQoKSk7Ci0gICAgICAgIGd0a19zbmFwc2hvdF9hcHBlbmRfdGV4dHVyZShndGtTbmFw c2hvdCwgZ2RrVGV4dHVyZS5nZXQoKSwgJnJlY3QpOworICAgICAgICBndGtfc25hcHNob3RfYXBw ZW5kX3RleHR1cmUoZ3RrU25hcHNob3QsIGdka1RleHR1cmUuZ2V0KCksICZib3VuZHMpOwogICAg ICAgICByZXR1cm47CiAgICAgfQogCiAgICAgZG93bmxvYWRUZXh0dXJlKHRleHR1cmUsIHRleHR1 cmVTaXplKTsKIAotICAgIGdyYXBoZW5lX3JlY3RfdCByZWN0ID0gR1JBUEhFTkVfUkVDVF9JTklU KDAsIDAsIHZpZXdTaXplLndpZHRoKCksIHZpZXdTaXplLmhlaWdodCgpKTsKLSAgICBSZWZQdHI8 Y2Fpcm9fdD4gY3IgPSBhZG9wdFJlZihndGtfc25hcHNob3RfYXBwZW5kX2NhaXJvKGd0a1NuYXBz aG90LCAmcmVjdCkpOworICAgIFJlZlB0cjxjYWlyb190PiBjciA9IGFkb3B0UmVmKGd0a19zbmFw c2hvdF9hcHBlbmRfY2Fpcm8oZ3RrU25hcHNob3QsICZib3VuZHMpKTsKIAogICAgIC8vIFRoZSBj b21wb3NpdG9yIHJlbmRlcnMgdGhlIHRleHR1cmUgZmxpcHBlZCBmb3IgZ2RrLCBmaXggdGhhdCBo ZXJlLgogICAgIGNhaXJvX21hdHJpeF90IHRyYW5zZm9ybTsK