148218 2015-08-20 01:45:36 -0700 [OS X] Remove dead code from FontCache::systemFallbackForCharacters() 2015-08-21 16:50:40 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield dbates oldest_to_newest 1119226 0 mmaxfield 2015-08-20 01:45:36 -0700 [OS X] Remove dead code from FontCache::systemFallbackForCharacters() 1119227 1 259460 mmaxfield 2015-08-20 01:47:19 -0700 Created attachment 259460 Patch 1119230 2 259460 mmaxfield 2015-08-20 01:55:14 -0700 Comment on attachment 259460 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=259460&action=review > Source/WebCore/platform/graphics/mac/FontCacheMac.mm:-565 > - if (NSFont *bestVariation = [fontManager fontWithFamily:[substituteFont familyName] traits:traits weight:weight size:size]) { No need for the "size" variable 1119595 3 259567 mmaxfield 2015-08-20 19:45:03 -0700 Created attachment 259567 Patch 1119812 4 259567 dbates 2015-08-21 11:17:57 -0700 Comment on attachment 259567 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=259567&action=review > Source/WebCore/ChangeLog:8 > + CTFontCreateForCharactersWithLanguage() will always return the best For your consideration, I suggest writing this sentence in terms of FontCache::lookupCTFont() (which calls CTFontCreateForCharactersWithLanguage() at the time of writing) instead of CTFontCreateForCharactersWithLanguage() since FontCache::systemFallbackForCharacters() does not explicitly call CTFontCreateForCharactersWithLanguage(). > Source/WebCore/ChangeLog:10 > + font. Also, all fonts that will be created on WebKit's behalf are > + already printer fonts. You may want to consider adding a comment to the code to explain that FontCache::lookupCTFont()/CTFontCreateForCharactersWithLanguage() will return a printer-friendly font. > Source/WebCore/platform/graphics/mac/FontCacheMac.mm:-543 > - CGFloat size; With the removal of this size variable and associated logic the comment above fontManager is now out-of-date. Please update the comment above fontManager. 1119994 5 259567 mmaxfield 2015-08-21 16:43:08 -0700 Comment on attachment 259567 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=259567&action=review >> Source/WebCore/ChangeLog:10 >> + already printer fonts. > > You may want to consider adding a comment to the code to explain that FontCache::lookupCTFont()/CTFontCreateForCharactersWithLanguage() will return a printer-friendly font. Going forward, the concept of a "printer font" will become less and less relevant. I don't think it's worth paying it any more lip service. 1120000 6 mmaxfield 2015-08-21 16:50:40 -0700 Committed r188802: <http://trac.webkit.org/changeset/188802> 259460 2015-08-20 01:47:19 -0700 2015-08-20 19:45:01 -0700 Patch bug-148218-20150820014715.patch text/plain 2414 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4NjgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDk4YjRkMjRlYzljN2Ix YTg3NDY4ZjI0MzZlNzRlNTRhM2U2MDUxNS4uZmFiZWM1NjRmNWQwMjBhNmQzNDYwM2NmZDRjZWNh NTkxY2ZlYTlkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA4LTIwICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW09TIFhdIFJl bW92ZSBkZWFkIGNvZGUgZnJvbSBGb250Q2FjaGU6OnN5c3RlbUZhbGxiYWNrRm9yQ2hhcmFjdGVy cygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDgy MTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDVEZv bnRDcmVhdGVGb3JDaGFyYWN0ZXJzV2l0aExhbmd1YWdlKCkgd2lsbCBhbHdheXMgcmV0dXJuIHRo ZSBiZXN0CisgICAgICAgIGZvbnQuIEFsc28sIGFsbCBmb250cyB0aGF0IHdpbGwgYmUgY3JlYXRl ZCBvbiBXZWJLaXQncyBiZWhhbGYgYXJlCisgICAgICAgIGFscmVhZHkgcHJpbnRlciBmb250cy4K KworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSB0aGVyZSBpcyBubyBiZWhhdmlvciBjaGFu Z2UuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udENhY2hlTWFjLm1tOgor ICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpzeXN0ZW1GYWxsYmFja0ZvckNoYXJhY3RlcnMp OiBEZWxldGVkLgorCiAyMDE1LTA4LTE5ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUu Y29tPgogCiAgICAgICAgIFtXaW5dIFVucmV2aWV3ZWQgYnVpbGQgZml4IGFmdGVyIHIxODg2NjMu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udENh Y2hlTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDYWNo ZU1hYy5tbQppbmRleCA0MmUxYjA2NDMzODdjODAyMzMxNWZjY2U4NTI5YjI1YjM4N2U5MDMxLi45 ZGVmYzlmNGY3NzFjODllYzgzNmE0YmJiMjU5ZDhkNmM3NzU0MTIzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udENhY2hlTWFjLm1tCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q2FjaGVNYWMubW0KQEAgLTU2 MSwxOCArNTYxLDYgQEAgUmVmUHRyPEZvbnQ+IEZvbnRDYWNoZTo6c3lzdGVtRmFsbGJhY2tGb3JD aGFyYWN0ZXJzKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZGVzY3IKICAgICBOU0ZvbnRUcmFpdE1h c2sgc3Vic3RpdHV0ZUZvbnRUcmFpdHMgPSBbZm9udE1hbmFnZXIgdHJhaXRzT2ZGb250OnN1YnN0 aXR1dGVGb250XTsKICAgICBOU0ludGVnZXIgc3Vic3RpdHV0ZUZvbnRXZWlnaHQgPSBbZm9udE1h bmFnZXIgd2VpZ2h0T2ZGb250OnN1YnN0aXR1dGVGb250XTsKIAotICAgIGlmICh0cmFpdHMgIT0g c3Vic3RpdHV0ZUZvbnRUcmFpdHMgfHwgd2VpZ2h0ICE9IHN1YnN0aXR1dGVGb250V2VpZ2h0IHx8 ICFuc0ZvbnQpIHsKLSAgICAgICAgaWYgKE5TRm9udCAqYmVzdFZhcmlhdGlvbiA9IFtmb250TWFu YWdlciBmb250V2l0aEZhbWlseTpbc3Vic3RpdHV0ZUZvbnQgZmFtaWx5TmFtZV0gdHJhaXRzOnRy YWl0cyB3ZWlnaHQ6d2VpZ2h0IHNpemU6c2l6ZV0pIHsKLSAgICAgICAgICAgIFVDaGFyMzIgY2hh cmFjdGVyOwotICAgICAgICAgICAgVTE2X0dFVChjaGFyYWN0ZXJzLCAwLCAwLCBsZW5ndGgsIGNo YXJhY3Rlcik7Ci0gICAgICAgICAgICBpZiAoIW5zRm9udCB8fCAoKFtmb250TWFuYWdlciB0cmFp dHNPZkZvbnQ6YmVzdFZhcmlhdGlvbl0gIT0gc3Vic3RpdHV0ZUZvbnRUcmFpdHMgfHwgW2ZvbnRN YW5hZ2VyIHdlaWdodE9mRm9udDpiZXN0VmFyaWF0aW9uXSAhPSBzdWJzdGl0dXRlRm9udFdlaWdo dCkKLSAgICAgICAgICAgICAgICAmJiBbW2Jlc3RWYXJpYXRpb24gY292ZXJlZENoYXJhY3RlclNl dF0gbG9uZ0NoYXJhY3RlcklzTWVtYmVyOmNoYXJhY3Rlcl0pKQotICAgICAgICAgICAgICAgIHN1 YnN0aXR1dGVGb250ID0gYmVzdFZhcmlhdGlvbjsKLSAgICAgICAgfQotICAgIH0KLQotICAgIHN1 YnN0aXR1dGVGb250ID0gW3N1YnN0aXR1dGVGb250IHByaW50ZXJGb250XTsKLQogICAgIHN1YnN0 aXR1dGVGb250VHJhaXRzID0gW2ZvbnRNYW5hZ2VyIHRyYWl0c09mRm9udDpzdWJzdGl0dXRlRm9u dF07CiAgICAgc3Vic3RpdHV0ZUZvbnRXZWlnaHQgPSBbZm9udE1hbmFnZXIgd2VpZ2h0T2ZGb250 OnN1YnN0aXR1dGVGb250XTsKIAo= 259567 2015-08-20 19:45:03 -0700 2015-08-21 11:17:57 -0700 Patch bug-148218-20150820194458.patch text/plain 3457 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4NzQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGIzZGYwYjFkOWEyMDBh ZmY2YmVjOTE1MDYwYTc3OGFjYzNlZDM1Zi4uYThlMTc2ZGRiMDQzNDUzNTZmNGRhY2M1Yjk2NGIy ZWY2ODE1NTA3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDE1LTA4LTIwICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKKyAgICAgICAgW09TIFhdIFJl bW92ZSBkZWFkIGNvZGUgZnJvbSBGb250Q2FjaGU6OnN5c3RlbUZhbGxiYWNrRm9yQ2hhcmFjdGVy cygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDgy MTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDVEZv bnRDcmVhdGVGb3JDaGFyYWN0ZXJzV2l0aExhbmd1YWdlKCkgd2lsbCBhbHdheXMgcmV0dXJuIHRo ZSBiZXN0CisgICAgICAgIGZvbnQuIEFsc28sIGFsbCBmb250cyB0aGF0IHdpbGwgYmUgY3JlYXRl ZCBvbiBXZWJLaXQncyBiZWhhbGYgYXJlCisgICAgICAgIGFscmVhZHkgcHJpbnRlciBmb250cy4K KworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSB0aGVyZSBpcyBubyBiZWhhdmlvciBjaGFu Z2UuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udENhY2hlTWFjLm1tOgor ICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpzeXN0ZW1GYWxsYmFja0ZvckNoYXJhY3RlcnMp OiBEZWxldGVkLgorCisyMDE1LTA4LTIwICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBh cHBsZS5jb20+CisKICAgICAgICAgW2lPU10gQWRvcHQgT1MgWCdzIGVtb2ppIGJlaGF2aW9yLgog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4MjY1CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q2Fj aGVNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udENhY2hl TWFjLm1tCmluZGV4IDQyZTFiMDY0MzM4N2M4MDIzMzE1ZmNjZTg1MjliMjViMzg3ZTkwMzEuLmZi MWE5ZmRkOTliMDFkYWQ3NTcxZWYzZDNmNzQ4ODQ1NmZkYmUzOTkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q2FjaGVNYWMubW0KKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDYWNoZU1hYy5tbQpAQCAtNTQw LDcgKzU0MCw2IEBAIFJlZlB0cjxGb250PiBGb250Q2FjaGU6OnN5c3RlbUZhbGxiYWNrRm9yQ2hh cmFjdGVycyhjb25zdCBGb250RGVzY3JpcHRpb24mIGRlc2NyCiAKICAgICBOU0ZvbnRUcmFpdE1h c2sgdHJhaXRzID0gMDsKICAgICBOU0ludGVnZXIgd2VpZ2h0OwotICAgIENHRmxvYXQgc2l6ZTsK IAogICAgIGlmIChuc0ZvbnQpIHsKICAgICAgICAgaWYgKGRlc2NyaXB0aW9uLml0YWxpYygpKQpA QCAtNTUwLDMyICs1NDksMTUgQEAgUmVmUHRyPEZvbnQ+IEZvbnRDYWNoZTo6c3lzdGVtRmFsbGJh Y2tGb3JDaGFyYWN0ZXJzKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZGVzY3IKICAgICAgICAgaWYg KHBsYXRmb3JtRGF0YS5tX3N5bnRoZXRpY09ibGlxdWUpCiAgICAgICAgICAgICB0cmFpdHMgfD0g TlNGb250SXRhbGljVHJhaXQ7CiAgICAgICAgIHdlaWdodCA9IFtmb250TWFuYWdlciB3ZWlnaHRP ZkZvbnQ6bnNGb250XTsKLSAgICAgICAgc2l6ZSA9IFtuc0ZvbnQgcG9pbnRTaXplXTsKICAgICB9 IGVsc2UgewotICAgICAgICAvLyBGb3IgY3VzdG9tIGZvbnRzIG5zRm9udCBpcyBuaWwuCisgICAg ICAgIEFTU0VSVCghQ09SRVRFWFRfV0VCX0ZPTlRTKTsKICAgICAgICAgdHJhaXRzID0gZGVzY3Jp cHRpb24uaXRhbGljKCkgPyBOU0ZvbnRJdGFsaWNUcmFpdCA6IDA7CiAgICAgICAgIHdlaWdodCA9 IHRvQXBwS2l0Rm9udFdlaWdodChkZXNjcmlwdGlvbi53ZWlnaHQoKSk7Ci0gICAgICAgIHNpemUg PSBkZXNjcmlwdGlvbi5jb21wdXRlZFBpeGVsU2l6ZSgpOwogICAgIH0KIAogICAgIE5TRm9udFRy YWl0TWFzayBzdWJzdGl0dXRlRm9udFRyYWl0cyA9IFtmb250TWFuYWdlciB0cmFpdHNPZkZvbnQ6 c3Vic3RpdHV0ZUZvbnRdOwogICAgIE5TSW50ZWdlciBzdWJzdGl0dXRlRm9udFdlaWdodCA9IFtm b250TWFuYWdlciB3ZWlnaHRPZkZvbnQ6c3Vic3RpdHV0ZUZvbnRdOwogCi0gICAgaWYgKHRyYWl0 cyAhPSBzdWJzdGl0dXRlRm9udFRyYWl0cyB8fCB3ZWlnaHQgIT0gc3Vic3RpdHV0ZUZvbnRXZWln aHQgfHwgIW5zRm9udCkgewotICAgICAgICBpZiAoTlNGb250ICpiZXN0VmFyaWF0aW9uID0gW2Zv bnRNYW5hZ2VyIGZvbnRXaXRoRmFtaWx5OltzdWJzdGl0dXRlRm9udCBmYW1pbHlOYW1lXSB0cmFp dHM6dHJhaXRzIHdlaWdodDp3ZWlnaHQgc2l6ZTpzaXplXSkgewotICAgICAgICAgICAgVUNoYXIz MiBjaGFyYWN0ZXI7Ci0gICAgICAgICAgICBVMTZfR0VUKGNoYXJhY3RlcnMsIDAsIDAsIGxlbmd0 aCwgY2hhcmFjdGVyKTsKLSAgICAgICAgICAgIGlmICghbnNGb250IHx8ICgoW2ZvbnRNYW5hZ2Vy IHRyYWl0c09mRm9udDpiZXN0VmFyaWF0aW9uXSAhPSBzdWJzdGl0dXRlRm9udFRyYWl0cyB8fCBb Zm9udE1hbmFnZXIgd2VpZ2h0T2ZGb250OmJlc3RWYXJpYXRpb25dICE9IHN1YnN0aXR1dGVGb250 V2VpZ2h0KQotICAgICAgICAgICAgICAgICYmIFtbYmVzdFZhcmlhdGlvbiBjb3ZlcmVkQ2hhcmFj dGVyU2V0XSBsb25nQ2hhcmFjdGVySXNNZW1iZXI6Y2hhcmFjdGVyXSkpCi0gICAgICAgICAgICAg ICAgc3Vic3RpdHV0ZUZvbnQgPSBiZXN0VmFyaWF0aW9uOwotICAgICAgICB9Ci0gICAgfQotCi0g ICAgc3Vic3RpdHV0ZUZvbnQgPSBbc3Vic3RpdHV0ZUZvbnQgcHJpbnRlckZvbnRdOwotCi0gICAg c3Vic3RpdHV0ZUZvbnRUcmFpdHMgPSBbZm9udE1hbmFnZXIgdHJhaXRzT2ZGb250OnN1YnN0aXR1 dGVGb250XTsKLSAgICBzdWJzdGl0dXRlRm9udFdlaWdodCA9IFtmb250TWFuYWdlciB3ZWlnaHRP ZkZvbnQ6c3Vic3RpdHV0ZUZvbnRdOwotCiAgICAgRm9udFBsYXRmb3JtRGF0YSBhbHRlcm5hdGVG b250KHRvQ1RGb250KHN1YnN0aXR1dGVGb250KSwgcGxhdGZvcm1EYXRhLnNpemUoKSwKICAgICAg ICAgIWlzUGxhdGZvcm1Gb250ICYmIGlzQXBwS2l0Rm9udFdlaWdodEJvbGQod2VpZ2h0KSAmJiAh aXNBcHBLaXRGb250V2VpZ2h0Qm9sZChzdWJzdGl0dXRlRm9udFdlaWdodCksCiAgICAgICAgICFp c1BsYXRmb3JtRm9udCAmJiAodHJhaXRzICYgTlNGb250SXRhbGljVHJhaXQpICYmICEoc3Vic3Rp dHV0ZUZvbnRUcmFpdHMgJiBOU0ZvbnRJdGFsaWNUcmFpdCksCg==