215838 2020-08-25 22:10:59 -0700 Move FreeType port's Font::platformWidthForGlyph and Font::platformBoundsForGlyph for Cairo port (WinCairo port) 2020-08-25 23:16:13 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 fujii fujii cgarcia don.olmstead ews-watchlist mmaxfield ross.kirsling webkit-bug-importer oldest_to_newest 1682912 0 fujii 2020-08-25 22:10:59 -0700 Move FreeType port's Font::platformWidthForGlyph and Font::platformBoundsForGlyph for Cairo port (WinCairo port) I'd like to use FreeType port's Font::platformWidthForGlyph and Font::platformBoundsForGlyph in WinCairo port because they are platform independent. WinCairo is using GDI API to implement them. This can be a problem for Cairo DirectWrite font backend (Bug 215259). 1682914 1 407273 fujii 2020-08-25 22:18:07 -0700 Created attachment 407273 Patch 1682918 2 407273 fujii 2020-08-25 23:15:35 -0700 Comment on attachment 407273 Patch Clearing flags on attachment: 407273 Committed r266160: <https://trac.webkit.org/changeset/266160> 1682919 3 fujii 2020-08-25 23:15:39 -0700 All reviewed patches have been landed. Closing bug. 1682921 4 webkit-bug-importer 2020-08-25 23:16:13 -0700 <rdar://problem/67783551> 407273 2020-08-25 22:18:07 -0700 2020-08-25 23:15:35 -0700 Patch bug-215838-20200826141806.patch text/plain 6758 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2MDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDlhMmY2MmRlOGM3YmJi NGQyNDA3MTdkY2RiOGRlMTIyNWExMmI5OS4uZWQzYTI3NWU1NzkwYjY2MjZlZThjYzZjOWJjZDRi MmE3ODI5MmY0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA4LTI1ICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIE1vdmUgRnJl ZVR5cGUgcG9ydCdzIEZvbnQ6OnBsYXRmb3JtV2lkdGhGb3JHbHlwaCBhbmQgRm9udDo6cGxhdGZv cm1Cb3VuZHNGb3JHbHlwaCBmb3IgQ2Fpcm8gcG9ydCAoV2luQ2Fpcm8gcG9ydCkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTgzOAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdpbkNhaXJvIHdhcyB1c2lu ZyBHREkgQVBJIHRvIGltcGxlbWVudAorICAgICAgICBGb250OjpwbGF0Zm9ybVdpZHRoRm9yR2x5 cGggYW5kIEZvbnQ6OnBsYXRmb3JtQm91bmRzRm9yR2x5cGguIFRoaXMKKyAgICAgICAgaXMgYSBw cm9ibGVtIGZvciBDYWlybyBEaXJlY3RXcml0ZSBmb250IGJhY2tlbmQgKEJ1ZyAyMTUyNTkpLgor ICAgICAgICBGcmVlVHlwZSBwb3J0IGhhcyBwbGF0Zm9ybSBpbmRlcGVuZGVudCBpbXBsZW1lbnRh dGlvbnMgd2hpY2ggYXJlCisgICAgICAgIHVzaW5nIENhaXJvIEFQSS4gVXNlIHRoZW0gZm9yIFdp bkNhaXJvLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENhaXJvLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OnBsYXRmb3JtQm91bmRzRm9yR2x5cGggY29uc3Qp OiBNb3ZlZCBmcm9tIFNpbXBsZUZvbnREYXRhRnJlZVR5cGUuY3BwLgorICAgICAgICAoV2ViQ29y ZTo6Rm9udDo6cGxhdGZvcm1XaWR0aEZvckdseXBoIGNvbnN0KTogRGl0dG8uCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvU2ltcGxlRm9udERhdGFGcmVlVHlwZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpGb250OjpwbGF0Zm9ybUJvdW5kc0ZvckdseXBoIGNvbnN0KTogTW92 ZWQgdG8gRm9udENhaXJvLmNwcC4KKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OnBsYXRmb3JtV2lk dGhGb3JHbHlwaCBjb25zdCk6IERpdHRvLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dp bi9TaW1wbGVGb250RGF0YUNhaXJvV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OnBs YXRmb3JtQm91bmRzRm9yR2x5cGggY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6 Rm9udDo6cGxhdGZvcm1XaWR0aEZvckdseXBoIGNvbnN0KTogRGVsZXRlZC4KKwogMjAyMC0wOC0y NCAgRW1pbGlvIENvYm9zIMOBbHZhcmV6ICA8ZW1pbGlvQGNyaXNhbC5pbz4KIAogICAgICAgICBT dXBwb3J0IHF1b3RlczphdXRvIGFuZCBmaXggcXVvdGVzIHNlcmlhbGl6YXRpb24uCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9Gb250Q2Fpcm8uY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENhaXJvLmNwcApp bmRleCA4ZTE2MDc0OTlmYjBkODNlYjg4MmU5NDhjNTcyNTZhZDk2ZjQ4NGI1Li4xODU2ZjllOThi NTFmYzZhYTMxNDY1NWQ5MmM3MmQwMDU1ZTAyN2VlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9Gb250Q2Fpcm8uY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ZvbnRDYWlyby5jcHAKQEAgLTk2LDYgKzk2LDM2 IEBAIFBhdGggRm9udDo6cGxhdGZvcm1QYXRoRm9yR2x5cGgoR2x5cGggZ2x5cGgpIGNvbnN0CiAg ICAgcmV0dXJuIFBhdGgoV1RGTW92ZShjcikpOwogfQogCitGbG9hdFJlY3QgRm9udDo6cGxhdGZv cm1Cb3VuZHNGb3JHbHlwaChHbHlwaCBnbHlwaCkgY29uc3QKK3sKKyAgICBpZiAoIW1fcGxhdGZv cm1EYXRhLnNpemUoKSkKKyAgICAgICAgcmV0dXJuIEZsb2F0UmVjdCgpOworCisgICAgY2Fpcm9f Z2x5cGhfdCBjZ2x5cGggPSB7IGdseXBoLCAwLCAwIH07CisgICAgY2Fpcm9fdGV4dF9leHRlbnRz X3QgZXh0ZW50czsKKyAgICBjYWlyb19zY2FsZWRfZm9udF9nbHlwaF9leHRlbnRzKG1fcGxhdGZv cm1EYXRhLnNjYWxlZEZvbnQoKSwgJmNnbHlwaCwgMSwgJmV4dGVudHMpOworCisgICAgaWYgKGNh aXJvX3NjYWxlZF9mb250X3N0YXR1cyhtX3BsYXRmb3JtRGF0YS5zY2FsZWRGb250KCkpID09IENB SVJPX1NUQVRVU19TVUNDRVNTKQorICAgICAgICByZXR1cm4gRmxvYXRSZWN0KGV4dGVudHMueF9i ZWFyaW5nLCBleHRlbnRzLnlfYmVhcmluZywgZXh0ZW50cy53aWR0aCwgZXh0ZW50cy5oZWlnaHQp OworCisgICAgcmV0dXJuIEZsb2F0UmVjdCgpOworfQorCitmbG9hdCBGb250OjpwbGF0Zm9ybVdp ZHRoRm9yR2x5cGgoR2x5cGggZ2x5cGgpIGNvbnN0Cit7CisgICAgaWYgKCFtX3BsYXRmb3JtRGF0 YS5zaXplKCkpCisgICAgICAgIHJldHVybiAwOworCisgICAgaWYgKGNhaXJvX3NjYWxlZF9mb250 X3N0YXR1cyhtX3BsYXRmb3JtRGF0YS5zY2FsZWRGb250KCkpICE9IENBSVJPX1NUQVRVU19TVUND RVNTKQorICAgICAgICByZXR1cm4gbV9zcGFjZVdpZHRoOworCisgICAgY2Fpcm9fZ2x5cGhfdCBj YWlyb0dseXBoID0geyBnbHlwaCwgMCwgMCB9OworICAgIGNhaXJvX3RleHRfZXh0ZW50c190IGV4 dGVudHM7CisgICAgY2Fpcm9fc2NhbGVkX2ZvbnRfZ2x5cGhfZXh0ZW50cyhtX3BsYXRmb3JtRGF0 YS5zY2FsZWRGb250KCksICZjYWlyb0dseXBoLCAxLCAmZXh0ZW50cyk7CisgICAgZmxvYXQgd2lk dGggPSBwbGF0Zm9ybURhdGEoKS5vcmllbnRhdGlvbigpID09IEZvbnRPcmllbnRhdGlvbjo6SG9y aXpvbnRhbCA/IGV4dGVudHMueF9hZHZhbmNlIDogLWV4dGVudHMueV9hZHZhbmNlOworICAgIHJl dHVybiB3aWR0aCA/IHdpZHRoIDogbV9zcGFjZVdpZHRoOworfQorCiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCiAKICNlbmRpZiAvLyBVU0UoQ0FJUk8pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9TaW1wbGVGb250RGF0YUZyZWVUeXBlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL1NpbXBsZUZvbnREYXRh RnJlZVR5cGUuY3BwCmluZGV4IGI3NzUwYzc5YjEzMmMxODQ0NjkwOTY2ZDNlMjZkYTY4MTgxZWM2 Y2YuLmI5NjcyN2FiMzllNzY5N2MzN2Y3NjNjYTIzN2QxY2Q5YzM1NWYxYTggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL1NpbXBsZUZvbnREYXRh RnJlZVR5cGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0 eXBlL1NpbXBsZUZvbnREYXRhRnJlZVR5cGUuY3BwCkBAIC0yMDYsMzYgKzIwNiw2IEBAIHZvaWQg Rm9udDo6ZGV0ZXJtaW5lUGl0Y2goKQogICAgIG1fdHJlYXRBc0ZpeGVkUGl0Y2ggPSBtX3BsYXRm b3JtRGF0YS5pc0ZpeGVkUGl0Y2goKTsKIH0KIAotRmxvYXRSZWN0IEZvbnQ6OnBsYXRmb3JtQm91 bmRzRm9yR2x5cGgoR2x5cGggZ2x5cGgpIGNvbnN0Ci17Ci0gICAgaWYgKCFtX3BsYXRmb3JtRGF0 YS5zaXplKCkpCi0gICAgICAgIHJldHVybiBGbG9hdFJlY3QoKTsKLQotICAgIGNhaXJvX2dseXBo X3QgY2dseXBoID0geyBnbHlwaCwgMCwgMCB9OwotICAgIGNhaXJvX3RleHRfZXh0ZW50c190IGV4 dGVudHM7Ci0gICAgY2Fpcm9fc2NhbGVkX2ZvbnRfZ2x5cGhfZXh0ZW50cyhtX3BsYXRmb3JtRGF0 YS5zY2FsZWRGb250KCksICZjZ2x5cGgsIDEsICZleHRlbnRzKTsKLQotICAgIGlmIChjYWlyb19z Y2FsZWRfZm9udF9zdGF0dXMobV9wbGF0Zm9ybURhdGEuc2NhbGVkRm9udCgpKSA9PSBDQUlST19T VEFUVVNfU1VDQ0VTUykKLSAgICAgICAgcmV0dXJuIEZsb2F0UmVjdChleHRlbnRzLnhfYmVhcmlu ZywgZXh0ZW50cy55X2JlYXJpbmcsIGV4dGVudHMud2lkdGgsIGV4dGVudHMuaGVpZ2h0KTsKLQot ICAgIHJldHVybiBGbG9hdFJlY3QoKTsKLX0KLQotZmxvYXQgRm9udDo6cGxhdGZvcm1XaWR0aEZv ckdseXBoKEdseXBoIGdseXBoKSBjb25zdAotewotICAgIGlmICghbV9wbGF0Zm9ybURhdGEuc2l6 ZSgpKQotICAgICAgICByZXR1cm4gMDsKLQotICAgIGlmIChjYWlyb19zY2FsZWRfZm9udF9zdGF0 dXMobV9wbGF0Zm9ybURhdGEuc2NhbGVkRm9udCgpKSAhPSBDQUlST19TVEFUVVNfU1VDQ0VTUykK LSAgICAgICAgcmV0dXJuIG1fc3BhY2VXaWR0aDsKLQotICAgIGNhaXJvX2dseXBoX3QgY2Fpcm9H bHlwaCA9IHsgZ2x5cGgsIDAsIDAgfTsKLSAgICBjYWlyb190ZXh0X2V4dGVudHNfdCBleHRlbnRz OwotICAgIGNhaXJvX3NjYWxlZF9mb250X2dseXBoX2V4dGVudHMobV9wbGF0Zm9ybURhdGEuc2Nh bGVkRm9udCgpLCAmY2Fpcm9HbHlwaCwgMSwgJmV4dGVudHMpOwotICAgIGZsb2F0IHdpZHRoID0g cGxhdGZvcm1EYXRhKCkub3JpZW50YXRpb24oKSA9PSBGb250T3JpZW50YXRpb246Okhvcml6b250 YWwgPyBleHRlbnRzLnhfYWR2YW5jZSA6IC1leHRlbnRzLnlfYWR2YW5jZTsKLSAgICByZXR1cm4g d2lkdGggPyB3aWR0aCA6IG1fc3BhY2VXaWR0aDsKLX0KLQogYm9vbCBGb250Ojp2YXJpYW50Q2Fw c1N1cHBvcnRzQ2hhcmFjdGVyRm9yU3ludGhlc2lzKEZvbnRWYXJpYW50Q2FwcyBmb250VmFyaWFu dENhcHMsIFVDaGFyMzIpIGNvbnN0CiB7CiAgICAgc3dpdGNoIChmb250VmFyaWFudENhcHMpIHsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9TaW1wbGVG b250RGF0YUNhaXJvV2luLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dp bi9TaW1wbGVGb250RGF0YUNhaXJvV2luLmNwcAppbmRleCA1YmUzNWJmNmI3MjdiYWYyYTE4Y2E4 MmQwYTk1ZmIzMTg1ZDBkMGVkLi40NDZlMGExNjdkNzIxYTczZWFiMTJkYzM3ZGFiOGEzYjc3NDgx OWJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vU2lt cGxlRm9udERhdGFDYWlyb1dpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3Mvd2luL1NpbXBsZUZvbnREYXRhQ2Fpcm9XaW4uY3BwCkBAIC05NSw0OSArOTUsNCBAQCB2 b2lkIEZvbnQ6OnBsYXRmb3JtSW5pdCgpCiAgICAgUmVzdG9yZURDKGRjLCAtMSk7CiB9CiAKLUZs b2F0UmVjdCBGb250OjpwbGF0Zm9ybUJvdW5kc0ZvckdseXBoKEdseXBoIGdseXBoKSBjb25zdAot ewotICAgIGlmIChtX3BsYXRmb3JtRGF0YS51c2VHREkoKSkKLSAgICAgICAgcmV0dXJuIGJvdW5k c0ZvckdESUdseXBoKGdseXBoKTsKLQotICAgIEhXbmREQyBkYygwKTsKLSAgICBTYXZlREMoZGMp OwotICAgIGF1dG8gc2NhbGVkRm9udCA9IG1fcGxhdGZvcm1EYXRhLnNjYWxlZEZvbnQoKTsKLSAg ICBjYWlyb193aW4zMl9zY2FsZWRfZm9udF9zZWxlY3RfZm9udChzY2FsZWRGb250LCBkYyk7Ci0K LSAgICBHTFlQSE1FVFJJQ1MgZ2RpTWV0cmljczsKLSAgICBzdGF0aWMgY29uc3QgTUFUMiBpZGVu dGl0eSA9IHsgeyAwLCAxIH0sIHsgMCwgMCB9LCB7IDAsIDAgfSwgeyAwLCAxIH0gfTsKLSAgICBH ZXRHbHlwaE91dGxpbmUoZGMsIGdseXBoLCBHR09fTUVUUklDUyB8IEdHT19HTFlQSF9JTkRFWCwg JmdkaU1ldHJpY3MsIDAsIDAsICZpZGVudGl0eSk7Ci0KLSAgICBjYWlyb193aW4zMl9zY2FsZWRf Zm9udF9kb25lX2ZvbnQoc2NhbGVkRm9udCk7Ci0gICAgUmVzdG9yZURDKGRjLCAtMSk7Ci0gICAg cmV0dXJuIEZsb2F0UmVjdChnZGlNZXRyaWNzLmdtcHRHbHlwaE9yaWdpbi54LCAtZ2RpTWV0cmlj cy5nbXB0R2x5cGhPcmlnaW4ueSwKLSAgICAgICAgZ2RpTWV0cmljcy5nbUJsYWNrQm94WCArIG1f c3ludGhldGljQm9sZE9mZnNldCwgZ2RpTWV0cmljcy5nbUJsYWNrQm94WSk7Ci19Ci0gICAgCi1m bG9hdCBGb250OjpwbGF0Zm9ybVdpZHRoRm9yR2x5cGgoR2x5cGggZ2x5cGgpIGNvbnN0Ci17Ci0g ICAgaWYgKG1fcGxhdGZvcm1EYXRhLnVzZUdESSgpKQotICAgICAgIHJldHVybiB3aWR0aEZvckdE SUdseXBoKGdseXBoKTsKLQotICAgIGlmICghbV9wbGF0Zm9ybURhdGEuc2l6ZSgpKQotICAgICAg ICByZXR1cm4gMDsKLQotICAgIEhXbmREQyBkYygwKTsKLSAgICBTYXZlREMoZGMpOwotCi0gICAg Y2Fpcm9fc2NhbGVkX2ZvbnRfdCogc2NhbGVkRm9udCA9IG1fcGxhdGZvcm1EYXRhLnNjYWxlZEZv bnQoKTsKLSAgICBjYWlyb193aW4zMl9zY2FsZWRfZm9udF9zZWxlY3RfZm9udChzY2FsZWRGb250 LCBkYyk7Ci0KLSAgICBpbnQgd2lkdGg7Ci0gICAgR2V0Q2hhcldpZHRoSShkYywgZ2x5cGgsIDEs IDAsICZ3aWR0aCk7Ci0KLSAgICBjYWlyb193aW4zMl9zY2FsZWRfZm9udF9kb25lX2ZvbnQoc2Nh bGVkRm9udCk7Ci0KLSAgICBSZXN0b3JlREMoZGMsIC0xKTsKLQotICAgIGNvbnN0IGRvdWJsZSBt ZXRyaWNzTXVsdGlwbGllciA9IGNhaXJvX3dpbjMyX3NjYWxlZF9mb250X2dldF9tZXRyaWNzX2Zh Y3RvcihzY2FsZWRGb250KSAqIG1fcGxhdGZvcm1EYXRhLnNpemUoKTsKLSAgICByZXR1cm4gd2lk dGggKiBtZXRyaWNzTXVsdGlwbGllcjsKLX0KLQogfQo=