212330 2020-05-24 05:57:05 -0700 [GTK4] Implement emoji chooser 2023-04-28 01:10:53 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=256080 https://bugs.webkit.org/show_bug.cgi?id=256082 Gtk P2 Normal --- 210100 1 cgarcia webkit-unassigned aperez berto bugs-noreply ews-watchlist gustavo oldest_to_newest 1655710 0 cgarcia 2020-05-24 05:57:05 -0700 In GTK4 the EmojiChooser is public API. 1658277 1 400816 cgarcia 2020-06-02 07:03:51 -0700 Created attachment 400816 Patch 1658281 2 ews-watchlist 2020-06-02 07:14:49 -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 1658656 3 cgarcia 2020-06-03 02:12:06 -0700 Committed r262482: <https://trac.webkit.org/changeset/262482> 400816 2020-06-02 07:03:51 -0700 2020-06-02 14:22:45 -0700 Patch wkgtk4-emoji-picker.diff text/plain 7490 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggODc1NTQxYjNkMmExLi5iNGRiNmZhNjY5YjQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjEgQEAKKzIwMjAtMDYtMDIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtHVEs0XSBJbXBsZW1lbnQgZW1vamkgY2hvb3NlcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyMzMwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR3RrRW1vamlDaG9vc2Vy IGlzIHB1YmxpYyBBUEkgaW4gR1RLNCwgc28ganVzdCB1c2UgdGhhdCBpbnN0ZWFkIG9mIG91ciBv d24uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRFbW9qaUNob29zZXIuY3Bw OgorICAgICAgICAoZW1vamlBY3RpdmF0ZWQpOiBDbG9zZSB0aGUgcG9wb3ZlciBiZWZvcmUgZW1p dHRpbmcgZW1vamktcGlja2VkIGZvciBjb25zaXN0ZW5jeSB3aXRoIEdUSy4KKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHA6CisgICAgICAgIChfV2ViS2l0 V2ViVmlld0Jhc2VQcml2YXRlOjpfV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlKToKKyAgICAgICAg KF9XZWJLaXRXZWJWaWV3QmFzZVByaXZhdGU6OnJlbGVhc2VFbW9qaUNob29zZXJUaW1lckZpcmVk KToKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlRGlzcG9zZSk6CisgICAgICAgIChlbW9qaUNo b29zZXJDbG9zZWQpOgorICAgICAgICAod2Via2l0V2ViVmlld0Jhc2VTaG93RW1vamlDaG9vc2Vy KToKKwogMjAyMC0wNi0wMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5j b20+CiAKICAgICAgICAgW0dUSzRdIEltcGxlbWVudCBkYXRhIGxpc3QgZHJvcCBkb3duIG1lbnUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RW1vamlD aG9vc2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RW1vamlD aG9vc2VyLmNwcAppbmRleCAxN2U5NDMwOTg0N2UuLmNiY2EwZjEyNjZhZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRFbW9qaUNob29zZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RW1vamlDaG9vc2VyLmNw cApAQCAtMTk0LDYgKzE5NCw4IEBAIHN0YXRpYyB2b2lkIHdlYmtpdEVtb2ppQ2hvb3NlckFkZFJl Y2VudEl0ZW0oV2ViS2l0RW1vamlDaG9vc2VyKiBjaG9vc2VyLCBHVmFyaWFuCiAKIHN0YXRpYyB2 b2lkIGVtb2ppQWN0aXZhdGVkKEd0a0Zsb3dCb3gqIGJveCwgR3RrRmxvd0JveENoaWxkKiBjaGls ZCwgV2ViS2l0RW1vamlDaG9vc2VyKiBjaG9vc2VyKQogeworICAgIGd0a19wb3BvdmVyX3BvcGRv d24oR1RLX1BPUE9WRVIoY2hvb3NlcikpOworCiAgICAgR3RrV2lkZ2V0KiBsYWJlbCA9IGd0a19i aW5fZ2V0X2NoaWxkKEdUS19CSU4oZ3RrX2Jpbl9nZXRfY2hpbGQoR1RLX0JJTihjaGlsZCkpKSk7 CiAgICAgR1VuaXF1ZVB0cjxjaGFyPiB0ZXh0KGdfc3RyZHVwKGd0a19sYWJlbF9nZXRfbGFiZWwo R1RLX0xBQkVMKGxhYmVsKSkpKTsKIApAQCAtMjAxLDggKzIwMyw2IEBAIHN0YXRpYyB2b2lkIGVt b2ppQWN0aXZhdGVkKEd0a0Zsb3dCb3gqIGJveCwgR3RrRmxvd0JveENoaWxkKiBjaGlsZCwgV2Vi S2l0RW1vamlDCiAgICAgYXV0byBtb2RpZmllciA9IHN0YXRpY19jYXN0PGd1bmljaGFyPihHUE9J TlRFUl9UT19VSU5UKGdfb2JqZWN0X2dldF9kYXRhKEdfT0JKRUNUKGNoaWxkKSwgIm1vZGlmaWVy IikpKTsKICAgICB3ZWJraXRFbW9qaUNob29zZXJBZGRSZWNlbnRJdGVtKGNob29zZXIsIGl0ZW0s IG1vZGlmaWVyKTsKICAgICBnX3NpZ25hbF9lbWl0KGNob29zZXIsIHNpZ25hbHNbRU1PSklfUElD S0VEXSwgMCwgdGV4dC5nZXQoKSk7Ci0KLSAgICBndGtfcG9wb3Zlcl9wb3Bkb3duKEdUS19QT1BP VkVSKGNob29zZXIpKTsKIH0KIAogc3RhdGljIGJvb2wgZW1vamlEYXRhSGFzVmFyaWF0aW9ucyhH VmFyaWFudCogZW1vamlEYXRhKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcAppbmRleCAyZTA4YmNkNjRkOTAuLmUxNjQ3NjZk NWY2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRX ZWJWaWV3QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRXZWJWaWV3QmFzZS5jcHAKQEAgLTIyNSwxMSArMjI1LDExIEBAIHR5cGVkZWYgSGFzaE1hcDx1 aW50MzJfdCwgR1VuaXF1ZVB0cjxHZGtFdmVudD4+IFRvdWNoRXZlbnRzTWFwOwogc3RydWN0IF9X ZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUgewogICAgIF9XZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUo KQogICAgICAgICA6IHVwZGF0ZUFjdGl2aXR5U3RhdGVUaW1lcihSdW5Mb29wOjptYWluKCksIHRo aXMsICZfV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlOjp1cGRhdGVBY3Rpdml0eVN0YXRlVGltZXJG aXJlZCkKLSNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigzLCAyNCwgMCkgJiYgIVVTRShHVEs0KQorI2lm IEdUS19DSEVDS19WRVJTSU9OKDMsIDI0LCAwKQogICAgICAgICAsIHJlbGVhc2VFbW9qaUNob29z ZXJUaW1lcihSdW5Mb29wOjptYWluKCksIHRoaXMsICZfV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRl OjpyZWxlYXNlRW1vamlDaG9vc2VyVGltZXJGaXJlZCkKICNlbmRpZgogICAgIHsKLSNpZiBHVEtf Q0hFQ0tfVkVSU0lPTigzLCAyNCwgMCkgJiYgIVVTRShHVEs0KQorI2lmIEdUS19DSEVDS19WRVJT SU9OKDMsIDI0LCAwKQogICAgICAgICByZWxlYXNlRW1vamlDaG9vc2VyVGltZXIuc2V0UHJpb3Jp dHkoUnVuTG9vcFNvdXJjZVByaW9yaXR5OjpSZWxlYXNlVW51c2VkUmVzb3VyY2VzVGltZXIpOwog I2VuZGlmCiAgICAgfQpAQCAtMjQyLDEzICsyNDIsMTcgQEAgc3RydWN0IF9XZWJLaXRXZWJWaWV3 QmFzZVByaXZhdGUgewogICAgICAgICBhY3Rpdml0eVN0YXRlRmxhZ3NUb1VwZGF0ZSA9IHsgfTsK ICAgICB9CiAKLSNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigzLCAyNCwgMCkgJiYgIVVTRShHVEs0KQor I2lmIEdUS19DSEVDS19WRVJTSU9OKDMsIDI0LCAwKQogICAgIHZvaWQgcmVsZWFzZUVtb2ppQ2hv b3NlclRpbWVyRmlyZWQoKQogICAgIHsKKyNpZiBVU0UoR1RLNCkKKyAgICAgICAgZ19jbGVhcl9w b2ludGVyKCZlbW9qaUNob29zZXIsIGd0a193aWRnZXRfdW5wYXJlbnQpOworI2Vsc2UKICAgICAg ICAgaWYgKGVtb2ppQ2hvb3NlcikgewogICAgICAgICAgICAgZ3RrX3dpZGdldF9kZXN0cm95KGVt b2ppQ2hvb3Nlcik7CiAgICAgICAgICAgICBlbW9qaUNob29zZXIgPSBudWxscHRyOwogICAgICAg ICB9CisjZW5kaWYKICAgICB9CiAjZW5kaWYKIApAQCAtMzE0LDcgKzMxOCw3IEBAIHN0cnVjdCBf V2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlIHsKICAgICBib29sIGlzQmFja0ZvcndhcmROYXZpZ2F0 aW9uR2VzdHVyZUVuYWJsZWQgeyBmYWxzZSB9OwogI2VuZGlmCiAKLSNpZiBHVEtfQ0hFQ0tfVkVS U0lPTigzLCAyNCwgMCkgJiYgIVVTRShHVEs0KQorI2lmIEdUS19DSEVDS19WRVJTSU9OKDMsIDI0 LCAwKQogICAgIEd0a1dpZGdldCogZW1vamlDaG9vc2VyOwogICAgIENvbXBsZXRpb25IYW5kbGVy PHZvaWQoU3RyaW5nKT4gZW1vamlDaG9vc2VyQ29tcGxldGlvbkhhbmRsZXI7CiAgICAgUnVuTG9v cDo6VGltZXI8V2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlPiByZWxlYXNlRW1vamlDaG9vc2VyVGlt ZXI7CkBAIC02ODYsNyArNjkwLDcgQEAgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVJlbW92ZVdlYklu c3BlY3RvcihXZWJLaXRXZWJWaWV3QmFzZSogd2ViVmlld0Jhc2UsIEd0a1dpZGcKICNlbmRpZgog fQogCi0jaWYgR1RLX0NIRUNLX1ZFUlNJT04oMywgMjQsIDApICYmICFVU0UoR1RLNCkKKyNpZiBH VEtfQ0hFQ0tfVkVSU0lPTigzLCAyNCwgMCkKIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdCYXNl Q29tcGxldGVFbW9qaUNob29zZXJSZXF1ZXN0KFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3LCBj b25zdCBTdHJpbmcmIHRleHQpCiB7CiAgICAgaWYgKGF1dG8gY29tcGxldGlvbkhhbmRsZXIgPSBz dGQ6OmV4Y2hhbmdlKHdlYlZpZXctPnByaXYtPmVtb2ppQ2hvb3NlckNvbXBsZXRpb25IYW5kbGVy LCBudWxscHRyKSkKQEAgLTcwMiwxMyArNzA2LDE0IEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZp ZXdCYXNlRGlzcG9zZShHT2JqZWN0KiBnb2JqZWN0KQogICAgIHdlYmtpdFdlYlZpZXdCYXNlUmVt b3ZlV2ViSW5zcGVjdG9yKHdlYlZpZXcsIHdlYlZpZXctPnByaXYtPmluc3BlY3RvclZpZXcpOwog ICAgIGlmIChhdXRvKiB3aWRnZXQgPSB3ZWJWaWV3LT5wcml2LT5rZXlCaW5kaW5nVHJhbnNsYXRv ci53aWRnZXQoKSkKICAgICAgICAgZ3RrX3dpZGdldF91bnBhcmVudCh3aWRnZXQpOworICAgIGdf Y2xlYXJfcG9pbnRlcigmd2ViVmlldy0+cHJpdi0+ZW1vamlDaG9vc2VyLCBndGtfd2lkZ2V0X3Vu cGFyZW50KTsKICNlbHNlCiAgICAgZ19jbGVhcl9wb2ludGVyKCZ3ZWJWaWV3LT5wcml2LT5kaWFs b2csIGd0a193aWRnZXRfZGVzdHJveSk7CiAgICAgd2Via2l0V2ViVmlld0Jhc2VTZXRUb3BsZXZl bE9uU2NyZWVuV2luZG93KHdlYlZpZXcsIG51bGxwdHIpOwogI2VuZGlmCiAgICAgaWYgKHdlYlZp ZXctPnByaXYtPmFjY2Vzc2libGUpCiAgICAgICAgIHdlYmtpdFdlYlZpZXdBY2Nlc3NpYmxlU2V0 V2ViVmlldyhXRUJLSVRfV0VCX1ZJRVdfQUNDRVNTSUJMRSh3ZWJWaWV3LT5wcml2LT5hY2Nlc3Np YmxlLmdldCgpKSwgbnVsbHB0cik7Ci0jaWYgR1RLX0NIRUNLX1ZFUlNJT04oMywgMjQsIDApICYm ICFVU0UoR1RLNCkKKyNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigzLCAyNCwgMCkKICAgICB3ZWJraXRX ZWJWaWV3QmFzZUNvbXBsZXRlRW1vamlDaG9vc2VyUmVxdWVzdCh3ZWJWaWV3LCBlbXB0eVN0cmlu ZygpKTsKICNlbmRpZgogICAgIGlmICh3ZWJWaWV3LT5wcml2LT5wb2ludGVyTG9ja01hbmFnZXIp IHsKQEAgLTIzODEsNyArMjM4Niw3IEBAIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VEaWRSZXN0b3Jl U2Nyb2xsUG9zaXRpb24oV2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtpdFdlYlZpZXdCCiAjZW5kaWYK IH0KIAotI2lmIEdUS19DSEVDS19WRVJTSU9OKDMsIDI0LCAwKSAmJiAhVVNFKEdUSzQpCisjaWYg R1RLX0NIRUNLX1ZFUlNJT04oMywgMjQsIDApCiBzdGF0aWMgdm9pZCBlbW9qaUNob29zZXJFbW9q aVBpY2tlZChXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2UsIGNvbnN0IGNoYXIq IHRleHQpCiB7CiAgICAgd2Via2l0V2ViVmlld0Jhc2VDb21wbGV0ZUVtb2ppQ2hvb3NlclJlcXVl c3Qod2Via2l0V2ViVmlld0Jhc2UsIFN0cmluZzo6ZnJvbVVURjgodGV4dCkpOwpAQCAtMjM4OSwy MiArMjM5NCwzMSBAQCBzdGF0aWMgdm9pZCBlbW9qaUNob29zZXJFbW9qaVBpY2tlZChXZWJLaXRX ZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2UsIGNvbnN0CiAKIHN0YXRpYyB2b2lkIGVtb2pp Q2hvb3NlckNsb3NlZChXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2UpCiB7Ci0g ICAgd2Via2l0V2ViVmlld0Jhc2VDb21wbGV0ZUVtb2ppQ2hvb3NlclJlcXVlc3Qod2Via2l0V2Vi Vmlld0Jhc2UsIGVtcHR5U3RyaW5nKCkpOworICAgIC8vIFRoZSBlbW9qaSBjaG9vc2VyIGZpcnN0 IGNsb3NlcyB0aGUgcG9wb3ZlciBhbmQgdGhlbiBlbWl0cyBlbW9qaS1waWNrZWQgc2lnbmFsLCBz byBjb21wbGV0ZQorICAgIC8vIHRoZSByZXF1ZXN0IGlmIHRoZSBlbW9qaSBpc24ndCBwaWNrZWQg YmVmb3JlIHRoZSBuZXh0IHJ1biBsb29wIGl0ZXJhdGlvbi4KKyAgICBSdW5Mb29wOjptYWluKCku ZGlzcGF0Y2goW3dlYlZpZXdCYXNlID0gR1JlZlB0cjxXZWJLaXRXZWJWaWV3QmFzZT4od2Via2l0 V2ViVmlld0Jhc2UpXSB7CisgICAgICAgIHdlYmtpdFdlYlZpZXdCYXNlQ29tcGxldGVFbW9qaUNo b29zZXJSZXF1ZXN0KHdlYlZpZXdCYXNlLmdldCgpLCBlbXB0eVN0cmluZygpKTsKKyAgICB9KTsK ICAgICB3ZWJraXRXZWJWaWV3QmFzZS0+cHJpdi0+cmVsZWFzZUVtb2ppQ2hvb3NlclRpbWVyLnN0 YXJ0T25lU2hvdCgyX21pbik7CiB9CiAjZW5kaWYKIAogdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVNo b3dFbW9qaUNob29zZXIoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtpdFdlYlZpZXdCYXNlLCBjb25z dCBJbnRSZWN0JiBjYXJldFJlY3QsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoU3RyaW5nKT4mJiBj b21wbGV0aW9uSGFuZGxlcikKIHsKLSNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigzLCAyNCwgMCkgJiYg IVVTRShHVEs0KQorI2lmIEdUS19DSEVDS19WRVJTSU9OKDMsIDI0LCAwKQogICAgIFdlYktpdFdl YlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9IHdlYmtpdFdlYlZpZXdCYXNlLT5wcml2OwogICAgIHBy aXYtPnJlbGVhc2VFbW9qaUNob29zZXJUaW1lci5zdG9wKCk7CiAKICAgICBpZiAoIXByaXYtPmVt b2ppQ2hvb3NlcikgeworI2lmIFVTRShHVEs0KQorICAgICAgICBwcml2LT5lbW9qaUNob29zZXIg PSBndGtfZW1vamlfY2hvb3Nlcl9uZXcoKTsKKyAgICAgICAgZ3RrX3dpZGdldF9zZXRfcGFyZW50 KHByaXYtPmVtb2ppQ2hvb3NlciwgR1RLX1dJREdFVCh3ZWJraXRXZWJWaWV3QmFzZSkpOworI2Vs c2UKICAgICAgICAgcHJpdi0+ZW1vamlDaG9vc2VyID0gd2Via2l0RW1vamlDaG9vc2VyTmV3KCk7 CisgICAgICAgIGd0a19wb3BvdmVyX3NldF9yZWxhdGl2ZV90byhHVEtfUE9QT1ZFUihwcml2LT5l bW9qaUNob29zZXIpLCBHVEtfV0lER0VUKHdlYmtpdFdlYlZpZXdCYXNlKSk7CisjZW5kaWYKICAg ICAgICAgZ19zaWduYWxfY29ubmVjdF9zd2FwcGVkKHByaXYtPmVtb2ppQ2hvb3NlciwgImVtb2pp LXBpY2tlZCIsIEdfQ0FMTEJBQ0soZW1vamlDaG9vc2VyRW1vamlQaWNrZWQpLCB3ZWJraXRXZWJW aWV3QmFzZSk7CiAgICAgICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZChwcml2LT5lbW9qaUNo b29zZXIsICJjbG9zZWQiLCBHX0NBTExCQUNLKGVtb2ppQ2hvb3NlckNsb3NlZCksIHdlYmtpdFdl YlZpZXdCYXNlKTsKLSAgICAgICAgZ3RrX3BvcG92ZXJfc2V0X3JlbGF0aXZlX3RvKEdUS19QT1BP VkVSKHByaXYtPmVtb2ppQ2hvb3NlciksIEdUS19XSURHRVQod2Via2l0V2ViVmlld0Jhc2UpKTsK ICAgICB9CiAKICAgICBwcml2LT5lbW9qaUNob29zZXJDb21wbGV0aW9uSGFuZGxlciA9IFdURk1v dmUoY29tcGxldGlvbkhhbmRsZXIpOwo=