212332 2020-05-24 06:03:39 -0700 [GTK4] Use screen font options as default 2020-05-26 01:01:27 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 210100 1 cgarcia webkit-unassigned aperez bugs-noreply oldest_to_newest 1655713 0 cgarcia 2020-05-24 06:03:39 -0700 . 1655826 1 400194 cgarcia 2020-05-25 04:45:04 -0700 Created attachment 400194 Patch 1655984 2 cgarcia 2020-05-26 01:01:27 -0700 Committed r262138: <https://trac.webkit.org/changeset/262138> 400194 2020-05-25 04:45:04 -0700 2020-05-25 08:52:54 -0700 Patch wkgtk4-font-options.diff text/plain 6429 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3MDcxZDIyM2FkMTMuLmQzNjNhYmI1OGE4MyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDIxIEBACisyMDIwLTA1LTI1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLNF0gVXNlIHNjcmVlbiBmb250IG9wdGlvbnMgYXMg ZGVmYXVsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjEyMzMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGhlcmUncyBubyBnZGtfc2NyZWVuX2dldF9mb250X29wdGlvbnMoKSBpbiBHVEs0LCBzbyB3ZSBu ZWVkIHRvIGdldCB0aGUgaW5kaXZpZHVhbCBwcm9wZXJ0aWVzIGZyb20gdGhlIHNldHRpbmdzCisg ICAgICAgIGFuZCBidWlsZCBhIGNhaXJvX2ZvbnRfb3B0aW9uc190LiBXZSBjYW4ganVzdCBkbyB0 aGUgc2FtZSBpbiBHVEszIHRvIGF2b2lkIGlmZGVmcy4gQWRkIGEgaGVscGVyCisgICAgICAgIFN5 c3RlbUZvbnRPcHRpb25zIHNpbmdsZXRvbiBjbGFzcyB0byBtb25pdG9yIGFuZCBwYXJzZSB0aGUg Zm9udCBzZXR0aW5ncy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2d0ay9HZGtDYWly b1V0aWxpdGllcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTeXN0ZW1Gb250T3B0aW9uczo6c2lu Z2xldG9uKToKKyAgICAgICAgKFdlYkNvcmU6OlN5c3RlbUZvbnRPcHRpb25zOjpTeXN0ZW1Gb250 T3B0aW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpTeXN0ZW1Gb250T3B0aW9uczo6Zm9udE9wdGlv bnMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6U3lzdGVtRm9udE9wdGlvbnM6OnVwZGF0ZUZv bnRPcHRpb25zKToKKyAgICAgICAgKFdlYkNvcmU6OmdldERlZmF1bHRDYWlyb0ZvbnRPcHRpb25z KToKKwogMjAyMC0wNS0yNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5j b20+CiAKICAgICAgICAgW0dUSzRdIE1ha2UgUG9pbnRlckxvY2sgd29yawpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0dka0NhaXJvVXRpbGl0aWVzLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9HZGtDYWlyb1V0aWxpdGll cy5jcHAKaW5kZXggMGVjMWRjODQ3MDI0Li5jOWNlNmEwY2YyZjggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9HZGtDYWlyb1V0aWxpdGllcy5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0dka0NhaXJvVXRpbGl0aWVz LmNwcApAQCAtMjQsOSArMjQsMTAgQEAKICAqLwogCiAjaW5jbHVkZSAiY29uZmlnLmgiCi0jaW5j bHVkZSAiQ2Fpcm9VdGlsaXRpZXMuaCIKLQogI2luY2x1ZGUgIkdka0NhaXJvVXRpbGl0aWVzLmgi CisKKyNpbmNsdWRlICJDYWlyb1VuaXF1ZVB0ci5oIgorI2luY2x1ZGUgIkNhaXJvVXRpbGl0aWVz LmgiCiAjaW5jbHVkZSAiSW50U2l6ZS5oIgogI2luY2x1ZGUgPGNhaXJvLmg+CiAjaW5jbHVkZSA8 Z3RrL2d0ay5oPgpAQCAtMzYsMjEgKzM3LDEwNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK K2NsYXNzIFN5c3RlbUZvbnRPcHRpb25zIHsKK3B1YmxpYzoKKyAgICBzdGF0aWMgU3lzdGVtRm9u dE9wdGlvbnMmIHNpbmdsZXRvbigpCisgICAgeworICAgICAgICBzdGF0aWMgTGF6eU5ldmVyRGVz dHJveWVkPFN5c3RlbUZvbnRPcHRpb25zPiBmb250T3B0aW9uczsKKyAgICAgICAgc3RhdGljIHN0 ZDo6b25jZV9mbGFnIGZsYWc7CisgICAgICAgIHN0ZDo6Y2FsbF9vbmNlKGZsYWcsIFsmXSB7Cisg ICAgICAgICAgICBmb250T3B0aW9ucy5jb25zdHJ1Y3QoKTsKKyAgICAgICAgfSk7CisgICAgICAg IHJldHVybiBmb250T3B0aW9uczsKKyAgICB9CisKKyAgICBTeXN0ZW1Gb250T3B0aW9ucygpCisg ICAgICAgIDogbV9zZXR0aW5ncyhndGtfc2V0dGluZ3NfZ2V0X2RlZmF1bHQoKSkKKyAgICB7Cisg ICAgICAgIGlmIChtX3NldHRpbmdzKSB7CisgICAgICAgICAgICBhdXRvIGZvbnRPcHRpb25zQ2hh bmdlZENhbGxiYWNrID0gK1tdKEd0a1NldHRpbmdzKiwgR1BhcmFtU3BlYyosIFN5c3RlbUZvbnRP cHRpb25zKiBzeXN0ZW1Gb250T3B0aW9ucykgeworICAgICAgICAgICAgICAgIHN5c3RlbUZvbnRP cHRpb25zLT51cGRhdGVGb250T3B0aW9ucygpOworICAgICAgICAgICAgfTsKKyAgICAgICAgICAg IGdfc2lnbmFsX2Nvbm5lY3QobV9zZXR0aW5ncywgIm5vdGlmeTo6Z3RrLXhmdC1hbnRpYWxpYXMi LCBHX0NBTExCQUNLKGZvbnRPcHRpb25zQ2hhbmdlZENhbGxiYWNrKSwgdGhpcyk7CisgICAgICAg ICAgICBnX3NpZ25hbF9jb25uZWN0KG1fc2V0dGluZ3MsICJub3RpZnk6Omd0ay14ZnQtaGludGlu ZyIsIEdfQ0FMTEJBQ0soZm9udE9wdGlvbnNDaGFuZ2VkQ2FsbGJhY2spLCB0aGlzKTsKKyAgICAg ICAgICAgIGdfc2lnbmFsX2Nvbm5lY3QobV9zZXR0aW5ncywgIm5vdGlmeTo6Z3RrLXhmdC1oaW50 c3R5bGUiLCBHX0NBTExCQUNLKGZvbnRPcHRpb25zQ2hhbmdlZENhbGxiYWNrKSwgdGhpcyk7Cisg ICAgICAgICAgICBnX3NpZ25hbF9jb25uZWN0KG1fc2V0dGluZ3MsICJub3RpZnk6Omd0ay14ZnQt cmdiYSIsIEdfQ0FMTEJBQ0soZm9udE9wdGlvbnNDaGFuZ2VkQ2FsbGJhY2spLCB0aGlzKTsKKyAg ICAgICAgICAgIHVwZGF0ZUZvbnRPcHRpb25zKCk7CisgICAgICAgIH0gZWxzZQorICAgICAgICAg ICAgbV9mb250T3B0aW9ucy5yZXNldChjYWlyb19mb250X29wdGlvbnNfY3JlYXRlKCkpOworICAg IH0KKworICAgIGNvbnN0IGNhaXJvX2ZvbnRfb3B0aW9uc190KiBmb250T3B0aW9ucygpIGNvbnN0 CisgICAgeworICAgICAgICByZXR1cm4gbV9mb250T3B0aW9ucy5nZXQoKTsKKyAgICB9CisKK3By aXZhdGU6CisgICAgdm9pZCB1cGRhdGVGb250T3B0aW9ucygpCisgICAgeworICAgICAgICBtX2Zv bnRPcHRpb25zLnJlc2V0KGNhaXJvX2ZvbnRfb3B0aW9uc19jcmVhdGUoKSk7CisKKyAgICAgICAg Z2ludCBhbnRpYWxpYXMsIGhpbnRpbmc7CisgICAgICAgIEdVbmlxdWVPdXRQdHI8Y2hhcj4gaGlu dFN0eWxlU3RyaW5nOworICAgICAgICBHVW5pcXVlT3V0UHRyPGNoYXI+IHJnYmFTdHJpbmc7Cisg ICAgICAgIGdfb2JqZWN0X2dldChtX3NldHRpbmdzLCAiZ3RrLXhmdC1hbnRpYWxpYXMiLCAmYW50 aWFsaWFzLCAiZ3RrLXhmdC1oaW50aW5nIiwgJmhpbnRpbmcsICJndGsteGZ0LWhpbnRzdHlsZSIs CisgICAgICAgICAgICAmaGludFN0eWxlU3RyaW5nLm91dFB0cigpLCAiZ3RrLXhmdC1yZ2JhIiwg JnJnYmFTdHJpbmcub3V0UHRyKCksIG51bGxwdHIpOworCisgICAgICAgIGNhaXJvX2ZvbnRfb3B0 aW9uc19zZXRfaGludF9tZXRyaWNzKG1fZm9udE9wdGlvbnMuZ2V0KCksIENBSVJPX0hJTlRfTUVU UklDU19PTik7CisKKyAgICAgICAgY2Fpcm9faGludF9zdHlsZV90IGhpbnRTdHlsZSA9IENBSVJP X0hJTlRfU1RZTEVfREVGQVVMVDsKKyAgICAgICAgc3dpdGNoIChoaW50aW5nKSB7CisgICAgICAg IGNhc2UgMDoKKyAgICAgICAgICAgIGhpbnRTdHlsZSA9IENBSVJPX0hJTlRfU1RZTEVfTk9ORTsK KyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIDE6CisgICAgICAgICAgICBpZiAoaGlu dFN0eWxlU3RyaW5nKSB7CisgICAgICAgICAgICAgICAgaWYgKCFzdHJjbXAoaGludFN0eWxlU3Ry aW5nLmdldCgpLCAiaGludG5vbmUiKSkKKyAgICAgICAgICAgICAgICAgICAgaGludFN0eWxlID0g Q0FJUk9fSElOVF9TVFlMRV9OT05FOworICAgICAgICAgICAgICAgIGVsc2UgaWYgKCFzdHJjbXAo aGludFN0eWxlU3RyaW5nLmdldCgpLCAiaGludHNsaWdodCIpKQorICAgICAgICAgICAgICAgICAg ICBoaW50U3R5bGUgPSBDQUlST19ISU5UX1NUWUxFX1NMSUdIVDsKKyAgICAgICAgICAgICAgICBl bHNlIGlmICghc3RyY21wKGhpbnRTdHlsZVN0cmluZy5nZXQoKSwgImhpbnRtZWRpdW0iKSkKKyAg ICAgICAgICAgICAgICAgICAgaGludFN0eWxlID0gQ0FJUk9fSElOVF9TVFlMRV9NRURJVU07Cisg ICAgICAgICAgICAgICAgZWxzZSBpZiAoIXN0cmNtcChoaW50U3R5bGVTdHJpbmcuZ2V0KCksICJo aW50ZnVsbCIpKQorICAgICAgICAgICAgICAgICAgICBoaW50U3R5bGUgPSBDQUlST19ISU5UX1NU WUxFX0ZVTEw7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQor ICAgICAgICBjYWlyb19mb250X29wdGlvbnNfc2V0X2hpbnRfc3R5bGUobV9mb250T3B0aW9ucy5n ZXQoKSwgaGludFN0eWxlKTsKKworICAgICAgICBjYWlyb19zdWJwaXhlbF9vcmRlcl90IHN1YnBp eGVsT3JkZXIgPSBDQUlST19TVUJQSVhFTF9PUkRFUl9ERUZBVUxUOworICAgICAgICBpZiAocmdi YVN0cmluZykgeworICAgICAgICAgICAgaWYgKCFzdHJjbXAocmdiYVN0cmluZy5nZXQoKSwgInJn YiIpKQorICAgICAgICAgICAgICAgIHN1YnBpeGVsT3JkZXIgPSBDQUlST19TVUJQSVhFTF9PUkRF Ul9SR0I7CisgICAgICAgICAgICBlbHNlIGlmICghc3RyY21wKHJnYmFTdHJpbmcuZ2V0KCksICJi Z3IiKSkKKyAgICAgICAgICAgICAgICBzdWJwaXhlbE9yZGVyID0gQ0FJUk9fU1VCUElYRUxfT1JE RVJfQkdSOworICAgICAgICAgICAgZWxzZSBpZiAoIXN0cmNtcChyZ2JhU3RyaW5nLmdldCgpLCAi dnJnYiIpKQorICAgICAgICAgICAgICAgIHN1YnBpeGVsT3JkZXIgPSBDQUlST19TVUJQSVhFTF9P UkRFUl9WUkdCOworICAgICAgICAgICAgZWxzZSBpZiAoIXN0cmNtcChyZ2JhU3RyaW5nLmdldCgp LCAidmJnciIpKQorICAgICAgICAgICAgICAgIHN1YnBpeGVsT3JkZXIgPSBDQUlST19TVUJQSVhF TF9PUkRFUl9WQkdSOworICAgICAgICB9CisgICAgICAgIGNhaXJvX2ZvbnRfb3B0aW9uc19zZXRf c3VicGl4ZWxfb3JkZXIobV9mb250T3B0aW9ucy5nZXQoKSwgc3VicGl4ZWxPcmRlcik7CisKKyAg ICAgICAgY2Fpcm9fYW50aWFsaWFzX3QgYW50aWFsaWFzTW9kZSA9IENBSVJPX0FOVElBTElBU19E RUZBVUxUOworICAgICAgICBzd2l0Y2ggKGFudGlhbGlhcykgeworICAgICAgICBjYXNlIDA6Cisg ICAgICAgICAgICBhbnRpYWxpYXNNb2RlID0gQ0FJUk9fQU5USUFMSUFTX05PTkU7CisgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgY2FzZSAxOgorICAgICAgICAgICAgaWYgKHN1YnBpeGVsT3Jk ZXIgIT0gQ0FJUk9fU1VCUElYRUxfT1JERVJfREVGQVVMVCkKKyAgICAgICAgICAgICAgICBhbnRp YWxpYXNNb2RlID0gQ0FJUk9fQU5USUFMSUFTX1NVQlBJWEVMOworICAgICAgICAgICAgZWxzZQor ICAgICAgICAgICAgICAgIGFudGlhbGlhc01vZGUgPSBDQUlST19BTlRJQUxJQVNfR1JBWTsKKyAg ICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgICAgIGNhaXJvX2ZvbnRfb3B0aW9uc19z ZXRfYW50aWFsaWFzKG1fZm9udE9wdGlvbnMuZ2V0KCksIGFudGlhbGlhc01vZGUpOworICAgIH0K KworICAgIEd0a1NldHRpbmdzKiBtX3NldHRpbmdzOworICAgIENhaXJvVW5pcXVlUHRyPGNhaXJv X2ZvbnRfb3B0aW9uc190PiBtX2ZvbnRPcHRpb25zOworfTsKKwogY29uc3QgY2Fpcm9fZm9udF9v cHRpb25zX3QqIGdldERlZmF1bHRDYWlyb0ZvbnRPcHRpb25zKCkKIHsKLSNpZiAhVVNFKEdUSzQp Ci0gICAgaWYgKGF1dG8qIHNjcmVlbiA9IGdka19zY3JlZW5fZ2V0X2RlZmF1bHQoKSkgewotICAg ICAgICBpZiAoYXV0byogb3B0aW9ucyA9IGdka19zY3JlZW5fZ2V0X2ZvbnRfb3B0aW9ucyhzY3Jl ZW4pKQotICAgICAgICAgICAgcmV0dXJuIG9wdGlvbnM7Ci0gICAgfQotI2VuZGlmCi0KLSAgICBz dGF0aWMgY2Fpcm9fZm9udF9vcHRpb25zX3QqIG9wdGlvbnM7Ci0gICAgc3RhdGljIHN0ZDo6b25j ZV9mbGFnIGZsYWc7Ci0gICAgc3RkOjpjYWxsX29uY2UoZmxhZywgW10gewotICAgICAgICBvcHRp b25zID0gY2Fpcm9fZm9udF9vcHRpb25zX2NyZWF0ZSgpOwotICAgIH0pOwotICAgIHJldHVybiBv cHRpb25zOworICAgIHJldHVybiBTeXN0ZW1Gb250T3B0aW9uczo6c2luZ2xldG9uKCkuZm9udE9w dGlvbnMoKTsKIH0KIAogR2RrUGl4YnVmKiBjYWlyb1N1cmZhY2VUb0dka1BpeGJ1ZihjYWlyb19z dXJmYWNlX3QqIHN1cmZhY2UpCkBAIC01OSw0ICsxNDYsNCBAQCBHZGtQaXhidWYqIGNhaXJvU3Vy ZmFjZVRvR2RrUGl4YnVmKGNhaXJvX3N1cmZhY2VfdCogc3VyZmFjZSkKICAgICByZXR1cm4gZ2Rr X3BpeGJ1Zl9nZXRfZnJvbV9zdXJmYWNlKHN1cmZhY2UsIDAsIDAsIHNpemUud2lkdGgoKSwgc2l6 ZS5oZWlnaHQoKSk7CiB9CiAKLX0KK30gLy8gbmFtZXNwYWNlIFdlYkNvcmUK