204668 2019-11-28 01:19:05 -0800 Cache integer font metrics for performance 2019-11-28 08:04:28 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned bfulgham commit-queue ews-watchlist mmaxfield simon.fraser webkit-bug-importer zalan oldest_to_newest 1593975 0 koivisto 2019-11-28 01:19:05 -0800 Line layout uses integer metrics and queries them a lot. Avoid repeated rounding. 1593976 1 384445 koivisto 2019-11-28 01:23:59 -0800 Created attachment 384445 patch 1594038 2 384445 zalan 2019-11-28 07:08:10 -0800 Comment on attachment 384445 patch View in context: https://bugs.webkit.org/attachment.cgi?id=384445&action=review > Source/WebCore/ChangeLog:8 > + Line layout uses integer metrics and queries them a lot. Avoid repeated rounding. Eventually IFC (or any line layout system really) should call the float flavor and do proper snapping at the line level. 1594048 3 384445 commit-queue 2019-11-28 08:03:58 -0800 Comment on attachment 384445 patch Clearing flags on attachment: 384445 Committed r252927: <https://trac.webkit.org/changeset/252927> 1594049 4 commit-queue 2019-11-28 08:04:00 -0800 All reviewed patches have been landed. Closing bug. 1594051 5 webkit-bug-importer 2019-11-28 08:04:28 -0800 <rdar://problem/57521037> 384445 2019-11-28 01:23:59 -0800 2019-11-28 08:03:58 -0800 patch cache-int-fontmetrics.patch text/plain 6663 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwYjAwMzVkOTU3OC4uNDU4ZDZhMzQwMzAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMyBAQAorMjAxOS0xMS0yOCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+ CisKKyAgICAgICAgQ2FjaGUgaW50ZWdlciBmb250IG1ldHJpY3MgZm9yIHBlcmZvcm1hbmNlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDQ2NjgKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMaW5lIGxheW91 dCB1c2VzIGludGVnZXIgbWV0cmljcyBhbmQgcXVlcmllcyB0aGVtIGEgbG90LiBBdm9pZCByZXBl YXRlZCByb3VuZGluZy4KKworICAgICAgICBUaGlzIGlzID4xMCUgc3BlZWR1cCBpbiBQZXJmb3Jt YW5jZVRlc3RzL0xheW91dC9saW5lLWxheW91dC1zaW1wbGUuaHRtbCB3aXRoIExGQy4KKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnRNZXRyaWNzLmg6CisgICAgICAgIChXZWJDb3Jl OjpGb250TWV0cmljczo6ZmxvYXRBc2NlbnQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Rm9u dE1ldHJpY3M6OnNldEFzY2VudCk6CisgICAgICAgIChXZWJDb3JlOjpGb250TWV0cmljczo6Zmxv YXREZXNjZW50IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRNZXRyaWNzOjpzZXREZXNj ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRNZXRyaWNzOjpmbG9hdExpbmVHYXAgY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6Rm9udE1ldHJpY3M6OnNldExpbmVHYXApOgorICAgICAgICAo V2ViQ29yZTo6Rm9udE1ldHJpY3M6OmZsb2F0TGluZVNwYWNpbmcgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6Rm9udE1ldHJpY3M6OnNldExpbmVTcGFjaW5nKToKKyAgICAgICAgKFdlYkNvcmU6 OkZvbnRNZXRyaWNzOjpoYXNDYXBIZWlnaHQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Rm9u dE1ldHJpY3M6OmZsb2F0Q2FwSGVpZ2h0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRN ZXRyaWNzOjpzZXRDYXBIZWlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udE1ldHJpY3M6OmFz Y2VudCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpGb250TWV0cmljczo6ZGVzY2VudCBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpGb250TWV0cmljczo6bGluZUdhcCBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpGb250TWV0cmljczo6bGluZVNwYWNpbmcgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6Rm9udE1ldHJpY3M6OmNhcEhlaWdodCBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpGb250TWV0cmljczo6cmVzZXQpOgorCiAyMDE5LTExLTI3ICBBbnR0aSBLb2l2aXN0byAgPGFu dHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtSZW5kZXIgdHJlZV0gUGVyZm9ybWFuY2VU ZXN0cy9MYXlvdXQvbGluZS1sYXlvdXQtc2ltcGxlLmh0bWwgZG9lcyBub3QgdXBkYXRlIHByb3Bl cmx5IHdpdGggTEZDIGVuYWJsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0ZvbnRNZXRyaWNzLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9Gb250TWV0cmljcy5oCmluZGV4IGIxMGZlNWJlNWIzLi5lNzc3YTJiM2RlYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udE1ldHJpY3MuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250TWV0cmljcy5oCkBAIC0zNSw1MiAr MzUsNzIgQEAgcHVibGljOgogICAgIGZsb2F0IGZsb2F0QXNjZW50KEZvbnRCYXNlbGluZSBiYXNl bGluZVR5cGUgPSBBbHBoYWJldGljQmFzZWxpbmUpIGNvbnN0CiAgICAgewogICAgICAgICBpZiAo YmFzZWxpbmVUeXBlID09IEFscGhhYmV0aWNCYXNlbGluZSkKLSAgICAgICAgICAgIHJldHVybiBt X2FzY2VudDsKKyAgICAgICAgICAgIHJldHVybiBtX2Zsb2F0QXNjZW50OwogICAgICAgICByZXR1 cm4gZmxvYXRIZWlnaHQoKSAvIDI7CiAgICAgfQogCi0gICAgdm9pZCBzZXRBc2NlbnQoZmxvYXQg YXNjZW50KSB7IG1fYXNjZW50ID0gYXNjZW50OyB9CisgICAgdm9pZCBzZXRBc2NlbnQoZmxvYXQg YXNjZW50KQorICAgIHsKKyAgICAgICAgbV9mbG9hdEFzY2VudCA9IGFzY2VudDsKKyAgICAgICAg bV9pbnRBc2NlbnQgPSBscm91bmRmKGFzY2VudCk7CisgICAgfQogCiAgICAgZmxvYXQgZmxvYXRE ZXNjZW50KEZvbnRCYXNlbGluZSBiYXNlbGluZVR5cGUgPSBBbHBoYWJldGljQmFzZWxpbmUpIGNv bnN0CiAgICAgewogICAgICAgICBpZiAoYmFzZWxpbmVUeXBlID09IEFscGhhYmV0aWNCYXNlbGlu ZSkKLSAgICAgICAgICAgIHJldHVybiBtX2Rlc2NlbnQ7CisgICAgICAgICAgICByZXR1cm4gbV9m bG9hdERlc2NlbnQ7CiAgICAgICAgIHJldHVybiBmbG9hdEhlaWdodCgpIC8gMjsKICAgICB9CiAK LSAgICB2b2lkIHNldERlc2NlbnQoZmxvYXQgZGVzY2VudCkgeyBtX2Rlc2NlbnQgPSBkZXNjZW50 OyB9CisgICAgdm9pZCBzZXREZXNjZW50KGZsb2F0IGRlc2NlbnQpCisgICAgeworICAgICAgICBt X2Zsb2F0RGVzY2VudCA9IGRlc2NlbnQ7CisgICAgICAgIG1faW50RGVzY2VudCA9IGxyb3VuZGYo ZGVzY2VudCk7CisgICAgfQogCiAgICAgZmxvYXQgZmxvYXRIZWlnaHQoRm9udEJhc2VsaW5lIGJh c2VsaW5lVHlwZSA9IEFscGhhYmV0aWNCYXNlbGluZSkgY29uc3QKICAgICB7CiAgICAgICAgIHJl dHVybiBmbG9hdEFzY2VudChiYXNlbGluZVR5cGUpICsgZmxvYXREZXNjZW50KGJhc2VsaW5lVHlw ZSk7CiAgICAgfQogCi0gICAgZmxvYXQgZmxvYXRMaW5lR2FwKCkgY29uc3QgeyByZXR1cm4gbV9s aW5lR2FwOyB9Ci0gICAgdm9pZCBzZXRMaW5lR2FwKGZsb2F0IGxpbmVHYXApIHsgbV9saW5lR2Fw ID0gbGluZUdhcDsgfQorICAgIGZsb2F0IGZsb2F0TGluZUdhcCgpIGNvbnN0IHsgcmV0dXJuIG1f ZmxvYXRMaW5lR2FwOyB9CisgICAgdm9pZCBzZXRMaW5lR2FwKGZsb2F0IGxpbmVHYXApCisgICAg eworICAgICAgICBtX2Zsb2F0TGluZUdhcCA9IGxpbmVHYXA7CisgICAgICAgIG1faW50TGluZUdh cCA9IGxyb3VuZGYobGluZUdhcCk7CisgICAgfQogCi0gICAgZmxvYXQgZmxvYXRMaW5lU3BhY2lu ZygpIGNvbnN0IHsgcmV0dXJuIG1fbGluZVNwYWNpbmc7IH0KLSAgICB2b2lkIHNldExpbmVTcGFj aW5nKGZsb2F0IGxpbmVTcGFjaW5nKSB7IG1fbGluZVNwYWNpbmcgPSBsaW5lU3BhY2luZzsgfQor ICAgIGZsb2F0IGZsb2F0TGluZVNwYWNpbmcoKSBjb25zdCB7IHJldHVybiBtX2Zsb2F0TGluZVNw YWNpbmc7IH0KKyAgICB2b2lkIHNldExpbmVTcGFjaW5nKGZsb2F0IGxpbmVTcGFjaW5nKQorICAg IHsKKyAgICAgICAgbV9mbG9hdExpbmVTcGFjaW5nID0gbGluZVNwYWNpbmc7CisgICAgICAgIG1f aW50TGluZVNwYWNpbmcgPSBscm91bmRmKGxpbmVTcGFjaW5nKTsKKyAgICB9CiAKICAgICBmbG9h dCB4SGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gbV94SGVpZ2h0OyB9CiAgICAgdm9pZCBzZXRYSGVp Z2h0KGZsb2F0IHhIZWlnaHQpIHsgbV94SGVpZ2h0ID0geEhlaWdodDsgfQogICAgIGJvb2wgaGFz WEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1feEhlaWdodCA+IDA7IH0KICAgICAKLSAgICBib29s IGhhc0NhcEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fY2FwSGVpZ2h0ID4gMDsgfQotICAgIGZs b2F0IGZsb2F0Q2FwSGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gbV9jYXBIZWlnaHQ7IH0KLSAgICB2 b2lkIHNldENhcEhlaWdodChmbG9hdCBjYXBIZWlnaHQpIHsgbV9jYXBIZWlnaHQgPSBjYXBIZWln aHQ7IH0KKyAgICBib29sIGhhc0NhcEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fZmxvYXRDYXBI ZWlnaHQgPiAwOyB9CisgICAgZmxvYXQgZmxvYXRDYXBIZWlnaHQoKSBjb25zdCB7IHJldHVybiBt X2Zsb2F0Q2FwSGVpZ2h0OyB9CisgICAgdm9pZCBzZXRDYXBIZWlnaHQoZmxvYXQgY2FwSGVpZ2h0 KQorICAgIHsKKyAgICAgICAgbV9mbG9hdENhcEhlaWdodCA9IGNhcEhlaWdodDsKKyAgICAgICAg bV9pbnRDYXBIZWlnaHQgPSBscm91bmRmKGNhcEhlaWdodCk7CisgICAgfQogICAgIAogICAgIC8v IEludGVnZXIgdmFyaWFudHMgb2YgY2VydGFpbiBtZXRyaWNzLCB1c2VkIGZvciBIVE1MIHJlbmRl cmluZy4KICAgICBpbnQgYXNjZW50KEZvbnRCYXNlbGluZSBiYXNlbGluZVR5cGUgPSBBbHBoYWJl dGljQmFzZWxpbmUpIGNvbnN0CiAgICAgewogICAgICAgICBpZiAoYmFzZWxpbmVUeXBlID09IEFs cGhhYmV0aWNCYXNlbGluZSkKLSAgICAgICAgICAgIHJldHVybiBscm91bmRmKG1fYXNjZW50KTsK KyAgICAgICAgICAgIHJldHVybiBtX2ludEFzY2VudDsKICAgICAgICAgcmV0dXJuIGhlaWdodCgp IC0gaGVpZ2h0KCkgLyAyOwogICAgIH0KICAgICAKICAgICBpbnQgZGVzY2VudChGb250QmFzZWxp bmUgYmFzZWxpbmVUeXBlID0gQWxwaGFiZXRpY0Jhc2VsaW5lKSBjb25zdAogICAgIHsKICAgICAg ICAgaWYgKGJhc2VsaW5lVHlwZSA9PSBBbHBoYWJldGljQmFzZWxpbmUpCi0gICAgICAgICAgICBy ZXR1cm4gbHJvdW5kZihtX2Rlc2NlbnQpOworICAgICAgICAgICAgcmV0dXJuIG1faW50RGVzY2Vu dDsKICAgICAgICAgcmV0dXJuIGhlaWdodCgpIC8gMjsKICAgICB9CiAKQEAgLTg5LDEwICsxMDks MTAgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gYXNjZW50KGJhc2VsaW5lVHlwZSkgKyBkZXNj ZW50KGJhc2VsaW5lVHlwZSk7CiAgICAgfQogCi0gICAgaW50IGxpbmVHYXAoKSBjb25zdCB7IHJl dHVybiBscm91bmRmKG1fbGluZUdhcCk7IH0KLSAgICBpbnQgbGluZVNwYWNpbmcoKSBjb25zdCB7 IHJldHVybiBscm91bmRmKG1fbGluZVNwYWNpbmcpOyB9CisgICAgaW50IGxpbmVHYXAoKSBjb25z dCB7IHJldHVybiBtX2ludExpbmVHYXA7IH0KKyAgICBpbnQgbGluZVNwYWNpbmcoKSBjb25zdCB7 IHJldHVybiBtX2ludExpbmVTcGFjaW5nOyB9CiAgICAgCi0gICAgaW50IGNhcEhlaWdodCgpIGNv bnN0IHsgcmV0dXJuIGxyb3VuZGYobV9jYXBIZWlnaHQpOyB9CisgICAgaW50IGNhcEhlaWdodCgp IGNvbnN0IHsgcmV0dXJuIG1faW50Q2FwSGVpZ2h0OyB9CiAgICAgCiAgICAgYm9vbCBoYXNJZGVu dGljYWxBc2NlbnREZXNjZW50QW5kTGluZUdhcChjb25zdCBGb250TWV0cmljcyYgb3RoZXIpIGNv bnN0CiAgICAgewpAQCAtMTE0LDIzICsxMzQsMzkgQEAgcHJpdmF0ZToKICAgICB2b2lkIHJlc2V0 KCkKICAgICB7CiAgICAgICAgIG1fdW5pdHNQZXJFbSA9IGRlZmF1bHRVbml0c1BlckVtOwotICAg ICAgICBtX2FzY2VudCA9IDA7Ci0gICAgICAgIG1fZGVzY2VudCA9IDA7Ci0gICAgICAgIG1fbGlu ZUdhcCA9IDA7Ci0gICAgICAgIG1fbGluZVNwYWNpbmcgPSAwOworICAgICAgICBtX2Zsb2F0QXNj ZW50ID0gMDsKKyAgICAgICAgbV9mbG9hdERlc2NlbnQgPSAwOworICAgICAgICBtX2Zsb2F0TGlu ZUdhcCA9IDA7CisgICAgICAgIG1fZmxvYXRMaW5lU3BhY2luZyA9IDA7CisgICAgICAgIG1fZmxv YXRDYXBIZWlnaHQgPSAwOworICAgICAgICBtX2ludEFzY2VudCA9IDA7CisgICAgICAgIG1faW50 RGVzY2VudCA9IDA7CisgICAgICAgIG1faW50TGluZUdhcCA9IDA7CisgICAgICAgIG1faW50TGlu ZVNwYWNpbmcgPSAwOworICAgICAgICBtX2ludENhcEhlaWdodCA9IDA7CiAgICAgICAgIG1feEhl aWdodCA9IDA7Ci0gICAgICAgIG1fY2FwSGVpZ2h0ID0gMDsKICAgICAgICAgbV96ZXJvV2lkdGgg PSAwOworICAgICAgICBtX3VuZGVybGluZVBvc2l0aW9uID0gMDsKKyAgICAgICAgbV91bmRlcmxp bmVUaGlja25lc3MgPSAwOwogICAgIH0KIAogICAgIHVuc2lnbmVkIG1fdW5pdHNQZXJFbSB7IGRl ZmF1bHRVbml0c1BlckVtIH07Ci0gICAgZmxvYXQgbV9hc2NlbnQgeyAwIH07Ci0gICAgZmxvYXQg bV9kZXNjZW50IHsgMCB9OwotICAgIGZsb2F0IG1fbGluZUdhcCB7IDAgfTsKLSAgICBmbG9hdCBt X2xpbmVTcGFjaW5nIHsgMCB9OworCisgICAgZmxvYXQgbV9mbG9hdEFzY2VudCB7IDAgfTsKKyAg ICBmbG9hdCBtX2Zsb2F0RGVzY2VudCB7IDAgfTsKKyAgICBmbG9hdCBtX2Zsb2F0TGluZUdhcCB7 IDAgfTsKKyAgICBmbG9hdCBtX2Zsb2F0TGluZVNwYWNpbmcgeyAwIH07CisgICAgZmxvYXQgbV9m bG9hdENhcEhlaWdodCB7IDAgfTsKKworICAgIC8vIEFsc28gY2FjaGVkIGFzIGludGVnZXJzIGZv ciBwZXJmb3JtYW5jZS4KKyAgICBpbnQgbV9pbnRBc2NlbnQgeyAwIH07CisgICAgaW50IG1faW50 RGVzY2VudCB7IDAgfTsKKyAgICBpbnQgbV9pbnRMaW5lR2FwIHsgMCB9OworICAgIGludCBtX2lu dExpbmVTcGFjaW5nIHsgMCB9OworICAgIGludCBtX2ludENhcEhlaWdodCB7IDAgfTsKKwogICAg IGZsb2F0IG1femVyb1dpZHRoIHsgMCB9OwogICAgIGZsb2F0IG1feEhlaWdodCB7IDAgfTsKLSAg ICBmbG9hdCBtX2NhcEhlaWdodCB7IDAgfTsKICAgICBmbG9hdCBtX3VuZGVybGluZVBvc2l0aW9u IHsgMCB9OwogICAgIGZsb2F0IG1fdW5kZXJsaW5lVGhpY2tuZXNzIHsgMCB9OwogfTsK