212316 2020-05-24 05:42:53 -0700 [GTK4] Make WebDriver work 2020-06-12 01:20:05 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 212465 210100 1 cgarcia webkit-unassigned aperez bugs-noreply oldest_to_newest 1655695 0 cgarcia 2020-05-24 05:42:53 -0700 We need to synthesize events without creating GdkEVents, since that's no longer possible in GTK4 1657233 1 400576 cgarcia 2020-05-29 06:08:16 -0700 Created attachment 400576 Patch 1661877 2 cgarcia 2020-06-12 01:20:05 -0700 Committed r262936: <https://trac.webkit.org/changeset/262936> 400576 2020-05-29 06:08:16 -0700 2020-06-12 00:33:02 -0700 Patch wd-gtk4.diff text/plain 15205 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2M2Q1ZjU3MWE0MDUuLmQwZGExMDIxYzI0OSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDIyIEBACisyMDIwLTA1LTI5ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLNF0gTWFrZSBXZWJEcml2ZXIgd29yaworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyMzE2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGhlbHBlciBndGsg ZGVmaW5pdGlvbnMgdG8gYXZvaWQgaWZkZWZzIGFuZCBpbXBsZW1lbnQgY3VycmVudFNjcmVlbk1v bml0b3IoKSBmb3IgR1RLNC4KKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5n Lmg6CisgICAgICAgIChndGtfd2luZG93X21vdmUpOgorICAgICAgICAoZ3RrX3dpbmRvd19taW5p bWl6ZSk6CisgICAgICAgIChndGtfd2luZG93X3VubWluaW1pemUpOgorICAgICAgICAqIHBsYXRm b3JtL2d0ay9QbGF0Zm9ybVNjcmVlbkd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjdXJyZW50 U2NyZWVuTW9uaXRvcik6CisgICAgICAgIChXZWJDb3JlOjpzY3JlZW5SZWN0KToKKyAgICAgICAg KFdlYkNvcmU6OnNjcmVlbkF2YWlsYWJsZVJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6Z2V0Q3Vy cmVudFNjcmVlbk1vbml0b3IpOiBEZWxldGVkLgorCiAyMDIwLTA1LTI3ICBDYXJsb3MgR2FyY2lh IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLNF0gSW1wbGVtZW50 IHNjcmlwdCBkaWFsb2dzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsv R3RrVmVyc2lvbmluZy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25p bmcuaAppbmRleCAyYmYxNzA2MWM4MjcuLmRmYzJmMzlmMzUwNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oCkBAIC01Nyw2ICs1NywxMSBAQCBndGtfd2lu ZG93X2dldF9wb3NpdGlvbihHdGtXaW5kb3cqLCBpbnQqIHgsIGludCogeSkKICAgICAqeCA9ICp5 ID0gMDsKIH0KIAorc3RhdGljIGlubGluZSB2b2lkCitndGtfd2luZG93X21vdmUoR3RrV2luZG93 KiwgaW50LCBpbnQpCit7Cit9CisKIHN0YXRpYyBpbmxpbmUgdm9pZAogZ3RrX2luaXQoaW50Kiwg Y2hhcioqKikKIHsKQEAgLTE5MSw0ICsxOTYsMTYgQEAgZ3RrX3dpZGdldF9hZGRfY3NzX2NsYXNz KEd0a1dpZGdldCogd2lkZ2V0LCBjb25zdCBjaGFyKiBuYW1lKQogICAgIGd0a19zdHlsZV9jb250 ZXh0X2FkZF9jbGFzcyhndGtfd2lkZ2V0X2dldF9zdHlsZV9jb250ZXh0KHdpZGdldCksIG5hbWUp OwogfQogCitzdGF0aWMgaW5saW5lIHZvaWQKK2d0a193aW5kb3dfbWluaW1pemUoR3RrV2luZG93 KiB3aW5kb3cpCit7CisgICAgZ3RrX3dpbmRvd19pY29uaWZ5KHdpbmRvdyk7Cit9CisKK3N0YXRp YyBpbmxpbmUgdm9pZAorZ3RrX3dpbmRvd191bm1pbmltaXplKEd0a1dpbmRvdyogd2luZG93KQor eworICAgIGd0a193aW5kb3dfZGVpY29uaWZ5KHdpbmRvdyk7Cit9CisKICNlbmRpZiAvLyBVU0Uo R1RLNCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QbGF0Zm9ybVNj cmVlbkd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5H dGsuY3BwCmluZGV4IDA1MmNjNGM1YTg1Ny4uMjNmMTk5YjQyNTc2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QbGF0Zm9ybVNjcmVlbkd0ay5jcHAKQEAgLTE2OCwxNSAr MTY4LDE1IEBAIHZvaWQgc2V0U2NyZWVuRFBJT2JzZXJ2ZXJIYW5kbGVyKEZ1bmN0aW9uPHZvaWQo KT4mJiBoYW5kbGVyLCB2b2lkKiBjb250ZXh0KQogICAgIH0KIH0KIAotR2RrTW9uaXRvciogZ2V0 Q3VycmVudFNjcmVlbk1vbml0b3IoKQorc3RhdGljIEdSZWZQdHI8R2RrTW9uaXRvcj4gY3VycmVu dFNjcmVlbk1vbml0b3IoKQogewotI2lmIFVTRShHVEs0KQotICAgIHJldHVybiBudWxscHRyOwot I2Vsc2UKICAgICBHZGtEaXNwbGF5KiBkaXNwbGF5ID0gZ2RrX2Rpc3BsYXlfZ2V0X2RlZmF1bHQo KTsKICAgICBpZiAoIWRpc3BsYXkpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCisjaWYgVVNF KEdUSzQpCisgICAgcmV0dXJuIGFkb3B0R1JlZihzdGF0aWNfY2FzdDxHZGtNb25pdG9yKj4oZ19s aXN0X21vZGVsX2dldF9pdGVtKGdka19kaXNwbGF5X2dldF9tb25pdG9ycyhkaXNwbGF5KSwgMCkp KTsKKyNlbHNlCiAgICAgYXV0byogcm9vdFdpbmRvdyA9IGdka19nZXRfZGVmYXVsdF9yb290X3dp bmRvdygpOwogICAgIGlmICghcm9vdFdpbmRvdykKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CkBA IC0xOTAsMjQgKzE5MCwyMyBAQCBGbG9hdFJlY3Qgc2NyZWVuUmVjdChXaWRnZXQqKQogewogICAg IEdka1JlY3RhbmdsZSBnZW9tZXRyeTsKIAotICAgIGF1dG8qIG1vbml0b3IgPSBnZXRDdXJyZW50 U2NyZWVuTW9uaXRvcigpOworICAgIGF1dG8gbW9uaXRvciA9IGN1cnJlbnRTY3JlZW5Nb25pdG9y KCk7CiAgICAgaWYgKCFtb25pdG9yKQogICAgICAgICByZXR1cm4geyB9OwogCi0gICAgZ2RrX21v bml0b3JfZ2V0X2dlb21ldHJ5KG1vbml0b3IsICZnZW9tZXRyeSk7CisgICAgZ2RrX21vbml0b3Jf Z2V0X2dlb21ldHJ5KG1vbml0b3IuZ2V0KCksICZnZW9tZXRyeSk7CiAKICAgICByZXR1cm4gRmxv YXRSZWN0KGdlb21ldHJ5LngsIGdlb21ldHJ5LnksIGdlb21ldHJ5LndpZHRoLCBnZW9tZXRyeS5o ZWlnaHQpOwogfQogCiBGbG9hdFJlY3Qgc2NyZWVuQXZhaWxhYmxlUmVjdChXaWRnZXQqKQogewot ICAgIEdka1JlY3RhbmdsZSB3b3JrQXJlYTsKLQotICAgIGF1dG8qIG1vbml0b3IgPSBnZXRDdXJy ZW50U2NyZWVuTW9uaXRvcigpOworICAgIGF1dG8gbW9uaXRvciA9IGN1cnJlbnRTY3JlZW5Nb25p dG9yKCk7CiAgICAgaWYgKCFtb25pdG9yKQogICAgICAgICByZXR1cm4geyB9OwogCi0gICAgZ2Rr X21vbml0b3JfZ2V0X3dvcmthcmVhKG1vbml0b3IsICZ3b3JrQXJlYSk7CisgICAgR2RrUmVjdGFu Z2xlIHdvcmtBcmVhOworICAgIGdka19tb25pdG9yX2dldF93b3JrYXJlYShtb25pdG9yLmdldCgp LCAmd29ya0FyZWEpOwogCiAgICAgcmV0dXJuIEZsb2F0UmVjdCh3b3JrQXJlYS54LCB3b3JrQXJl YS55LCB3b3JrQXJlYS53aWR0aCwgd29ya0FyZWEuaGVpZ2h0KTsKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMDli ZWM4Y2NkZDExLi5kN2VlYWEyODNjNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjAt MDUtMjkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAg ICAgIFtHVEs0XSBNYWtlIFdlYkRyaXZlciB3b3JrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTIzMTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBGaXggVUlDbGllbnQ6OnNldFdpbmRvd0ZyYW1lIHRvIHdh aXQgZm9yIHN1cmZhY2Ugc2l6ZS1jaGFuZ2VkIHNpZ25hbCBhZnRlciByZXNpemluZyB0aGUgd2lu ZG93IGFuZCBpbXBsZW1lbnQKKyAgICAgICAgbWF4aW1pemUsIG1pbmltaXplIGFuZCByZXN0b3Jl IHdpbmRvd3MgZm9yIEdUSzQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0 VUlDbGllbnQuY3BwOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdH dGsuY3BwOgorICAgICAgICAoc3VyZmFjZVN0YXRlQ2hhbmdlZENhbGxiYWNrKToKKyAgICAgICAg KHdlYmtpdFdlYlZpZXdNb25pdG9yV2luZG93U3RhdGUpOgorICAgICAgICAod2Via2l0V2ViVmll d01heGltaXplV2luZG93KToKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdNaW5pbWl6ZVdpbmRvdyk6 CisgICAgICAgICh3ZWJraXRXZWJWaWV3UmVzdG9yZVdpbmRvdyk6CisKIDIwMjAtMDUtMjcgIENh cmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEs0 XSBJbXBsZW1lbnQgSFRUUCBhdXRoIGRpYWxvZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0VUlDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL2dsaWIvV2ViS2l0VUlDbGllbnQuY3BwCmluZGV4IDA3ZGE5NjEzOGRiMS4uMzcz MTcxYjY4ZjdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9X ZWJLaXRVSUNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIv V2ViS2l0VUlDbGllbnQuY3BwCkBAIC0yMDAsOCArMjAwLDEzIEBAIHByaXZhdGU6CiAgICAgICAg ICAgICBpZiAoIW5lZWRzTW92ZSAmJiAhbmVlZHNSZXNpemUpCiAgICAgICAgICAgICAgICAgcmV0 dXJuOwogCi0gICAgICAgICAgICAvLyBUaGVyZSBpcyBubyBHdGtXaWRnZXQ6OmNvbmZpZ3VyZS1l dmVudCBpbiBHVEs0LCBtb3ZlIGlzIG5vdCBzdXBwb3J0ZWQuCi0jaWYgIVVTRShHVEs0KQorI2lm IFVTRShHVEs0KQorICAgICAgICAgICAgYXV0byogc3VyZmFjZSA9IGd0a19uYXRpdmVfZ2V0X3N1 cmZhY2UoR1RLX05BVElWRSh3aW5kb3cpKTsKKyAgICAgICAgICAgIGF1dG8gc2lnbmFsSUQgPSBn X3NpZ25hbF9jb25uZWN0KHN1cmZhY2UsICJzaXplLWNoYW5nZWQiLCBHX0NBTExCQUNLKCtbXShH ZGtTdXJmYWNlKiwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0LCBHZGtSZWN0YW5nbGUqIHRhcmdldEdl b21ldHJ5KSB7CisgICAgICAgICAgICAgICAgaWYgKHdpZHRoID09IHRhcmdldEdlb21ldHJ5LT53 aWR0aCAmJiBoZWlnaHQgPT0gdGFyZ2V0R2VvbWV0cnktPmhlaWdodCkKKyAgICAgICAgICAgICAg ICAgICAgUnVuTG9vcDo6Y3VycmVudCgpLnN0b3AoKTsKKyAgICAgICAgICAgIH0pLCAmZ2VvbWV0 cnkpOworI2Vsc2UKICAgICAgICAgICAgIGF1dG8gc2lnbmFsSUQgPSBnX3NpZ25hbF9jb25uZWN0 KHdpbmRvdywgImNvbmZpZ3VyZS1ldmVudCIsIEdfQ0FMTEJBQ0sod2luZG93Q29uZmlndXJlRXZl bnRDYWxsYmFjayksICZnZW9tZXRyeSk7CiAgICAgICAgICAgICBpZiAobmVlZHNNb3ZlKQogICAg ICAgICAgICAgICAgIGd0a193aW5kb3dfbW92ZShHVEtfV0lORE9XKHdpbmRvdyksIGdlb21ldHJ5 LngsIGdlb21ldHJ5LnkpOwpAQCAtMjE2LDcgKzIyMSw5IEBAIHByaXZhdGU6CiAgICAgICAgICAg ICB0aW1lci0+c3RhcnRPbmVTaG90KDIwMF9tcyk7CiAgICAgICAgICAgICBSdW5Mb29wOjpydW4o KTsKICAgICAgICAgICAgIHRpbWVyID0gbnVsbHB0cjsKLSNpZiAhVVNFKEdUSzQpCisjaWYgVVNF KEdUSzQpCisgICAgICAgICAgICBnX3NpZ25hbF9oYW5kbGVyX2Rpc2Nvbm5lY3Qoc3VyZmFjZSwg c2lnbmFsSUQpOworI2Vsc2UKICAgICAgICAgICAgIGdfc2lnbmFsX2hhbmRsZXJfZGlzY29ubmVj dCh3aW5kb3csIHNpZ25hbElEKTsKICNlbmRpZgogICAgICAgICB9IGVsc2UKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKaW5k ZXggNDYwMWJhYjhmMTk0Li5lMTM3MDQ2NTQ2NjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwCkBAIC0yNDYxLDcgKzI0 NjEsOSBAQCB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlU3ludGhlc2l6ZUtleUV2ZW50KFdlYktpdFdl YlZpZXdCYXNlKiB3ZWJWaWV3QmFzZSwgS2V5RXZlbgogICAgIGF1dG8ga2V5Y29kZSA9IHdpZGdl dEtleXZhbFRvS2V5Y29kZShHVEtfV0lER0VUKHdlYlZpZXdCYXNlKSwga2V5dmFsKTsKICAgICBp ZiAobW9kaWZpZXJzICYmIHNob3VsZFRyYW5zbGF0ZSA9PSBTaG91bGRUcmFuc2xhdGVLZXlib2Fy ZFN0YXRlOjpZZXMpIHsKICAgICAgICAgYXV0byogZGlzcGxheSA9IGd0a193aWRnZXRfZ2V0X2Rp c3BsYXkoR1RLX1dJREdFVCh3ZWJWaWV3QmFzZSkpOwotI2lmICFVU0UoR1RLNCkKKyNpZiBVU0Uo R1RLNCkKKyAgICAgICAgZ2RrX2Rpc3BsYXlfdHJhbnNsYXRlX2tleShkaXNwbGF5LCBrZXljb2Rl LCBzdGF0aWNfY2FzdDxHZGtNb2RpZmllclR5cGU+KG1vZGlmaWVycyksIDAsICZrZXl2YWwsIG51 bGxwdHIsIG51bGxwdHIsIG51bGxwdHIpOworI2Vsc2UKICAgICAgICAgZ2RrX2tleW1hcF90cmFu c2xhdGVfa2V5Ym9hcmRfc3RhdGUoZ2RrX2tleW1hcF9nZXRfZm9yX2Rpc3BsYXkoZGlzcGxheSks IGtleWNvZGUsIHN0YXRpY19jYXN0PEdka01vZGlmaWVyVHlwZT4obW9kaWZpZXJzKSwgMCwgJmtl eXZhbCwgbnVsbHB0ciwgbnVsbHB0ciwgbnVsbHB0cik7CiAjZW5kaWYKICAgICB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdHdGsuY3Bw IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3R3RrLmNwcApp bmRleCBkNGE1NWM1NTViZWEuLjkxYzdlNmJiNDQ3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3R3RrLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdHdGsuY3BwCkBAIC0yNiw2ICsyNiw3 IEBACiAjaW5jbHVkZSAiV2ViS2l0V2ViVmlld1ByaXZhdGUuaCIKICNpbmNsdWRlIDxXZWJDb3Jl L0NvbG9yLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9HdGtVdGlsaXRpZXMuaD4KKyNpbmNsdWRlIDxX ZWJDb3JlL0d0a1ZlcnNpb25pbmcuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1BsYXRmb3JtRGlzcGxh eS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUGxhdGZvcm1TY3JlZW4uaD4KICNpbmNsdWRlIDxnbGli L2dpMThuLWxpYi5oPgpAQCAtOTYsOCArOTcsOSBAQCBnYm9vbGVhbiB3ZWJraXRXZWJWaWV3UnVu RmlsZUNob29zZXIoV2ViS2l0V2ViVmlldyogd2ViVmlldywgV2ViS2l0RmlsZUNob29zZXJSZQog ICAgIHJldHVybiBUUlVFOwogfQogCi0jaWYgIVVTRShHVEs0KQogc3RydWN0IFdpbmRvd1N0YXRl RXZlbnQgeworICAgIFdURl9NQUtFX1NUUlVDVF9GQVNUX0FMTE9DQVRFRDsKKwogICAgIGVudW0g Y2xhc3MgVHlwZSB7IE1heGltaXplLCBNaW5pbWl6ZSwgUmVzdG9yZSB9OwogCiAgICAgV2luZG93 U3RhdGVFdmVudChUeXBlIHR5cGUsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0 aW9uSGFuZGxlcikKQEAgLTEyNyw2ICsxMjksMzggQEAgc3RydWN0IFdpbmRvd1N0YXRlRXZlbnQg ewogCiBzdGF0aWMgY29uc3QgY2hhciogZ1dpbmRvd1N0YXRlRXZlbnRJRCA9ICJ3ay13aW5kb3ct c3RhdGUtZXZlbnQiOwogCisjaWYgVVNFKEdUSzQpCitzdGF0aWMgdm9pZCBzdXJmYWNlU3RhdGVD aGFuZ2VkQ2FsbGJhY2soR2RrU3VyZmFjZSogc3VyZmFjZSwgR1BhcmFtU3BlYyosIFdlYktpdFdl YlZpZXcqIHZpZXcpCit7CisgICAgYXV0byogc3RhdGUgPSBzdGF0aWNfY2FzdDxXaW5kb3dTdGF0 ZUV2ZW50Kj4oZ19vYmplY3RfZ2V0X2RhdGEoR19PQkpFQ1QodmlldyksIGdXaW5kb3dTdGF0ZUV2 ZW50SUQpKTsKKyAgICBpZiAoIXN0YXRlKSB7CisgICAgICAgIGdfc2lnbmFsX2hhbmRsZXJzX2Rp c2Nvbm5lY3RfYnlfZnVuYyhzdXJmYWNlLCByZWludGVycHJldF9jYXN0PGdwb2ludGVyPihzdXJm YWNlU3RhdGVDaGFuZ2VkQ2FsbGJhY2spLCB2aWV3KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K KworICAgIGF1dG8gc3VyZmFjZVN0YXRlID0gZ2RrX3RvcGxldmVsX2dldF9zdGF0ZShHREtfVE9Q TEVWRUwoc3VyZmFjZSkpOworICAgIGJvb2wgZXZlbnRDb21wbGV0ZWQgPSBmYWxzZTsKKyAgICBz d2l0Y2ggKHN0YXRlLT50eXBlKSB7CisgICAgY2FzZSBXaW5kb3dTdGF0ZUV2ZW50OjpUeXBlOjpN YXhpbWl6ZToKKyAgICAgICAgaWYgKHN1cmZhY2VTdGF0ZSAmIEdES19TVVJGQUNFX1NUQVRFX01B WElNSVpFRCkKKyAgICAgICAgICAgIGV2ZW50Q29tcGxldGVkID0gdHJ1ZTsKKyAgICAgICAgYnJl YWs7CisgICAgY2FzZSBXaW5kb3dTdGF0ZUV2ZW50OjpUeXBlOjpNaW5pbWl6ZToKKyAgICAgICAg aWYgKChzdXJmYWNlU3RhdGUgJiBHREtfU1VSRkFDRV9TVEFURV9NSU5JTUlaRUQpIHx8ICFnZGtf c3VyZmFjZV9nZXRfbWFwcGVkKHN1cmZhY2UpKQorICAgICAgICAgICAgZXZlbnRDb21wbGV0ZWQg PSB0cnVlOworICAgICAgICBicmVhazsKKyAgICBjYXNlIFdpbmRvd1N0YXRlRXZlbnQ6OlR5cGU6 OlJlc3RvcmU6CisgICAgICAgIGlmICghKHN1cmZhY2VTdGF0ZSAmIEdES19TVVJGQUNFX1NUQVRF X01BWElNSVpFRCkgJiYgIShzdXJmYWNlU3RhdGUgJiBHREtfU1VSRkFDRV9TVEFURV9NSU5JTUla RUQpKQorICAgICAgICAgICAgZXZlbnRDb21wbGV0ZWQgPSB0cnVlOworICAgICAgICBicmVhazsK KyAgICB9CisKKyAgICBpZiAoZXZlbnRDb21wbGV0ZWQpIHsKKyAgICAgICAgZ19zaWduYWxfaGFu ZGxlcnNfZGlzY29ubmVjdF9ieV9mdW5jKHN1cmZhY2UsIHJlaW50ZXJwcmV0X2Nhc3Q8Z3BvaW50 ZXI+KHN1cmZhY2VTdGF0ZUNoYW5nZWRDYWxsYmFjayksIHZpZXcpOworICAgICAgICBnX29iamVj dF9zZXRfZGF0YShHX09CSkVDVCh2aWV3KSwgZ1dpbmRvd1N0YXRlRXZlbnRJRCwgbnVsbHB0cik7 CisgICAgfQorfQorI2Vsc2UKIHN0YXRpYyBnYm9vbGVhbiB3aW5kb3dTdGF0ZUV2ZW50Q2FsbGJh Y2soR3RrV2lkZ2V0KiB3aW5kb3csIEdka0V2ZW50V2luZG93U3RhdGUqIGV2ZW50LCBXZWJLaXRX ZWJWaWV3KiB2aWV3KQogewogICAgIGF1dG8qIHN0YXRlID0gc3RhdGljX2Nhc3Q8V2luZG93U3Rh dGVFdmVudCo+KGdfb2JqZWN0X2dldF9kYXRhKEdfT0JKRUNUKHZpZXcpLCBnV2luZG93U3RhdGVF dmVudElEKSk7CkBAIC0xNjAsOSArMTk0LDIyIEBAIHN0YXRpYyBnYm9vbGVhbiB3aW5kb3dTdGF0 ZUV2ZW50Q2FsbGJhY2soR3RrV2lkZ2V0KiB3aW5kb3csIEdka0V2ZW50V2luZG93U3RhdGUqCiB9 CiAjZW5kaWYKIAorc3RhdGljIHZvaWQKK3dlYmtpdFdlYlZpZXdNb25pdG9yV2luZG93U3RhdGUo V2ViS2l0V2ViVmlldyogdmlldywgR3RrV2luZG93KiB3aW5kb3csIFdpbmRvd1N0YXRlRXZlbnQ6 OlR5cGUgdHlwZSwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVy KQoreworICAgIGdfb2JqZWN0X3NldF9kYXRhX2Z1bGwoR19PQkpFQ1QodmlldyksIGdXaW5kb3dT dGF0ZUV2ZW50SUQsIG5ldyBXaW5kb3dTdGF0ZUV2ZW50KHR5cGUsIFdURk1vdmUoY29tcGxldGlv bkhhbmRsZXIpKSwgW10oZ3BvaW50ZXIgdXNlckRhdGEpIHsKKyAgICAgICAgZGVsZXRlIHN0YXRp Y19jYXN0PFdpbmRvd1N0YXRlRXZlbnQqPih1c2VyRGF0YSk7CisgICAgfSk7CisKKyNpZiBVU0Uo R1RLNCkKKyAgICBnX3NpZ25hbF9jb25uZWN0X29iamVjdChndGtfbmF0aXZlX2dldF9zdXJmYWNl KEdUS19OQVRJVkUod2luZG93KSksICJub3RpZnk6OnN0YXRlIiwgR19DQUxMQkFDSyhzdXJmYWNl U3RhdGVDaGFuZ2VkQ2FsbGJhY2spLCB2aWV3LCBHX0NPTk5FQ1RfQUZURVIpOworI2Vsc2UKKyAg ICBnX3NpZ25hbF9jb25uZWN0X29iamVjdCh3aW5kb3csICJ3aW5kb3ctc3RhdGUtZXZlbnQiLCBH X0NBTExCQUNLKHdpbmRvd1N0YXRlRXZlbnRDYWxsYmFjayksIHZpZXcsIEdfQ09OTkVDVF9BRlRF Uik7CisjZW5kaWYKK30KKwogdm9pZCB3ZWJraXRXZWJWaWV3TWF4aW1pemVXaW5kb3coV2ViS2l0 V2ViVmlldyogdmlldywgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5k bGVyKQogewotI2lmICFVU0UoR1RLNCkKICAgICBhdXRvKiB0b3BMZXZlbCA9IGd0a193aWRnZXRf Z2V0X3RvcGxldmVsKEdUS19XSURHRVQodmlldykpOwogICAgIGlmICghZ3RrX3dpZGdldF9pc190 b3BsZXZlbCh0b3BMZXZlbCkpIHsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoKTsKQEAgLTE3 NSwxMSArMjIyLDkgQEAgdm9pZCB3ZWJraXRXZWJWaWV3TWF4aW1pemVXaW5kb3coV2ViS2l0V2Vi VmlldyogdmlldywgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYKICAgICAgICAgcmV0dXJuOwog ICAgIH0KIAotICAgIGdfb2JqZWN0X3NldF9kYXRhX2Z1bGwoR19PQkpFQ1QodmlldyksIGdXaW5k b3dTdGF0ZUV2ZW50SUQsIG5ldyBXaW5kb3dTdGF0ZUV2ZW50KFdpbmRvd1N0YXRlRXZlbnQ6OlR5 cGU6Ok1heGltaXplLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSksIFtdKGdwb2ludGVyIHVz ZXJEYXRhKSB7Ci0gICAgICAgIGRlbGV0ZSBzdGF0aWNfY2FzdDxXaW5kb3dTdGF0ZUV2ZW50Kj4o dXNlckRhdGEpOwotICAgIH0pOwotICAgIGdfc2lnbmFsX2Nvbm5lY3Rfb2JqZWN0KHdpbmRvdywg IndpbmRvdy1zdGF0ZS1ldmVudCIsIEdfQ0FMTEJBQ0sod2luZG93U3RhdGVFdmVudENhbGxiYWNr KSwgdmlldywgR19DT05ORUNUX0FGVEVSKTsKKyAgICB3ZWJraXRXZWJWaWV3TW9uaXRvcldpbmRv d1N0YXRlKHZpZXcsIHdpbmRvdywgV2luZG93U3RhdGVFdmVudDo6VHlwZTo6TWF4aW1pemUsIFdU Rk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKICAgICBndGtfd2luZG93X21heGltaXplKHdpbmRv dyk7CisKICNpZiBFTkFCTEUoREVWRUxPUEVSX01PREUpCiAgICAgLy8gWHZmYiBkb2Vzbid0IHN1 cHBvcnQgbWF4aW1pemUsIHNvIHdlIHJlc2l6ZSB0aGUgd2luZG93IHRvIHRoZSBzY3JlZW4gc2l6 ZS4KICAgICBpZiAoV2ViQ29yZTo6UGxhdGZvcm1EaXNwbGF5OjpzaGFyZWREaXNwbGF5KCkudHlw ZSgpID09IFdlYkNvcmU6OlBsYXRmb3JtRGlzcGxheTo6VHlwZTo6WDExKSB7CkBAIC0xOTIsMTIg KzIzNywxMCBAQCB2b2lkIHdlYmtpdFdlYlZpZXdNYXhpbWl6ZVdpbmRvdyhXZWJLaXRXZWJWaWV3 KiB2aWV3LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JgogICAgIH0KICNlbmRpZgogICAgIGd0 a193aWRnZXRfc2hvdyh0b3BMZXZlbCk7Ci0jZW5kaWYKIH0KIAogdm9pZCB3ZWJraXRXZWJWaWV3 TWluaW1pemVXaW5kb3coV2ViS2l0V2ViVmlldyogdmlldywgQ29tcGxldGlvbkhhbmRsZXI8dm9p ZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotI2lmICFVU0UoR1RLNCkKICAgICBhdXRvKiB0 b3BMZXZlbCA9IGd0a193aWRnZXRfZ2V0X3RvcGxldmVsKEdUS19XSURHRVQodmlldykpOwogICAg IGlmICghZ3RrX3dpZGdldF9pc190b3BsZXZlbCh0b3BMZXZlbCkpIHsKICAgICAgICAgY29tcGxl dGlvbkhhbmRsZXIoKTsKQEAgLTIwNSwxOCArMjQ4LDEzIEBAIHZvaWQgd2Via2l0V2ViVmlld01p bmltaXplV2luZG93KFdlYktpdFdlYlZpZXcqIHZpZXcsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo KT4mCiAgICAgfQogCiAgICAgYXV0byogd2luZG93ID0gR1RLX1dJTkRPVyh0b3BMZXZlbCk7Ci0g ICAgZ19vYmplY3Rfc2V0X2RhdGFfZnVsbChHX09CSkVDVCh2aWV3KSwgZ1dpbmRvd1N0YXRlRXZl bnRJRCwgbmV3IFdpbmRvd1N0YXRlRXZlbnQoV2luZG93U3RhdGVFdmVudDo6VHlwZTo6TWluaW1p emUsIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKSwgW10oZ3BvaW50ZXIgdXNlckRhdGEpIHsK LSAgICAgICAgZGVsZXRlIHN0YXRpY19jYXN0PFdpbmRvd1N0YXRlRXZlbnQqPih1c2VyRGF0YSk7 Ci0gICAgfSk7Ci0gICAgZ19zaWduYWxfY29ubmVjdF9vYmplY3Qod2luZG93LCAid2luZG93LXN0 YXRlLWV2ZW50IiwgR19DQUxMQkFDSyh3aW5kb3dTdGF0ZUV2ZW50Q2FsbGJhY2spLCB2aWV3LCBH X0NPTk5FQ1RfQUZURVIpOwotICAgIGd0a193aW5kb3dfaWNvbmlmeSh3aW5kb3cpOworICAgIHdl YmtpdFdlYlZpZXdNb25pdG9yV2luZG93U3RhdGUodmlldywgd2luZG93LCBXaW5kb3dTdGF0ZUV2 ZW50OjpUeXBlOjpNaW5pbWl6ZSwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOworICAgIGd0 a193aW5kb3dfbWluaW1pemUod2luZG93KTsKICAgICBndGtfd2lkZ2V0X2hpZGUodG9wTGV2ZWwp OwotI2VuZGlmCiB9CiAKIHZvaWQgd2Via2l0V2ViVmlld1Jlc3RvcmVXaW5kb3coV2ViS2l0V2Vi VmlldyogdmlldywgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVy KQogewotI2lmICFVU0UoR1RLNCkKICAgICBhdXRvKiB0b3BMZXZlbCA9IGd0a193aWRnZXRfZ2V0 X3RvcGxldmVsKEdUS19XSURHRVQodmlldykpOwogICAgIGlmICghZ3RrX3dpZGdldF9pc190b3Bs ZXZlbCh0b3BMZXZlbCkpIHsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoKTsKQEAgLTIyOSwx NCArMjY3LDEyIEBAIHZvaWQgd2Via2l0V2ViVmlld1Jlc3RvcmVXaW5kb3coV2ViS2l0V2ViVmll dyogdmlldywgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmCiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKLSAgICBnX29iamVjdF9zZXRfZGF0YV9mdWxsKEdfT0JKRUNUKHZpZXcpLCBnV2luZG93 U3RhdGVFdmVudElELCBuZXcgV2luZG93U3RhdGVFdmVudChXaW5kb3dTdGF0ZUV2ZW50OjpUeXBl OjpSZXN0b3JlLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSksIFtdKGdwb2ludGVyIHVzZXJE YXRhKSB7Ci0gICAgICAgIGRlbGV0ZSBzdGF0aWNfY2FzdDxXaW5kb3dTdGF0ZUV2ZW50Kj4odXNl ckRhdGEpOwotICAgIH0pOwotICAgIGdfc2lnbmFsX2Nvbm5lY3Rfb2JqZWN0KHdpbmRvdywgIndp bmRvdy1zdGF0ZS1ldmVudCIsIEdfQ0FMTEJBQ0sod2luZG93U3RhdGVFdmVudENhbGxiYWNrKSwg dmlldywgR19DT05ORUNUX0FGVEVSKTsKKyAgICB3ZWJraXRXZWJWaWV3TW9uaXRvcldpbmRvd1N0 YXRlKHZpZXcsIHdpbmRvdywgV2luZG93U3RhdGVFdmVudDo6VHlwZTo6UmVzdG9yZSwgV1RGTW92 ZShjb21wbGV0aW9uSGFuZGxlcikpOwogICAgIGlmIChndGtfd2luZG93X2lzX21heGltaXplZCh3 aW5kb3cpKQogICAgICAgICBndGtfd2luZG93X3VubWF4aW1pemUod2luZG93KTsKICAgICBpZiAo IWd0a193aWRnZXRfZ2V0X21hcHBlZCh0b3BMZXZlbCkpCi0gICAgICAgIGd0a193aW5kb3dfZGVp Y29uaWZ5KHdpbmRvdyk7CisgICAgICAgIGd0a193aW5kb3dfdW5taW5pbWl6ZSh3aW5kb3cpOwor CiAjaWYgRU5BQkxFKERFVkVMT1BFUl9NT0RFKQogICAgIC8vIFh2ZmIgZG9lc24ndCBzdXBwb3J0 IG1heGltaXplLCBzbyB3ZSByZXNpemUgdGhlIHdpbmRvdyB0byB0aGUgZGVmYXVsdCBzaXplLgog ICAgIGlmIChXZWJDb3JlOjpQbGF0Zm9ybURpc3BsYXk6OnNoYXJlZERpc3BsYXkoKS50eXBlKCkg PT0gV2ViQ29yZTo6UGxhdGZvcm1EaXNwbGF5OjpUeXBlOjpYMTEpIHsKQEAgLTI0OSw3ICsyODUs NiBAQCB2b2lkIHdlYmtpdFdlYlZpZXdSZXN0b3JlV2luZG93KFdlYktpdFdlYlZpZXcqIHZpZXcs IENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJgogICAgIH0KICNlbmRpZgogICAgIGd0a193aWRn ZXRfc2hvdyh0b3BMZXZlbCk7Ci0jZW5kaWYKIH0KIAogLyoqCmRpZmYgLS1naXQgYS9Ub29scy9D aGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDcwYjJhYWI2OGZkLi40MGYyZGFiOWIw ZTYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNSBAQAorMjAyMC0wNS0yOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lh QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUSzRdIE1ha2UgV2ViRHJpdmVyIHdvcmsKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjMxNgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0b3AgY29ubmVjdGlu ZyB0byBXZWJLaXRXZWJWaWV3OjpjbG9zZSBzaWduYWwgdHdpY2UgZm9yIG5ld2FseSBjcmVhdGVk IHdpbmRvd3MuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jOgor ICAgICAgICAod2ViVmlld0NyZWF0ZSk6CisKIDIwMjAtMDUtMjggIENhcmxvcyBHYXJjaWEgQ2Ft cG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIFdlYkRyaXZlcjogc3Rv cCB1c2luZyBHZGtFdmVudCBBUEkgaW4gcHJlcGFyYXRpb24gZm9yIEdUSzQKZGlmZiAtLWdpdCBh L1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMgYi9Ub29scy9NaW5pQnJvd3Nl ci9ndGsvQnJvd3NlcldpbmRvdy5jCmluZGV4IDFkZTIxNGNkNDYzYS4uMzhkN2E0NTE5ZDMxIDEw MDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jCisrKyBiL1Rv b2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKQEAgLTM3NCw3ICszNzQsNiBAQCBz dGF0aWMgR3RrV2lkZ2V0ICp3ZWJWaWV3Q3JlYXRlKFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIFdl YktpdE5hdmlnYXRpb25BY3Rpb24gKgogICAgIGd0a193aWRnZXRfZ3JhYl9mb2N1cyhHVEtfV0lE R0VUKG5ld1dlYlZpZXcpKTsKICAgICBnX3NpZ25hbF9jb25uZWN0KG5ld1dlYlZpZXcsICJyZWFk eS10by1zaG93IiwgR19DQUxMQkFDSyh3ZWJWaWV3UmVhZHlUb1Nob3cpLCBuZXdXaW5kb3cpOwog ICAgIGdfc2lnbmFsX2Nvbm5lY3QobmV3V2ViVmlldywgInJ1bi1hcy1tb2RhbCIsIEdfQ0FMTEJB Q0sod2ViVmlld1J1bkFzTW9kYWwpLCBuZXdXaW5kb3cpOwotICAgIGdfc2lnbmFsX2Nvbm5lY3Qo bmV3V2ViVmlldywgImNsb3NlIiwgR19DQUxMQkFDSyh3ZWJWaWV3Q2xvc2UpLCBuZXdXaW5kb3cp OwogICAgIHJldHVybiBHVEtfV0lER0VUKG5ld1dlYlZpZXcpOwogfQogCg==