43499 2010-08-04 11:52:19 -0700 WebKit2 on Windows should use Windows fonts for the various standard font families 2010-09-30 16:18:27 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED InRadar, PlatformOnly P2 Normal --- 1 aroben jhoneycutt jhoneycutt sam oldest_to_newest 260132 0 aroben 2010-08-04 11:52:19 -0700 WebKit2 on Windows (specifically, WebPreferencesStore) currently uses Mac fonts for the various standard font families. But we should use Windows fonts instead! 260133 1 aroben 2010-08-04 11:52:49 -0700 <rdar://problem/8272758> 287332 2 69299 jhoneycutt 2010-09-29 19:49:25 -0700 Created attachment 69299 Patch 287481 3 69299 aroben 2010-09-30 04:13:41 -0700 Comment on attachment 69299 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=69299&action=review > WebKitTools/WebKitTestRunner/TestController.cpp:216 > + static WKStringRef standardFontFamily = WKStringCreateWithCFString(CFSTR("Times")); > + static WKStringRef cursiveFontFamily = WKStringCreateWithCFString(CFSTR("Apple Chancery")); > + static WKStringRef fantasyFontFamily = WKStringCreateWithCFString(CFSTR("Papyrus")); > + static WKStringRef fixedFontFamily = WKStringCreateWithCFString(CFSTR("Courier")); > + static WKStringRef sansSerifFontFamily = WKStringCreateWithCFString(CFSTR("Helvetica")); > + static WKStringRef serifFontFamily = WKStringCreateWithCFString(CFSTR("Times")); This is going to upset people in bug 45393, but there's no other way right now. 287687 4 69299 darin 2010-09-30 11:24:45 -0700 Comment on attachment 69299 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=69299&action=review > WebKit2/Shared/WebPreferencesStore.cpp:48 > +#if PLATFORM(WIN) Should this be WIN or !MAC? 287891 5 jhoneycutt 2010-09-30 15:40:14 -0700 (In reply to comment #4) > (From update of attachment 69299 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=69299&action=review > > > WebKit2/Shared/WebPreferencesStore.cpp:48 > > +#if PLATFORM(WIN) > > Should this be WIN or !MAC? I'm not sure if any other platforms are using this code, so I'll only change Windows for now. 287911 6 jhoneycutt 2010-09-30 16:18:27 -0700 Landed in r68849. 69299 2010-09-29 19:49:25 -0700 2010-09-30 11:24:44 -0700 Patch 0001-WebKit2-on-Windows-should-use-Windows-fonts-for-the-.patch text/plain 4797 jhoneycutt RnJvbSAyYjg0ZmNkYjM5NTJkMTE2MGIyNDVmMmRiOThiNzNhOWViNTIxNWI5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb24gSG9uZXljdXR0IDxqaG9uZXljdXR0QGFwcGxlLmNvbT4K RGF0ZTogV2VkLCAyOSBTZXAgMjAxMCAxOTo0NjozNiAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFdl YktpdDIgb24gV2luZG93cyBzaG91bGQgdXNlIFdpbmRvd3MgZm9udHMgZm9yIHRoZSB2YXJpb3Vz IHN0YW5kYXJkCiBmb250IGZhbWlsaWVzCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDM0OTkKIDxyZGFyOi8vcHJvYmxlbS84MjcyNzU4PgoKUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCgpXZWJLaXQyOgoKKiBTaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5jcHA6 CihXZWJLaXQ6OldlYlByZWZlcmVuY2VzU3RvcmU6OldlYlByZWZlcmVuY2VzU3RvcmUpOgpVc2Ug V2luZG93cyBmb250cyBvbiBXaW5kb3dzLgoKV2ViS2l0VG9vbHM6CgoqIFdlYktpdFRlc3RSdW5u ZXIvVGVzdENvbnRyb2xsZXIuY3BwOgooV1RSOjpUZXN0Q29udHJvbGxlcjo6cmVzZXRTdGF0ZVRv Q29uc2lzdGVudFZhbHVlcyk6ClVzZSB0aGUgTWFjIGZvbnRzIGZvciBydW5uaW5nIHRlc3RzLiBU aGlzIG1hdGNoZXMgRFJUIGJlaGF2aW9yLgotLS0KIFdlYktpdDIvQ2hhbmdlTG9nICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHwgICAxMyArKysrKysrKysrKysrCiBXZWJLaXQyL1NoYXJl ZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmNwcCAgICAgICAgICB8ICAgIDkgKysrKysrKysrCiBXZWJL aXRUb29scy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTMgKysrKysr KysrKysrKwogV2ViS2l0VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAg fCAgIDE0ICsrKysrKysrKysrKysrCiA0IGZpbGVzIGNoYW5nZWQsIDQ5IGluc2VydGlvbnMoKyks IDAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9XZWJLaXQy L0NoYW5nZUxvZwppbmRleCBmMGEzYzA2Li42MDRjOGU4IDEwMDY0NAotLS0gYS9XZWJLaXQyL0No YW5nZUxvZworKysgYi9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEwLTA5 LTI5ICBKb24gSG9uZXljdXR0ICA8amhvbmV5Y3V0dEBhcHBsZS5jb20+CisKKyAgICAgICAgV2Vi S2l0MiBvbiBXaW5kb3dzIHNob3VsZCB1c2UgV2luZG93cyBmb250cyBmb3IgdGhlIHZhcmlvdXMg c3RhbmRhcmQKKyAgICAgICAgZm9udCBmYW1pbGllcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDM0OTkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgy NzI3NTg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBTaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBy ZWZlcmVuY2VzU3RvcmU6OldlYlByZWZlcmVuY2VzU3RvcmUpOgorICAgICAgICBVc2UgV2luZG93 cyBmb250cyBvbiBXaW5kb3dzLgorCiAyMDEwLTA5LTI5ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRl cnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KZGlmZiAt LWdpdCBhL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuY3BwIGIvV2ViS2l0Mi9T aGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5jcHAKaW5kZXggZjJhNmM2Ny4uN2Y4MTRmNSAxMDA2 NDQKLS0tIGEvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5jcHAKKysrIGIvV2Vi S2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5jcHAKQEAgLTQ1LDEyICs0NSwyMSBAQCBX ZWJQcmVmZXJlbmNlc1N0b3JlOjpXZWJQcmVmZXJlbmNlc1N0b3JlKCkKICAgICAsIG1pbmltdW1M b2dpY2FsRm9udFNpemUoOSkKICAgICAsIGRlZmF1bHRGb250U2l6ZSgxNikKICAgICAsIGRlZmF1 bHRGaXhlZEZvbnRTaXplKDEzKQorI2lmIFBMQVRGT1JNKFdJTikKKyAgICAsIHN0YW5kYXJkRm9u dEZhbWlseSgiVGltZXMgTmV3IFJvbWFuIikKKyAgICAsIGN1cnNpdmVGb250RmFtaWx5KCJDb21p YyBTYW5zIE1TIikKKyAgICAsIGZhbnRhc3lGb250RmFtaWx5KCJDb21pYyBTYW5zIE1TIikKKyAg ICAsIGZpeGVkRm9udEZhbWlseSgiQ291cmllciBOZXciKQorICAgICwgc2Fuc1NlcmlmRm9udEZh bWlseSgiQXJpYWwiKQorICAgICwgc2VyaWZGb250RmFtaWx5KCJUaW1lcyBOZXcgUm9tYW4iKQor I2Vsc2UKICAgICAsIHN0YW5kYXJkRm9udEZhbWlseSgiVGltZXMiKQogICAgICwgY3Vyc2l2ZUZv bnRGYW1pbHkoIkFwcGxlIENoYW5jZXJ5IikKICAgICAsIGZhbnRhc3lGb250RmFtaWx5KCJQYXB5 cnVzIikKICAgICAsIGZpeGVkRm9udEZhbWlseSgiQ291cmllciIpCiAgICAgLCBzYW5zU2VyaWZG b250RmFtaWx5KCJIZWx2ZXRpY2EiKQogICAgICwgc2VyaWZGb250RmFtaWx5KCJUaW1lcyIpCisj ZW5kaWYKIHsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0 VG9vbHMvQ2hhbmdlTG9nCmluZGV4IDUzM2NhM2MuLmJkYjcxOTEgMTAwNjQ0Ci0tLSBhL1dlYktp dFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NiBAQAorMjAxMC0wOS0yOSAgSm9uIEhvbmV5Y3V0dCAgPGpob25leWN1dHRAYXBwbGUuY29tPgor CisgICAgICAgIFdlYktpdDIgb24gV2luZG93cyBzaG91bGQgdXNlIFdpbmRvd3MgZm9udHMgZm9y IHRoZSB2YXJpb3VzIHN0YW5kYXJkCisgICAgICAgIGZvbnQgZmFtaWxpZXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQzNDk5CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS84MjcyNzU4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHA6CisgICAg ICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpyZXNldFN0YXRlVG9Db25zaXN0ZW50VmFsdWVzKToK KyAgICAgICAgVXNlIHRoZSBNYWMgZm9udHMgZm9yIHJ1bm5pbmcgdGVzdHMuIFRoaXMgbWF0Y2hl cyBEUlQgYmVoYXZpb3IuCisKIDIwMTAtMDktMjkgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVt Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBKYW1lcyBSb2JpbnNvbi4KZGlmZiAtLWdpdCBh L1dlYktpdFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwIGIvV2ViS2l0 VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKaW5kZXggZmMyZTI4ZC4u ZWZkODkzZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29u dHJvbGxlci5jcHAKKysrIGIvV2ViS2l0VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJv bGxlci5jcHAKQEAgLTIwOCw2ICsyMDgsMjAgQEAgdm9pZCBUZXN0Q29udHJvbGxlcjo6cmVzZXRT dGF0ZVRvQ29uc2lzdGVudFZhbHVlcygpCiAgICAgV0tQcmVmZXJlbmNlc1NldEZvbnRTbW9vdGhp bmdMZXZlbChwcmVmZXJlbmNlcywga1dLRm9udFNtb290aGluZ0xldmVsTm9TdWJwaXhlbEFudGlB bGlhc2luZyk7CiAgICAgV0tQcmVmZXJlbmNlc1NldFhTU0F1ZGl0b3JFbmFibGVkKHByZWZlcmVu Y2VzLCBmYWxzZSk7CiAKKyAgICBzdGF0aWMgV0tTdHJpbmdSZWYgc3RhbmRhcmRGb250RmFtaWx5 ID0gV0tTdHJpbmdDcmVhdGVXaXRoQ0ZTdHJpbmcoQ0ZTVFIoIlRpbWVzIikpOworICAgIHN0YXRp YyBXS1N0cmluZ1JlZiBjdXJzaXZlRm9udEZhbWlseSA9IFdLU3RyaW5nQ3JlYXRlV2l0aENGU3Ry aW5nKENGU1RSKCJBcHBsZSBDaGFuY2VyeSIpKTsKKyAgICBzdGF0aWMgV0tTdHJpbmdSZWYgZmFu dGFzeUZvbnRGYW1pbHkgPSBXS1N0cmluZ0NyZWF0ZVdpdGhDRlN0cmluZyhDRlNUUigiUGFweXJ1 cyIpKTsKKyAgICBzdGF0aWMgV0tTdHJpbmdSZWYgZml4ZWRGb250RmFtaWx5ID0gV0tTdHJpbmdD cmVhdGVXaXRoQ0ZTdHJpbmcoQ0ZTVFIoIkNvdXJpZXIiKSk7CisgICAgc3RhdGljIFdLU3RyaW5n UmVmIHNhbnNTZXJpZkZvbnRGYW1pbHkgPSBXS1N0cmluZ0NyZWF0ZVdpdGhDRlN0cmluZyhDRlNU UigiSGVsdmV0aWNhIikpOworICAgIHN0YXRpYyBXS1N0cmluZ1JlZiBzZXJpZkZvbnRGYW1pbHkg PSBXS1N0cmluZ0NyZWF0ZVdpdGhDRlN0cmluZyhDRlNUUigiVGltZXMiKSk7CisKKyAgICBXS1By ZWZlcmVuY2VzU2V0U3RhbmRhcmRGb250RmFtaWx5KHByZWZlcmVuY2VzLCBzdGFuZGFyZEZvbnRG YW1pbHkpOworICAgIFdLUHJlZmVyZW5jZXNTZXRDdXJzaXZlRm9udEZhbWlseShwcmVmZXJlbmNl cywgY3Vyc2l2ZUZvbnRGYW1pbHkpOworICAgIFdLUHJlZmVyZW5jZXNTZXRGYW50YXN5Rm9udEZh bWlseShwcmVmZXJlbmNlcywgZmFudGFzeUZvbnRGYW1pbHkpOworICAgIFdLUHJlZmVyZW5jZXNT ZXRGaXhlZEZvbnRGYW1pbHkocHJlZmVyZW5jZXMsIGZpeGVkRm9udEZhbWlseSk7CisgICAgV0tQ cmVmZXJlbmNlc1NldFNhbnNTZXJpZkZvbnRGYW1pbHkocHJlZmVyZW5jZXMsIHNhbnNTZXJpZkZv bnRGYW1pbHkpOworICAgIFdLUHJlZmVyZW5jZXNTZXRTZXJpZkZvbnRGYW1pbHkocHJlZmVyZW5j ZXMsIHNlcmlmRm9udEZhbWlseSk7CisKICAgICBtX21haW5XZWJWaWV3LT5mb2N1cygpOwogCiAg ICAgLy8gUmVzZXQgbWFpbiBwYWdlIGJhY2sgdG8gYWJvdXQ6YmxhbmsKLS0gCjEuNy4yLjIuMTA4 LmdjMTE5NgoK