42782 2010-07-21 13:30:19 -0700 WebKitTestRunner needs to support loading custom fonts (via the WEBKIT_TESTFONTS environment variable) 2010-08-03 15:57:14 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Windows XP RESOLVED FIXED InRadar, PlatformOnly P2 Normal --- 43379 1 aroben jhoneycutt alice.barraclough jhoneycutt sam oldest_to_newest 254490 0 aroben 2010-07-21 13:30:19 -0700 DumpRenderTree knows how to load custom fonts from the directory specified in the WEBKIT_TESTFONTS environment variable. We use this to use Mac fonts when running the tests. WebKitTestRunner needs to support this, too. 254491 1 aroben 2010-07-21 13:30:46 -0700 <rdar://problem/8218343> 257326 2 aroben 2010-07-28 13:09:44 -0700 Working on this now. 257329 3 aroben 2010-07-28 13:18:10 -0700 Jon is working on this, actually. 259328 4 63309 jhoneycutt 2010-08-03 02:41:13 -0700 Created attachment 63309 Patch 259376 5 63309 aroben 2010-08-03 04:50:55 -0700 Comment on attachment 63309 Patch > +static const wstring& fontsPath() > +{ > + static wstring path; > + static bool initialized; > + > + if (initialized) > + return path; > + initialized = true; > + > + DWORD size = GetEnvironmentVariable(fontsEnvironmentVariable, 0, 0); The style being used elsewhere in WebKit2 code is to prefix Win32 APIs with :: and to always use the W variant. > + Vector<TCHAR> buffer(size); If you switch to using the W variant, this should be Vector<WCHAR>. > + if (!GetEnvironmentVariable(fontsEnvironmentVariable, buffer.data(), buffer.size())) > + return path; > + > + path = buffer.data(); > + if (path[path.length() - 1] != '\\') > + path.append(L"\\"); > + > + return path; > +} I guess you decided that falling back to the path to the executable when WEBKIT_TESTFONTS is undefined isn't helpful? > void activateFonts() > { > - // FIXME: Not implemented. > + static LPCTSTR fontsToInstall[] = { > + TEXT("AHEM____.ttf"), > + TEXT("Apple Chancery.ttf"), > + TEXT("Courier Bold.ttf"), > + TEXT("Courier.ttf"), > + TEXT("Helvetica Bold Oblique.ttf"), > + TEXT("Helvetica Bold.ttf"), > + TEXT("Helvetica Oblique.ttf"), > + TEXT("Helvetica.ttf"), > + TEXT("Helvetica Neue Bold Italic.ttf"), > + TEXT("Helvetica Neue Bold.ttf"), > + TEXT("Helvetica Neue Condensed Black.ttf"), > + TEXT("Helvetica Neue Condensed Bold.ttf"), > + TEXT("Helvetica Neue Italic.ttf"), > + TEXT("Helvetica Neue Light Italic.ttf"), > + TEXT("Helvetica Neue Light.ttf"), > + TEXT("Helvetica Neue UltraLight Italic.ttf"), > + TEXT("Helvetica Neue UltraLight.ttf"), > + TEXT("Helvetica Neue.ttf"), > + TEXT("Lucida Grande.ttf"), > + TEXT("Lucida Grande Bold.ttf"), > + TEXT("Monaco.ttf"), > + TEXT("Papyrus.ttf"), > + TEXT("Times Bold Italic.ttf"), > + TEXT("Times Bold.ttf"), > + TEXT("Times Italic.ttf"), > + TEXT("Times Roman.ttf"), > + TEXT("WebKit Layout Tests 2.ttf"), > + TEXT("WebKit Layout Tests.ttf"), > + TEXT("WebKitWeightWatcher100.ttf"), > + TEXT("WebKitWeightWatcher200.ttf"), > + TEXT("WebKitWeightWatcher300.ttf"), > + TEXT("WebKitWeightWatcher400.ttf"), > + TEXT("WebKitWeightWatcher500.ttf"), > + TEXT("WebKitWeightWatcher600.ttf"), > + TEXT("WebKitWeightWatcher700.ttf"), > + TEXT("WebKitWeightWatcher800.ttf"), > + TEXT("WebKitWeightWatcher900.ttf") > + }; > + > + wstring resourcesPath = fontsPath(); > + > + for (unsigned i = 0; i < ARRAYSIZE(fontsToInstall); ++i) > + AddFontResourceEx(wstring(resourcesPath + fontsToInstall[i]).c_str(), FR_PRIVATE, 0); If you switch to the W variant, you should use an LPCWSTR array. r=me 259705 6 jhoneycutt 2010-08-03 14:53:25 -0700 (In reply to comment #5) > (From update of attachment 63309 [details]) > > +static const wstring& fontsPath() > > +{ > > + static wstring path; > > + static bool initialized; > > + > > + if (initialized) > > + return path; > > + initialized = true; > > + > > + DWORD size = GetEnvironmentVariable(fontsEnvironmentVariable, 0, 0); > > The style being used elsewhere in WebKit2 code is to prefix Win32 APIs with :: and to always use the W variant. Fixed. > > > + Vector<TCHAR> buffer(size); > > If you switch to using the W variant, this should be Vector<WCHAR>. Fixed. > > > + if (!GetEnvironmentVariable(fontsEnvironmentVariable, buffer.data(), buffer.size())) > > + return path; > > + > > + path = buffer.data(); > > + if (path[path.length() - 1] != '\\') > > + path.append(L"\\"); > > + > > + return path; > > +} > > I guess you decided that falling back to the path to the executable when WEBKIT_TESTFONTS is undefined isn't helpful? Yes - it doesn't appear that we create this directory anymore, and old-run-webkit-tests requires that WEBKIT_TESTFONTS be set. > > > > void activateFonts() > > { > > - // FIXME: Not implemented. > > + static LPCTSTR fontsToInstall[] = { > > + TEXT("AHEM____.ttf"), > > + TEXT("Apple Chancery.ttf"), > > + TEXT("Courier Bold.ttf"), > > + TEXT("Courier.ttf"), > > + TEXT("Helvetica Bold Oblique.ttf"), > > + TEXT("Helvetica Bold.ttf"), > > + TEXT("Helvetica Oblique.ttf"), > > + TEXT("Helvetica.ttf"), > > + TEXT("Helvetica Neue Bold Italic.ttf"), > > + TEXT("Helvetica Neue Bold.ttf"), > > + TEXT("Helvetica Neue Condensed Black.ttf"), > > + TEXT("Helvetica Neue Condensed Bold.ttf"), > > + TEXT("Helvetica Neue Italic.ttf"), > > + TEXT("Helvetica Neue Light Italic.ttf"), > > + TEXT("Helvetica Neue Light.ttf"), > > + TEXT("Helvetica Neue UltraLight Italic.ttf"), > > + TEXT("Helvetica Neue UltraLight.ttf"), > > + TEXT("Helvetica Neue.ttf"), > > + TEXT("Lucida Grande.ttf"), > > + TEXT("Lucida Grande Bold.ttf"), > > + TEXT("Monaco.ttf"), > > + TEXT("Papyrus.ttf"), > > + TEXT("Times Bold Italic.ttf"), > > + TEXT("Times Bold.ttf"), > > + TEXT("Times Italic.ttf"), > > + TEXT("Times Roman.ttf"), > > + TEXT("WebKit Layout Tests 2.ttf"), > > + TEXT("WebKit Layout Tests.ttf"), > > + TEXT("WebKitWeightWatcher100.ttf"), > > + TEXT("WebKitWeightWatcher200.ttf"), > > + TEXT("WebKitWeightWatcher300.ttf"), > > + TEXT("WebKitWeightWatcher400.ttf"), > > + TEXT("WebKitWeightWatcher500.ttf"), > > + TEXT("WebKitWeightWatcher600.ttf"), > > + TEXT("WebKitWeightWatcher700.ttf"), > > + TEXT("WebKitWeightWatcher800.ttf"), > > + TEXT("WebKitWeightWatcher900.ttf") > > + }; > > + > > + wstring resourcesPath = fontsPath(); > > + > > + for (unsigned i = 0; i < ARRAYSIZE(fontsToInstall); ++i) > > + AddFontResourceEx(wstring(resourcesPath + fontsToInstall[i]).c_str(), FR_PRIVATE, 0); > > If you switch to the W variant, you should use an LPCWSTR array. Fixed. > > r=me Thanks! 259740 7 jhoneycutt 2010-08-03 15:57:14 -0700 Landed in r64601. 63309 2010-08-03 02:41:13 -0700 2010-08-03 04:50:54 -0700 Patch 0001-WebKitTestRunner-needs-to-support-loading-custom-fon.patch text/plain 4556 jhoneycutt RnJvbSBiMDAwYjc1YjZlNDM0ZDU4YjRmMjAzNTQyMmU1OWNkNzcyZmY4YzRlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb24gSG9uZXljdXR0IDxqaG9uZXljdXR0QGFwcGxlLmNvbT4K RGF0ZTogTW9uLCAyIEF1ZyAyMDEwIDIyOjE5OjAzIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gV2Vi S2l0VGVzdFJ1bm5lciBuZWVkcyB0byBzdXBwb3J0IGxvYWRpbmcgY3VzdG9tIGZvbnRzICh2aWEg dGhlCiBXRUJLSVRfVEVTVEZPTlRTIGVudmlyb25tZW50IHZhcmlhYmxlKQogaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyNzgyCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KCiogV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS93aW4vQWN0aXZhdGVGb250 cy5jcHA6CihXVFI6OmZvbnRzUGF0aCk6CkNvcGllZCBmcm9tIERSVCBjb2RlLiBSZW1vdmVkIHRo ZSBmYWxsYmFjayB0byBEdW1wUmVuZGVyVHJlZS5yZXNvdXJjZXMvLgooV1RSOjphY3RpdmF0ZUZv bnRzKToKTG9vcCB0aHJvdWdoIHRoZSBmb250cywgYW5kIGNhbGwgQWRkRm9udFJlc291cmNlRXgo KSBmb3IgZWFjaC4KLS0tCiBXZWJLaXRUb29scy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB8ICAgMTQgKysrKwogLi4uL0luamVjdGVkQnVuZGxlL3dpbi9BY3RpdmF0ZUZv bnRzLmNwcCAgICAgICAgICAgfCAgIDc0ICsrKysrKysrKysrKysrKysrKystCiAyIGZpbGVzIGNo YW5nZWQsIDg3IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IDRjYmU0YTMu LjBjMjAwMzMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRU b29scy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxOSBAQAogMjAxMC0wOC0wMiAgSm9uIEhvbmV5Y3V0 dCAgPGpob25leWN1dHRAYXBwbGUuY29tPgogCisgICAgICAgIFdlYktpdFRlc3RSdW5uZXIgbmVl ZHMgdG8gc3VwcG9ydCBsb2FkaW5nIGN1c3RvbSBmb250cyAodmlhIHRoZQorICAgICAgICBXRUJL SVRfVEVTVEZPTlRTIGVudmlyb25tZW50IHZhcmlhYmxlKQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDI3ODIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5k bGUvd2luL0FjdGl2YXRlRm9udHMuY3BwOgorICAgICAgICAoV1RSOjpmb250c1BhdGgpOgorICAg ICAgICBDb3BpZWQgZnJvbSBEUlQgY29kZS4gUmVtb3ZlZCB0aGUgZmFsbGJhY2sgdG8gRHVtcFJl bmRlclRyZWUucmVzb3VyY2VzLy4KKyAgICAgICAgKFdUUjo6YWN0aXZhdGVGb250cyk6CisgICAg ICAgIExvb3AgdGhyb3VnaCB0aGUgZm9udHMsIGFuZCBjYWxsIEFkZEZvbnRSZXNvdXJjZUV4KCkg Zm9yIGVhY2guCisKKzIwMTAtMDgtMDIgIEpvbiBIb25leWN1dHQgIDxqaG9uZXljdXR0QGFwcGxl LmNvbT4KKwogICAgICAgICBSZXN0b3JlIHRoZSBXZWJLaXRUZXN0UnVubmVyLnNsbiB0aGF0IHdh cyByZW1vdmVkLCBhbmQgcmVtb3ZlIHRoZQogICAgICAgICBjb3JyZWN0IG9uZS4KIApkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS93aW4vQWN0 aXZhdGVGb250cy5jcHAgYi9XZWJLaXRUb29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVu ZGxlL3dpbi9BY3RpdmF0ZUZvbnRzLmNwcAppbmRleCBjNzUzMmNlLi5iMWIxNWVjIDEwMDY0NAot LS0gYS9XZWJLaXRUb29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL3dpbi9BY3Rp dmF0ZUZvbnRzLmNwcAorKysgYi9XZWJLaXRUb29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVk QnVuZGxlL3dpbi9BY3RpdmF0ZUZvbnRzLmNwcApAQCAtMjUsMTEgKzI1LDgzIEBACiAKICNpbmNs dWRlICJBY3RpdmF0ZUZvbnRzLmgiCiAKKyNpbmNsdWRlIDxzdHJpbmc+CisjaW5jbHVkZSA8d3Rm L1ZlY3Rvci5oPgorCitzdGF0aWMgTFBDV1NUUiBmb250c0Vudmlyb25tZW50VmFyaWFibGUgPSBM IldFQktJVF9URVNURk9OVFMiOworCiBuYW1lc3BhY2UgV1RSIHsKIAordXNpbmcgbmFtZXNwYWNl IHN0ZDsKKworc3RhdGljIGNvbnN0IHdzdHJpbmcmIGZvbnRzUGF0aCgpCit7CisgICAgc3RhdGlj IHdzdHJpbmcgcGF0aDsKKyAgICBzdGF0aWMgYm9vbCBpbml0aWFsaXplZDsKKworICAgIGlmIChp bml0aWFsaXplZCkKKyAgICAgICAgcmV0dXJuIHBhdGg7CisgICAgaW5pdGlhbGl6ZWQgPSB0cnVl OworCisgICAgRFdPUkQgc2l6ZSA9IEdldEVudmlyb25tZW50VmFyaWFibGUoZm9udHNFbnZpcm9u bWVudFZhcmlhYmxlLCAwLCAwKTsKKyAgICBWZWN0b3I8VENIQVI+IGJ1ZmZlcihzaXplKTsKKyAg ICBpZiAoIUdldEVudmlyb25tZW50VmFyaWFibGUoZm9udHNFbnZpcm9ubWVudFZhcmlhYmxlLCBi dWZmZXIuZGF0YSgpLCBidWZmZXIuc2l6ZSgpKSkKKyAgICAgICAgcmV0dXJuIHBhdGg7CisKKyAg ICBwYXRoID0gYnVmZmVyLmRhdGEoKTsKKyAgICBpZiAocGF0aFtwYXRoLmxlbmd0aCgpIC0gMV0g IT0gJ1xcJykKKyAgICAgICAgcGF0aC5hcHBlbmQoTCJcXCIpOworCisgICAgcmV0dXJuIHBhdGg7 Cit9CisKKwogdm9pZCBhY3RpdmF0ZUZvbnRzKCkKIHsKLSAgICAvLyBGSVhNRTogTm90IGltcGxl bWVudGVkLgorICAgIHN0YXRpYyBMUENUU1RSIGZvbnRzVG9JbnN0YWxsW10gPSB7CisgICAgICAg IFRFWFQoIkFIRU1fX19fLnR0ZiIpLAorICAgICAgICBURVhUKCJBcHBsZSBDaGFuY2VyeS50dGYi KSwKKyAgICAgICAgVEVYVCgiQ291cmllciBCb2xkLnR0ZiIpLAorICAgICAgICBURVhUKCJDb3Vy aWVyLnR0ZiIpLAorICAgICAgICBURVhUKCJIZWx2ZXRpY2EgQm9sZCBPYmxpcXVlLnR0ZiIpLAor ICAgICAgICBURVhUKCJIZWx2ZXRpY2EgQm9sZC50dGYiKSwKKyAgICAgICAgVEVYVCgiSGVsdmV0 aWNhIE9ibGlxdWUudHRmIiksCisgICAgICAgIFRFWFQoIkhlbHZldGljYS50dGYiKSwKKyAgICAg ICAgVEVYVCgiSGVsdmV0aWNhIE5ldWUgQm9sZCBJdGFsaWMudHRmIiksCisgICAgICAgIFRFWFQo IkhlbHZldGljYSBOZXVlIEJvbGQudHRmIiksCisgICAgICAgIFRFWFQoIkhlbHZldGljYSBOZXVl IENvbmRlbnNlZCBCbGFjay50dGYiKSwKKyAgICAgICAgVEVYVCgiSGVsdmV0aWNhIE5ldWUgQ29u ZGVuc2VkIEJvbGQudHRmIiksCisgICAgICAgIFRFWFQoIkhlbHZldGljYSBOZXVlIEl0YWxpYy50 dGYiKSwKKyAgICAgICAgVEVYVCgiSGVsdmV0aWNhIE5ldWUgTGlnaHQgSXRhbGljLnR0ZiIpLAor ICAgICAgICBURVhUKCJIZWx2ZXRpY2EgTmV1ZSBMaWdodC50dGYiKSwKKyAgICAgICAgVEVYVCgi SGVsdmV0aWNhIE5ldWUgVWx0cmFMaWdodCBJdGFsaWMudHRmIiksCisgICAgICAgIFRFWFQoIkhl bHZldGljYSBOZXVlIFVsdHJhTGlnaHQudHRmIiksCisgICAgICAgIFRFWFQoIkhlbHZldGljYSBO ZXVlLnR0ZiIpLAorICAgICAgICBURVhUKCJMdWNpZGEgR3JhbmRlLnR0ZiIpLAorICAgICAgICBU RVhUKCJMdWNpZGEgR3JhbmRlIEJvbGQudHRmIiksCisgICAgICAgIFRFWFQoIk1vbmFjby50dGYi KSwKKyAgICAgICAgVEVYVCgiUGFweXJ1cy50dGYiKSwKKyAgICAgICAgVEVYVCgiVGltZXMgQm9s ZCBJdGFsaWMudHRmIiksCisgICAgICAgIFRFWFQoIlRpbWVzIEJvbGQudHRmIiksCisgICAgICAg IFRFWFQoIlRpbWVzIEl0YWxpYy50dGYiKSwKKyAgICAgICAgVEVYVCgiVGltZXMgUm9tYW4udHRm IiksCisgICAgICAgIFRFWFQoIldlYktpdCBMYXlvdXQgVGVzdHMgMi50dGYiKSwKKyAgICAgICAg VEVYVCgiV2ViS2l0IExheW91dCBUZXN0cy50dGYiKSwKKyAgICAgICAgVEVYVCgiV2ViS2l0V2Vp Z2h0V2F0Y2hlcjEwMC50dGYiKSwKKyAgICAgICAgVEVYVCgiV2ViS2l0V2VpZ2h0V2F0Y2hlcjIw MC50dGYiKSwKKyAgICAgICAgVEVYVCgiV2ViS2l0V2VpZ2h0V2F0Y2hlcjMwMC50dGYiKSwKKyAg ICAgICAgVEVYVCgiV2ViS2l0V2VpZ2h0V2F0Y2hlcjQwMC50dGYiKSwKKyAgICAgICAgVEVYVCgi V2ViS2l0V2VpZ2h0V2F0Y2hlcjUwMC50dGYiKSwKKyAgICAgICAgVEVYVCgiV2ViS2l0V2VpZ2h0 V2F0Y2hlcjYwMC50dGYiKSwKKyAgICAgICAgVEVYVCgiV2ViS2l0V2VpZ2h0V2F0Y2hlcjcwMC50 dGYiKSwKKyAgICAgICAgVEVYVCgiV2ViS2l0V2VpZ2h0V2F0Y2hlcjgwMC50dGYiKSwKKyAgICAg ICAgVEVYVCgiV2ViS2l0V2VpZ2h0V2F0Y2hlcjkwMC50dGYiKQorICAgIH07CisKKyAgICB3c3Ry aW5nIHJlc291cmNlc1BhdGggPSBmb250c1BhdGgoKTsKKworICAgIGZvciAodW5zaWduZWQgaSA9 IDA7IGkgPCBBUlJBWVNJWkUoZm9udHNUb0luc3RhbGwpOyArK2kpCisgICAgICAgIEFkZEZvbnRS ZXNvdXJjZUV4KHdzdHJpbmcocmVzb3VyY2VzUGF0aCArIGZvbnRzVG9JbnN0YWxsW2ldKS5jX3N0 cigpLCBGUl9QUklWQVRFLCAwKTsKIH0KIAogfQotLSAKMS42LjUuMi4xNDMuZzhjYzYyCgo=