191412 2018-11-07 19:54:55 -0800 Provide better Font fallbacks for DirectX backend 2018-11-07 21:15:04 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 191411 1 bfulgham bfulgham achristensen bfulgham dino don.olmstead ews-watchlist mmaxfield webkit-bug-importer zalan oldest_to_newest 1476407 0 bfulgham 2018-11-07 19:54:55 -0800 Custom font registration through GDI aren't always found when using the GDI/DirectX bridge. If a font is not found, rather than failing outright or crashing we should locate the closest match and use that. 1476408 1 webkit-bug-importer 2018-11-07 19:56:20 -0800 <rdar://problem/45899207> 1476410 2 354204 bfulgham 2018-11-07 20:01:42 -0800 Created attachment 354204 Patch 1476417 3 354204 zalan 2018-11-07 20:59:26 -0800 Comment on attachment 354204 Patch rs=me 1476420 4 bfulgham 2018-11-07 21:15:04 -0800 Committed r237980: <https://trac.webkit.org/changeset/237980> 354204 2018-11-07 20:01:42 -0800 2018-11-07 20:59:26 -0800 Patch bug-191412-20181107200140.patch text/plain 6404 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzNzk3OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE4LTExLTA3ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFByb3ZpZGUgYmV0dGVyIEZv bnQgZmFsbGJhY2tzIGZvciBEaXJlY3RYIGJhY2tlbmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MTQxMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0v NDU4OTkyMDc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgUmVnaXN0cmF0aW9uIG9mIGN1c3RvbSBmb250cyB0aHJvdWdoIEdESSBhcmUgbm90IGFsd2F5 cyB2aXNpYmxlCisgICAgICAgIHRocm91Z2ggdGhlIERpcmVjdFdyaXRlL0dESSBicmlkZ2luZyBs YXllci4gSWYgYSBmb250IGlzIG5vdCBsb2NhdGVkLAorICAgICAgICBsb2NhdGUgdGhlIGNsb3Nl c3QgbWF0Y2hpbmcgYXZpYWxhYmxlIGZvbnQgcmF0aGVyIHRoYW4gZmFpbGluZy4KKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURhdGEuaDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy93aW4vRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpGb250Q3VzdG9tUGxhdGZvcm1EYXRhOjpmb250UGxhdGZvcm1EYXRhKTogVXNlIG5l dyBmb250CisgICAgICAgIGZhbGxiYWNrIGxvZ2ljLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL3dpbi9Gb250UGxhdGZvcm1EYXRhRGlyZWN0MkQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Rm9udFBsYXRmb3JtRGF0YTo6cGxhdGZvcm1EYXRhSW5pdCk6CisgICAgICAgIChXZWJDb3JlOjpG b250UGxhdGZvcm1EYXRhOjpwbGF0Zm9ybUlzRXF1YWwgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6Rm9udFBsYXRmb3JtRGF0YTo6Y3JlYXRlRmFsbGJhY2tGb250KTogQWRkZWQuCisKIDIwMTgt MTEtMDcgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBDbGljayBh bmQgdG91Y2ggZXZlbnQgbGlzdGVuZXJzIG9uIHRoZSBib2R5IGRvbid0IHdvcmsKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURhdGEuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250UGxhdGZvcm1EYXRh LmgJKHJldmlzaW9uIDIzNzk3NikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0ZvbnRQbGF0Zm9ybURhdGEuaAkod29ya2luZyBjb3B5KQpAQCAtMTUwLDYgKzE1MCw4IEBAIHB1 YmxpYzoKICNpZiBVU0UoRElSRUNUMkQpCiAgICAgSURXcml0ZUZvbnQqIGR3Rm9udCgpIGNvbnN0 IHsgcmV0dXJuIG1fZHdGb250LmdldCgpOyB9CiAgICAgSURXcml0ZUZvbnRGYWNlKiBkd0ZvbnRG YWNlKCkgY29uc3QgeyByZXR1cm4gbV9kd0ZvbnRGYWNlLmdldCgpOyB9CisKKyAgICBzdGF0aWMg SFJFU1VMVCBjcmVhdGVGYWxsYmFja0ZvbnQoY29uc3QgTE9HRk9OVCYsIElEV3JpdGVGb250Kiop OwogI2VuZGlmCiAKICAgICBib29sIGlzRml4ZWRQaXRjaCgpIGNvbnN0OwpJbmRleDogU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250 Q3VzdG9tUGxhdGZvcm1EYXRhLmNwcAkocmV2aXNpb24gMjM3OTc2KQorKysgU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC02NSw3ICs2NSwxMSBAQCBGb250UGxhdGZvcm1EYXRhIEZvbnRDdXN0b21Q bGF0Zm9ybURhdGE6CiAgICAgbG9nRm9udC5sZlVuZGVybGluZSA9IGZhbHNlOwogICAgIGxvZ0Zv bnQubGZTdHJpa2VPdXQgPSBmYWxzZTsKICAgICBsb2dGb250LmxmQ2hhclNldCA9IERFRkFVTFRf Q0hBUlNFVDsKKyNpZiBVU0UoQ0cpIHx8IFVTRShDQUlSTykKICAgICBsb2dGb250LmxmT3V0UHJl Y2lzaW9uID0gT1VUX1RUX09OTFlfUFJFQ0lTOworI2Vsc2UKKyAgICBsb2dGb250LmxmT3V0UHJl Y2lzaW9uID0gT1VUX1RUX1BSRUNJUzsKKyNlbmRpZgogICAgIGxvZ0ZvbnQubGZRdWFsaXR5ID0g Q0xFQVJUWVBFX1FVQUxJVFk7CiAgICAgbG9nRm9udC5sZlBpdGNoQW5kRmFtaWx5ID0gREVGQVVM VF9QSVRDSCB8IEZGX0RPTlRDQVJFOwogICAgIGxvZ0ZvbnQubGZJdGFsaWMgPSBpdGFsaWM7CkBA IC03OSw2ICs4MywxMiBAQCBGb250UGxhdGZvcm1EYXRhIEZvbnRDdXN0b21QbGF0Zm9ybURhdGE6 CiAjZWxzZQogICAgIENPTVB0cjxJRFdyaXRlRm9udD4gZHdGb250OwogICAgIEhSRVNVTFQgaHIg PSBGb250OjpzeXN0ZW1EV3JpdGVHZGlJbnRlcm9wKCktPkNyZWF0ZUZvbnRGcm9tTE9HRk9OVCgm bG9nRm9udCwgJmR3Rm9udCk7CisgICAgaWYgKCFTVUNDRUVERUQoaHIpKSB7CisgICAgICAgIExP R0ZPTlQgY3VzdG9tRm9udDsKKyAgICAgICAgaHIgPSA6OkdldE9iamVjdChoZm9udC5nZXQoKSwg c2l6ZW9mKExPR0ZPTlQpLCAmY3VzdG9tRm9udCk7CisgICAgICAgIGlmIChTVUNDRUVERUQoaHIp KQorICAgICAgICAgICAgaHIgPSBGb250UGxhdGZvcm1EYXRhOjpjcmVhdGVGYWxsYmFja0ZvbnQo Y3VzdG9tRm9udCwgJmR3Rm9udCk7CisgICAgfQogICAgIFJFTEVBU0VfQVNTRVJUKFNVQ0NFRURF RChocikpOwogICAgIHJldHVybiBGb250UGxhdGZvcm1EYXRhKFdURk1vdmUoaGZvbnQpLCBkd0Zv bnQuZ2V0KCksIHNpemUsIGJvbGQsIGl0YWxpYywgcmVuZGVyaW5nTW9kZSA9PSBGb250UmVuZGVy aW5nTW9kZTo6QWx0ZXJuYXRlKTsKICNlbmRpZgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvd2luL0ZvbnRQbGF0Zm9ybURhdGFEaXJlY3QyRC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRQbGF0Zm9ybURhdGFE aXJlY3QyRC5jcHAJKHJldmlzaW9uIDIzNzk3NikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3dpbi9Gb250UGxhdGZvcm1EYXRhRGlyZWN0MkQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC00Miw4ICs0MiwxMSBAQCB2b2lkIEZvbnRQbGF0Zm9ybURhdGE6OnBsYXRmb3JtRGF0YUlu aXQoCiAgICAgR2V0T2JqZWN0KGZvbnQsIHNpemVvZihsb2dmb250KSwgJmxvZ2ZvbnQpOwogCiAg ICAgSFJFU1VMVCBociA9IEZvbnQ6OnN5c3RlbURXcml0ZUdkaUludGVyb3AoKS0+Q3JlYXRlRm9u dEZyb21MT0dGT05UKCZsb2dmb250LCAmbV9kd0ZvbnQpOwotICAgIGlmICghU1VDQ0VFREVEKGhy KSkKLSAgICAgICAgcmV0dXJuOworICAgIGlmICghU1VDQ0VFREVEKGhyKSkgeworICAgICAgICBo ciA9IEZvbnRQbGF0Zm9ybURhdGE6OmNyZWF0ZUZhbGxiYWNrRm9udChsb2dmb250LCAmbV9kd0Zv bnQpOworICAgICAgICBpZiAoIVNVQ0NFRURFRChocikpCisgICAgICAgICAgICByZXR1cm47Cisg ICAgfQogCiAgICAgaHIgPSBtX2R3Rm9udC0+Q3JlYXRlRm9udEZhY2UoJm1fZHdGb250RmFjZSk7 CiAgICAgaWYgKCFTVUNDRUVERUQoaHIpKQpAQCAtMTE2LDYgKzExOSw3NCBAQCBib29sIEZvbnRQ bGF0Zm9ybURhdGE6OnBsYXRmb3JtSXNFcXVhbChjCiAgICAgICAgICYmIGZvbnRzQXJlRXF1YWwo bV9kd0ZvbnQuZ2V0KCksIG90aGVyLm1fZHdGb250LmdldCgpKTsKIH0KIAorSFJFU1VMVCBGb250 UGxhdGZvcm1EYXRhOjpjcmVhdGVGYWxsYmFja0ZvbnQoY29uc3QgTE9HRk9OVCYgbG9nRm9udCwg SURXcml0ZUZvbnQqKiBkd0ZvbnQpCit7CisgICAgaWYgKCFkd0ZvbnQpCisgICAgICAgIHJldHVy biBFX1BPSU5URVI7CisKKyAgICBDT01QdHI8SURXcml0ZUZvbnRDb2xsZWN0aW9uPiBmb250Q29s bGVjdGlvbjsKKyAgICBIUkVTVUxUIGhyID0gRm9udDo6c3lzdGVtRFdyaXRlRmFjdG9yeSgpLT5H ZXRTeXN0ZW1Gb250Q29sbGVjdGlvbigmZm9udENvbGxlY3Rpb24pOworICAgIGlmIChGQUlMRUQo aHIpKQorICAgICAgICByZXR1cm4gaHI7CisKKyAgICB3Y2hhcl90IGxvY2FsZU5hbWVbTE9DQUxF X05BTUVfTUFYX0xFTkdUSF07CisgICAgaW50IGxvY2FsZUxlbmd0aCA9IEdldFVzZXJEZWZhdWx0 TG9jYWxlTmFtZShsb2NhbGVOYW1lLCBMT0NBTEVfTkFNRV9NQVhfTEVOR1RIKTsKKworICAgIENP TVB0cjxJRFdyaXRlRm9udEZhbWlseT4gZm9udEZhbWlseTsKKworICAgIHVuc2lnbmVkIGZvbnRG YW1pbHlDb3VudCA9IGZvbnRDb2xsZWN0aW9uLT5HZXRGb250RmFtaWx5Q291bnQoKTsKKyAgICBm b3IgKHVuc2lnbmVkIGZvbnRJbmRleCA9IDA7IGZvbnRJbmRleCA8IGZvbnRGYW1pbHlDb3VudDsg Kytmb250SW5kZXgpIHsKKyAgICAgICAgaHIgPSBmb250Q29sbGVjdGlvbi0+R2V0Rm9udEZhbWls eShmb250SW5kZXgsICZmb250RmFtaWx5KTsKKyAgICAgICAgaWYgKEZBSUxFRChocikpCisgICAg ICAgICAgICByZXR1cm4gaHI7CisKKyAgICAgICAgQ09NUHRyPElEV3JpdGVMb2NhbGl6ZWRTdHJp bmdzPiBmYW1pbHlOYW1lczsKKyAgICAgICAgaHIgPSBmb250RmFtaWx5LT5HZXRGYW1pbHlOYW1l cygmZmFtaWx5TmFtZXMpOworICAgICAgICBpZiAoRkFJTEVEKGhyKSkKKyAgICAgICAgICAgIHJl dHVybiBocjsKKworICAgICAgICBCT09MIGV4aXN0cyA9IGZhbHNlOworICAgICAgICB1bnNpZ25l ZCBsb2NhbGVJbmRleCA9IDA7CisgICAgICAgIGlmIChsb2NhbGVMZW5ndGgpCisgICAgICAgICAg ICBociA9IGZhbWlseU5hbWVzLT5GaW5kTG9jYWxlTmFtZShsb2NhbGVOYW1lLCAmbG9jYWxlSW5k ZXgsICZleGlzdHMpOworCisgICAgICAgIGlmIChTVUNDRUVERUQoaHIpICYmICFleGlzdHMpCisg ICAgICAgICAgICBociA9IGZhbWlseU5hbWVzLT5GaW5kTG9jYWxlTmFtZShMImVuLXVzIiwgJmxv Y2FsZUluZGV4LCAmZXhpc3RzKTsKKworICAgICAgICBpZiAoRkFJTEVEKGhyKSkKKyAgICAgICAg ICAgIHJldHVybiBocjsKKworICAgICAgICB1bnNpZ25lZCBmYW1pbHlOYW1lTGVuZ3RoID0gMDsK KyAgICAgICAgaHIgPSBmYW1pbHlOYW1lcy0+R2V0U3RyaW5nTGVuZ3RoKGxvY2FsZUluZGV4LCAm ZmFtaWx5TmFtZUxlbmd0aCk7CisgICAgICAgIGlmICghU1VDQ0VFREVEKGhyKSkKKyAgICAgICAg ICAgIHJldHVybiBocjsKKworICAgICAgICBWZWN0b3I8d2NoYXJfdD4gZmFtaWx5TmFtZShmYW1p bHlOYW1lTGVuZ3RoICsgMSk7CisgICAgICAgIGhyID0gZmFtaWx5TmFtZXMtPkdldFN0cmluZyhs b2NhbGVJbmRleCwgZmFtaWx5TmFtZS5kYXRhKCksIGZhbWlseU5hbWUuc2l6ZSgpKTsKKyAgICAg ICAgaWYgKCFTVUNDRUVERUQoaHIpKQorICAgICAgICAgICAgcmV0dXJuIGhyOworCisgICAgICAg IGlmICghd2NzY21wKGxvZ0ZvbnQubGZGYWNlTmFtZSwgZmFtaWx5TmFtZS5kYXRhKCkpKQorICAg ICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgZm9udEZhbWlseSA9IG51bGxwdHI7CisgICAgfQor CisgICAgaWYgKCFmb250RmFtaWx5KSB7CisgICAgICAgIGhyID0gZm9udENvbGxlY3Rpb24tPkdl dEZvbnRGYW1pbHkoMCwgJmZvbnRGYW1pbHkpOworICAgICAgICBpZiAoRkFJTEVEKGhyKSkKKyAg ICAgICAgICAgIHJldHVybiBocjsKKyAgICB9CisKKyAgICBEV1JJVEVfRk9OVF9XRUlHSFQgd2Vp Z2h0ID0gc3RhdGljX2Nhc3Q8RFdSSVRFX0ZPTlRfV0VJR0hUPihsb2dGb250LmxmV2VpZ2h0KTsK KyAgICBEV1JJVEVfRk9OVF9TVFJFVENIIHN0cmV0Y2ggPSBzdGF0aWNfY2FzdDxEV1JJVEVfRk9O VF9TVFJFVENIPihsb2dGb250LmxmUXVhbGl0eSk7CisgICAgRFdSSVRFX0ZPTlRfU1RZTEUgc3R5 bGUgPSBsb2dGb250LmxmSXRhbGljID8gRFdSSVRFX0ZPTlRfU1RZTEVfSVRBTElDIDogRFdSSVRF X0ZPTlRfU1RZTEVfTk9STUFMOworCisgICAgaHIgPSBmb250RmFtaWx5LT5HZXRGaXJzdE1hdGNo aW5nRm9udCh3ZWlnaHQsIHN0cmV0Y2gsIHN0eWxlLCBkd0ZvbnQpOworCisgICAgcmV0dXJuIGhy OworfQorCiB9CiAKICNlbmRpZgo=