147033 2015-07-16 23:51:57 -0700 Web Inspector: [iOS] Allow inspector to retrieve a list of system fonts 2015-08-10 13:51:57 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue graouts joepeck jonowells mattbaker mmaxfield nvasilyev timothy webkit-bug-importer oldest_to_newest 1110094 0 hi 2015-07-16 23:51:57 -0700 This will be really useful for a font picker and for autocompletion. See https://bugs.webkit.org/show_bug.cgi?id=147009 for more details. 1110095 1 webkit-bug-importer 2015-07-16 23:52:15 -0700 <rdar://problem/21870250> 1113940 2 257985 hi 2015-07-31 18:10:10 -0700 Created attachment 257985 Patch 1113950 3 257985 joepeck 2015-07-31 18:28:17 -0700 Comment on attachment 257985 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257985&action=review r=me, but should probably get a nod from Myles. > Source/WebCore/platform/graphics/ios/FontCacheIOS.mm:471 > + NSDictionary *attributes = @{ }; > + RetainPtr<CTFontDescriptorRef> fontDescriptor = adoptCF(CTFontDescriptorCreateWithAttributes((CFDictionaryRef)attributes)); You can just inline this dictionary. > Source/WebCore/platform/graphics/ios/FontCacheIOS.mm:472 > + RetainPtr<NSArray> matchedDescriptors = adoptNS((NSArray *)CTFontDescriptorCreateMatchingFontDescriptors(fontDescriptor.get(), nullptr)); Nit: static_cast. Also, both of these can be "auto", the type is relatively easy to determine. > Source/WebCore/platform/graphics/ios/FontCacheIOS.mm:474 > + NSInteger numMatches = [matchedDescriptors.get() count]; Style: I actually think the ".git()" is unnecessary here. It should just work without it. > Source/WebCore/platform/graphics/ios/FontCacheIOS.mm:480 > + RetainPtr<CFStringRef> familyName = adoptCF(static_cast<CFStringRef>(CTFontDescriptorCopyAttribute((CTFontDescriptorRef)[matchedDescriptors.get() objectAtIndex:i], kCTFontFamilyNameAttribute))); Nit: static_cast. You can split this out into a couple lines to be more readable. Could also be auto given the CFStringRef cast will be on the line anyways. 1113971 4 257985 mmaxfield 2015-07-31 20:55:18 -0700 Comment on attachment 257985 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257985&action=review >> Source/WebCore/platform/graphics/ios/FontCacheIOS.mm:480 >> + RetainPtr<CFStringRef> familyName = adoptCF(static_cast<CFStringRef>(CTFontDescriptorCopyAttribute((CTFontDescriptorRef)[matchedDescriptors.get() objectAtIndex:i], kCTFontFamilyNameAttribute))); > > Nit: static_cast. You can split this out into a couple lines to be more readable. Could also be auto given the CFStringRef cast will be on the line anyways. Why are you using CF* here when everywhere else you are using NS*? > Source/WebCore/platform/graphics/ios/FontCacheIOS.mm:488 > + if (familyName.startsWith('.')) Please move this check into the loop above. > Source/WebCore/platform/graphics/ios/FontCacheIOS.mm:489 > + continue; I'm not sure this line will ever be hit. CT may not ever return these period-prefixed font names. It's worth checking (even on older operating systems) 1115991 5 258558 hi 2015-08-07 21:06:40 -0700 Created attachment 258558 Patch 1116263 6 258558 joepeck 2015-08-10 11:30:34 -0700 Comment on attachment 258558 Patch r=me 1116323 7 258558 commit-queue 2015-08-10 13:51:51 -0700 Comment on attachment 258558 Patch Clearing flags on attachment: 258558 Committed r188227: <http://trac.webkit.org/changeset/188227> 1116324 8 commit-queue 2015-08-10 13:51:57 -0700 All reviewed patches have been landed. Closing bug. 257985 2015-07-31 18:10:10 -0700 2015-08-07 21:06:37 -0700 Patch bug-147033-20150731181007.patch text/plain 2798 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxZTg1NmExZDI2NTA1ZTdjMjg4N2MyZGUyNzc5NWFjMDVlOGRhZGE4Li5h MDU3ZTk2N2IwM2Q3ZGYyNzgwNGE3ZmJmN2VkYzgwM2FiOGJkYThhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTUgQEAKKzIwMTUtMDctMzEgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtpT1NdIEFsbG93IGluc3BlY3RvciB0byByZXRy aWV2ZSBhIGxpc3Qgb2Ygc3lzdGVtIGZvbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDcwMzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgc3lzdGVtRm9udEZhbWlsaWVzIGZvciBpT1Mu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9pb3MvRm9udENhY2hlSU9TLm1tOgorICAg ICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpzeXN0ZW1Gb250RmFtaWxpZXMpOgorCiAyMDE1LTA3 LTE4ICBNYXR0IFJhamNhICA8bXJhamNhQGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBNZWRp YSBTZXNzaW9uOiBhZGQgc3VwcG9ydCBmb3IgbW9yZSB0ZWxlcGhvbnkgaW50ZXJydXB0aW9ucwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaW9zL0ZvbnRDYWNo ZUlPUy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2lvcy9Gb250Q2FjaGVJ T1MubW0KaW5kZXggMzFmYTZkMzA2MGM1YTE2OGRiNjgzOTIyNTU3NTU2YmMxNTExODI0OS4uZjNm YzA1ZTgyZTU0MWEyODAzNmY0ZDRiZTQwNTRhMTY4YmYzNjYwZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaW9zL0ZvbnRDYWNoZUlPUy5tbQorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9pb3MvRm9udENhY2hlSU9TLm1tCkBAIC0zMyw2 ICszMyw3IEBACiAjaW1wb3J0ICJDb3JlVGV4dFNQSS5oIgogI2ltcG9ydCAiRm9udENhc2NhZGUu aCIKICNpbXBvcnQgIlJlbmRlclRoZW1lSU9TLmgiCisjaW1wb3J0IDx3dGYvSGFzaFNldC5oPgog I2ltcG9ydCA8d3RmL05ldmVyRGVzdHJveWVkLmg+CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+ CiAjaW1wb3J0IDx3dGYvdGV4dC9DU3RyaW5nLmg+CkBAIC00NjQsOCArNDY1LDMxIEBAIFJlZlB0 cjxGb250PiBGb250Q2FjaGU6OnN5c3RlbUZhbGxiYWNrRm9yQ2hhcmFjdGVycyhjb25zdCBGb250 RGVzY3JpcHRpb24mIGRlc2NyCiAKIFZlY3RvcjxTdHJpbmc+IEZvbnRDYWNoZTo6c3lzdGVtRm9u dEZhbWlsaWVzKCkKIHsKLSAgICAvLyBGSVhNRTogPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzE0NzAz Mz4gV2ViIEluc3BlY3RvcjogW2lPU10gQWxsb3cgaW5zcGVjdG9yIHRvIHJldHJpZXZlIGEgbGlz dCBvZiBzeXN0ZW0gZm9udHMKKyAgICAvLyBGSVhNRTogPHJkYXI6Ly9wcm9ibGVtLzIxODkwMTg4 PgogICAgIFZlY3RvcjxTdHJpbmc+IGZvbnRGYW1pbGllczsKKyAgICBOU0RpY3Rpb25hcnkgKmF0 dHJpYnV0ZXMgPSBAeyB9OworICAgIFJldGFpblB0cjxDVEZvbnREZXNjcmlwdG9yUmVmPiBmb250 RGVzY3JpcHRvciA9IGFkb3B0Q0YoQ1RGb250RGVzY3JpcHRvckNyZWF0ZVdpdGhBdHRyaWJ1dGVz KChDRkRpY3Rpb25hcnlSZWYpYXR0cmlidXRlcykpOworICAgIFJldGFpblB0cjxOU0FycmF5PiBt YXRjaGVkRGVzY3JpcHRvcnMgPSBhZG9wdE5TKChOU0FycmF5ICopQ1RGb250RGVzY3JpcHRvckNy ZWF0ZU1hdGNoaW5nRm9udERlc2NyaXB0b3JzKGZvbnREZXNjcmlwdG9yLmdldCgpLCBudWxscHRy KSk7CisKKyAgICBOU0ludGVnZXIgbnVtTWF0Y2hlcyA9IFttYXRjaGVkRGVzY3JpcHRvcnMuZ2V0 KCkgY291bnRdOworICAgIGlmICghbWF0Y2hlZERlc2NyaXB0b3JzIHx8ICFudW1NYXRjaGVzKQor ICAgICAgICByZXR1cm4gZm9udEZhbWlsaWVzOworCisgICAgSGFzaFNldDxTdHJpbmc+IHZpc2l0 ZWQ7CisgICAgZm9yIChOU0ludGVnZXIgaSA9IDA7IGkgPCBudW1NYXRjaGVzOyArK2kpIHsKKyAg ICAgICAgUmV0YWluUHRyPENGU3RyaW5nUmVmPiBmYW1pbHlOYW1lID0gYWRvcHRDRihzdGF0aWNf Y2FzdDxDRlN0cmluZ1JlZj4oQ1RGb250RGVzY3JpcHRvckNvcHlBdHRyaWJ1dGUoKENURm9udERl c2NyaXB0b3JSZWYpW21hdGNoZWREZXNjcmlwdG9ycy5nZXQoKSBvYmplY3RBdEluZGV4OmldLCBr Q1RGb250RmFtaWx5TmFtZUF0dHJpYnV0ZSkpKTsKKyAgICAgICAgaWYgKGZhbWlseU5hbWUpCisg ICAgICAgICAgICB2aXNpdGVkLmFkZChmYW1pbHlOYW1lLmdldCgpKTsKKyAgICB9CisKKyAgICBm b3IgKGNvbnN0IGF1dG8mIGZhbWlseU5hbWUgOiB2aXNpdGVkKSB7CisgICAgICAgIC8vIFdlIGRv bid0IHdhbnQgdG8gbWFrZSB0aGUgaGlkZGVuIHN5c3RlbSBmb250cyB2aXNpYmxlIGFuZCBzaW5j ZSB0aGV5CisgICAgICAgIC8vIGFsbCBiZWdpbiB3aXRoIGEgcGVyaW9kLCBpZ25vcmUgYWxsIGZv bnRzIHRoYXQgYmVnaW4gd2l0aCBhIHBlcmlvZC4KKyAgICAgICAgaWYgKGZhbWlseU5hbWUuc3Rh cnRzV2l0aCgnLicpKQorICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIGZvbnRGYW1pbGll cy5hcHBlbmQoZmFtaWx5TmFtZSk7CisgICAgfQorCiAgICAgcmV0dXJuIGZvbnRGYW1pbGllczsK IH0KIAo= 258558 2015-08-07 21:06:40 -0700 2015-08-10 13:51:51 -0700 Patch bug-147033-20150807210628.patch text/plain 2501 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4OWYxOWNiZTI0MjljNDk5MzE4ZGZkZDFkMzhiNDQwYTI4ZDZlOTU2Li5h NWM2NWVmOTUyNmU5ZWNhNmY3MTQ5OWJkOTI0YTFmMTNjZGJiOWIwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTUgQEAKKzIwMTUtMDgtMDcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtpT1NdIEFsbG93IGluc3BlY3RvciB0byByZXRy aWV2ZSBhIGxpc3Qgb2Ygc3lzdGVtIGZvbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDcwMzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgc3lzdGVtRm9udEZhbWlsaWVzIGZvciBpT1Mu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9pb3MvRm9udENhY2hlSU9TLm1tOgorICAg ICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpzeXN0ZW1Gb250RmFtaWxpZXMpOgorCiAyMDE1LTA4 LTA3ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgTW92ZSBwYWlu dGluZyBmdW5jdGlvbnMgZnJvbSBSZW5kZXJPYmplY3QgdG8gUmVuZGVyRWxlbWVudC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2lvcy9Gb250Q2FjaGVJT1Mu bW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9pb3MvRm9udENhY2hlSU9TLm1t CmluZGV4IGFkYmUyZWQ0OGI4MGY1OTQyZjE1Mzg4NmFiOGUxZGZmYjhiYjk1YTkuLjBhODM5NGFi YTJmMTE5MDA3N2FlZjI4NDM4ODNmZDQ1ZWFkMDQ3MzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2lvcy9Gb250Q2FjaGVJT1MubW0KKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaW9zL0ZvbnRDYWNoZUlPUy5tbQpAQCAtMzMsNiArMzMs NyBAQAogI2ltcG9ydCAiQ29yZVRleHRTUEkuaCIKICNpbXBvcnQgIkZvbnRDYXNjYWRlLmgiCiAj aW1wb3J0ICJSZW5kZXJUaGVtZUlPUy5oIgorI2ltcG9ydCA8d3RmL0hhc2hTZXQuaD4KICNpbXBv cnQgPHd0Zi9OZXZlckRlc3Ryb3llZC5oPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgogI2lt cG9ydCA8d3RmL3RleHQvQ1N0cmluZy5oPgpAQCAtNDcyLDggKzQ3MywyNSBAQCBSZWZQdHI8Rm9u dD4gRm9udENhY2hlOjpzeXN0ZW1GYWxsYmFja0ZvckNoYXJhY3RlcnMoY29uc3QgRm9udERlc2Ny aXB0aW9uJiBkZXNjcgogCiBWZWN0b3I8U3RyaW5nPiBGb250Q2FjaGU6OnN5c3RlbUZvbnRGYW1p bGllcygpCiB7Ci0gICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtpdC5vcmcvYi8xNDcwMzM+IFdl YiBJbnNwZWN0b3I6IFtpT1NdIEFsbG93IGluc3BlY3RvciB0byByZXRyaWV2ZSBhIGxpc3Qgb2Yg c3lzdGVtIGZvbnRzCisgICAgLy8gRklYTUU6IDxyZGFyOi8vcHJvYmxlbS8yMTg5MDE4OD4KICAg ICBWZWN0b3I8U3RyaW5nPiBmb250RmFtaWxpZXM7CisgICAgYXV0byBlbXB0eUZvbnREZXNjcmlw dG9yID0gYWRvcHRDRihDVEZvbnREZXNjcmlwdG9yQ3JlYXRlV2l0aEF0dHJpYnV0ZXMoKENGRGlj dGlvbmFyeVJlZikgQHsgfSkpOworICAgIGF1dG8gbWF0Y2hlZERlc2NyaXB0b3JzID0gYWRvcHRD RihDVEZvbnREZXNjcmlwdG9yQ3JlYXRlTWF0Y2hpbmdGb250RGVzY3JpcHRvcnMoZW1wdHlGb250 RGVzY3JpcHRvci5nZXQoKSwgbnVsbHB0cikpOworICAgIGlmICghbWF0Y2hlZERlc2NyaXB0b3Jz KQorICAgICAgICByZXR1cm4gZm9udEZhbWlsaWVzOworCisgICAgQ0ZJbmRleCBudW1NYXRjaGVz ID0gQ0ZBcnJheUdldENvdW50KG1hdGNoZWREZXNjcmlwdG9ycy5nZXQoKSk7CisgICAgaWYgKCFu dW1NYXRjaGVzKQorICAgICAgICByZXR1cm4gZm9udEZhbWlsaWVzOworCisgICAgSGFzaFNldDxT dHJpbmc+IHZpc2l0ZWQ7CisgICAgZm9yIChDRkluZGV4IGkgPSAwOyBpIDwgbnVtTWF0Y2hlczsg KytpKSB7CisgICAgICAgIGF1dG8gZm9udERlc2NyaXB0b3IgPSBzdGF0aWNfY2FzdDxDVEZvbnRE ZXNjcmlwdG9yUmVmPihDRkFycmF5R2V0VmFsdWVBdEluZGV4KG1hdGNoZWREZXNjcmlwdG9ycy5n ZXQoKSwgaSkpOworICAgICAgICBpZiAoYXV0byBmYW1pbHlOYW1lID0gYWRvcHRDRihzdGF0aWNf Y2FzdDxDRlN0cmluZ1JlZj4oQ1RGb250RGVzY3JpcHRvckNvcHlBdHRyaWJ1dGUoZm9udERlc2Ny aXB0b3IsIGtDVEZvbnRGYW1pbHlOYW1lQXR0cmlidXRlKSkpKQorICAgICAgICAgICAgdmlzaXRl ZC5hZGQoZmFtaWx5TmFtZS5nZXQoKSk7CisgICAgfQorCisgICAgY29weVRvVmVjdG9yKHZpc2l0 ZWQsIGZvbnRGYW1pbGllcyk7CiAgICAgcmV0dXJuIGZvbnRGYW1pbGllczsKIH0KIAo=