118109 2013-06-26 18:15:46 -0700 [Mac] Add Mavericks system font to Test systems 2013-06-27 18:03:00 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dino dino buildbot graouts jberlin rniwa oldest_to_newest 904018 0 dino 2013-06-26 18:15:46 -0700 OS X Mavericks uses a different font for system controls. We need to make sure our test systems know about it otherwise they'll use a fallback font. Unfortunately the fonts are hidden, so we'll have to add them directly rather than find them in the list of available fonts. <rdar://problem/13529880> 904021 1 205552 dino 2013-06-26 18:19:42 -0700 Created attachment 205552 Patch 904025 2 205552 buildbot 2013-06-26 18:40:32 -0700 Comment on attachment 205552 Patch Attachment 205552 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-queues.appspot.com/results/944242 904030 3 205552 buildbot 2013-06-26 19:01:40 -0700 Comment on attachment 205552 Patch Attachment 205552 did not pass mac-ews (mac): Output: http://webkit-queues.appspot.com/results/977466 904308 4 jberlin 2013-06-27 11:54:22 -0700 /Volumes/Data/EWS/WebKit/WebKitBuild/WebKitTestRunner.build/Release/WebKitTestRunnerInjectedBundle.build/Objects-normal/x86_64/ActivateFonts.o /Volumes/Data/EWS/WebKit/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm:164:12: error: use of undeclared identifier 'fontFamiliySet'; did you mean 'fontFamilySet'? return fontFamiliySet; ^~~~~~~~~~~~~~ fontFamilySet /Volumes/Data/EWS/WebKit/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm:45:19: note: 'fontFamilySet' declared here static NSSet *fontFamilySet = [[NSSet setWithObjects: ^ 1 error generated. Please fix before committing :) 904411 5 dino 2013-06-27 18:03:00 -0700 Committed r152144: <http://trac.webkit.org/changeset/152144> 205552 2013-06-26 18:19:42 -0700 2013-06-26 19:01:40 -0700 Patch bug-118109-20130627111744.patch text/plain 4243 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMDA2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTJlMmVlMzFiYzUxMGUzMTIzNTM1ZmJjMTIwZDM2YzJi MzAzMjZmYS4uYTgwOWYzNWJhNGEzMWI3MDljNDY5OTdlNTdjNWY0N2I1OGY4MWEyMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDEzLTA2LTI2ICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAg ICBbTWFjXSBBZGQgTWF2ZXJpY2tzIHN5c3RlbSBmb250IHRvIFRlc3Qgc3lzdGVtcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4MTA5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT1MgWCBNYXZlcmlja3Mg dXNlcyBhIGRpZmZlcmVudCBmb250IGZvciBzeXN0ZW0gY29udHJvbHMuIFRlbGwgRFJUIGFuZAor ICAgICAgICBXS1RSIGFib3V0IHRoZW0gb3RoZXJ3aXNlIHRoZXkgdXNlIGEgZmFsbGJhY2sgZm9u dC4gVW5mb3J0dW5hdGVseSB0aGUKKyAgICAgICAgZm9udHMgYXJlIGhpZGRlbiAobm90IGZvdW5k IGluIHRoZSBsaXN0IG9mIGF2YWlsYWJsZSBmb250cykgc28gSQorICAgICAgICBoYWQgdG8gYWRk IHRoZW0gbWFudWFsbHkuCisKKyAgICAgICAgRXZlbiB0aG91Z2ggdGhlcmUgaXMgb25seSBvbmUg YXQgdGhlIG1vbWVudCwgSSBpbXBsZW1lbnRlZCB0aGlzCisgICAgICAgIGFzIGEgc2V0IHNvIGl0 IHdpbGwgYmUgZWFzaWVyIHRvIGFkZCBuZXcgZm9udHMgaWYgbmVjZXNzYXJ5LgorCisgICAgICAg ICogRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tOgorICAgICAgICAoYWxsb3dl ZEZvbnRGYW1pbHlTZXQpOiBGaXhlZCB0eXBvLgorICAgICAgICAoc3lzdGVtSGlkZGVuRm9udEZh bWlseVNldCk6IE5ldyBtZXRob2QgdGhhdCByZXR1cm5zIHRoZSBzeXN0ZW0gY29udHJvbCBmb250 LgorICAgICAgICAoZHJ0X05TRm9udE1hbmFnZXJfYXZhaWxhYmxlRm9udHMpOiBNZXJnZSB0aGUg aGlkZGVuIGZvbnRzLgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUv bWFjL0FjdGl2YXRlRm9udHMubW06CisgICAgICAgIChXVFI6OmFsbG93ZWRGb250RmFtaWx5U2V0 KTogRml4ZWQgdHlwby4KKyAgICAgICAgKFdUUjo6c3lzdGVtSGlkZGVuRm9udEZhbWlseVNldCk6 IEFzIGFib3ZlLgorICAgICAgICAoV1RSOjp3dHJfTlNGb250TWFuYWdlcl9hdmFpbGFibGVGb250 cyk6CisKIDIwMTMtMDYtMjUgIFJhcGhhZWwgS3VibyBkYSBDb3N0YSAgPHJhcGhhZWwua3Viby5k YS5jb3N0YUBpbnRlbC5jb20+CiAKICAgICAgICAgZ2RiOiBSZW1vdmUgdGhlIHdlYmNvcmUucHkg cHJldHR5IHByaW50ZXIuCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVt cFJlbmRlclRyZWUubW0gYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUu bW0KaW5kZXggN2ZmZTFkNzNkNmViYjJmYTE5NWMxM2ExYzg3YTBkNDM5M2RmNzVmZC4uOWI0NGYz ZWE2NzJjNGQ1ZTE4NWYwZDAwMzEwM2UzYThmZDAwNTNmMCAxMDA2NDQKLS0tIGEvVG9vbHMvRHVt cFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQpAQCAtMjM2LDcgKzIzNiw3IEBAIHN0YXRpYyBib29s IHNob3VsZElnbm9yZVdlYkNvcmVOb2RlTGVha3MoY29uc3Qgc3RyaW5nJiBVUkxTdHJpbmcpCiAK IHN0YXRpYyBOU1NldCAqYWxsb3dlZEZvbnRGYW1pbHlTZXQoKQogewotICAgIHN0YXRpYyBOU1Nl dCAqZm9udEZhbWlsaXlTZXQgPSBbW05TU2V0IHNldFdpdGhPYmplY3RzOgorICAgIHN0YXRpYyBO U1NldCAqZm9udEZhbWlseVNldCA9IFtbTlNTZXQgc2V0V2l0aE9iamVjdHM6CiAgICAgICAgIEAi QWhlbSIsCiAgICAgICAgIEAiQWwgQmF5YW4iLAogICAgICAgICBAIkFtZXJpY2FuIFR5cGV3cml0 ZXIiLApAQCAtMzU1LDcgKzM1NSwxNiBAQCBzdGF0aWMgTlNTZXQgKmFsbG93ZWRGb250RmFtaWx5 U2V0KCkKICAgICAgICAgQCJaYXBmaW5vIiwKICAgICAgICAgbmlsXSByZXRhaW5dOwogICAgIAot ICAgIHJldHVybiBmb250RmFtaWxpeVNldDsKKyAgICByZXR1cm4gZm9udEZhbWlseVNldDsKK30K Kworc3RhdGljIE5TU2V0ICpzeXN0ZW1IaWRkZW5Gb250RmFtaWx5U2V0KCkKK3sKKyAgICBzdGF0 aWMgTlNTZXQgKmZvbnRGYW1pbHlTZXQgPSBbW05TU2V0IHNldFdpdGhPYmplY3RzOgorICAgICAg ICBAIi5MdWNpZGFHcmFuZGVVSSIsCisgICAgICAgIG5pbF0gcmV0YWluXTsKKworICAgIHJldHVy biBmb250RmFtaWx5U2V0OwogfQogCiBzdGF0aWMgSU1QIGFwcEtpdEF2YWlsYWJsZUZvbnRGYW1p bGllc0lNUDsKQEAgLTM5MSw3ICs0MDAsMTEgQEAgc3RhdGljIE5TQXJyYXkgKmRydF9OU0ZvbnRN YW5hZ2VyX2F2YWlsYWJsZUZvbnRzKGlkIHNlbGYsIFNFTCBfY21kKQogICAgICAgICAgICAgW2F2 YWlsYWJsZUZvbnRMaXN0IGFkZE9iamVjdDpbZm9udEluZm8gb2JqZWN0QXRJbmRleDowXV07CiAg ICAgICAgIH0KICAgICB9Ci0gICAgCisKKyAgICBmb3IgKE5TU3RyaW5nICpoaWRkZW5Gb250RmFt aWx5IGluIHN5c3RlbUhpZGRlbkZvbnRGYW1pbHlTZXQoKSkgeworICAgICAgICBbYXZhaWxhYmxl Rm9udExpc3QgYWRkT2JqZWN0OmhpZGRlbkZvbnRGYW1pbHldOworICAgIH0KKwogICAgIGF2YWls YWJsZUZvbnRzID0gYXZhaWxhYmxlRm9udExpc3Q7CiAgICAgcmV0dXJuIGF2YWlsYWJsZUZvbnRz OwogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9t YWMvQWN0aXZhdGVGb250cy5tbSBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5k bGUvbWFjL0FjdGl2YXRlRm9udHMubW0KaW5kZXggOGVjZmM5MWE3YTFlNmFjYjRjOWVlYzU0MmY0 Y2FjYzExODM1YzU5Zi4uNjkwYzA0NWU4ZDY2MzFhOTc1YTU1Mzc1ZTczZWIyNjQ1OGEzMzgxZiAx MDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9tYWMvQWN0 aXZhdGVGb250cy5tbQorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxl L21hYy9BY3RpdmF0ZUZvbnRzLm1tCkBAIC00Miw3ICs0Miw3IEBAIG5hbWVzcGFjZSBXVFIgewog CiBzdGF0aWMgTlNTZXQgKmFsbG93ZWRGb250RmFtaWx5U2V0KCkKIHsKLSAgICBzdGF0aWMgTlNT ZXQgKmZvbnRGYW1pbGl5U2V0ID0gW1tOU1NldCBzZXRXaXRoT2JqZWN0czoKKyAgICBzdGF0aWMg TlNTZXQgKmZvbnRGYW1pbHlTZXQgPSBbW05TU2V0IHNldFdpdGhPYmplY3RzOgogICAgICAgICBA IkFoZW0iLAogICAgICAgICBAIkFsIEJheWFuIiwKICAgICAgICAgQCJBbWVyaWNhbiBUeXBld3Jp dGVyIiwKQEAgLTE2NCw2ICsxNjQsMTUgQEAgc3RhdGljIE5TU2V0ICphbGxvd2VkRm9udEZhbWls eVNldCgpCiAgICAgcmV0dXJuIGZvbnRGYW1pbGl5U2V0OwogfQogCitzdGF0aWMgTlNTZXQgKnN5 c3RlbUhpZGRlbkZvbnRGYW1pbHlTZXQoKQoreworICAgIHN0YXRpYyBOU1NldCAqZm9udEZhbWls eVNldCA9IFtbTlNTZXQgc2V0V2l0aE9iamVjdHM6CisgICAgICAgIEAiLkx1Y2lkYUdyYW5kZVVJ IiwKKyAgICAgICAgbmlsXSByZXRhaW5dOworCisgICAgcmV0dXJuIGZvbnRGYW1pbHlTZXQ7Cit9 CisKIHN0YXRpYyBJTVAgYXBwS2l0QXZhaWxhYmxlRm9udEZhbWlsaWVzSU1QOwogc3RhdGljIElN UCBhcHBLaXRBdmFpbGFibGVGb250c0lNUDsKIApAQCAtMTk3LDcgKzIwNiwxMSBAQCBzdGF0aWMg TlNBcnJheSAqd3RyX05TRm9udE1hbmFnZXJfYXZhaWxhYmxlRm9udHMoaWQgc2VsZiwgU0VMIF9j bWQpCiAgICAgICAgICAgICBbYXZhaWxhYmxlRm9udExpc3QgYWRkT2JqZWN0Oltmb250SW5mbyBv YmplY3RBdEluZGV4OjBdXTsKICAgICAgICAgfQogICAgIH0KLSAgICAKKworICAgIGZvciAoTlNT dHJpbmcgKmhpZGRlbkZvbnRGYW1pbHkgaW4gc3lzdGVtSGlkZGVuRm9udEZhbWlseVNldCgpKSB7 CisgICAgICAgIFthdmFpbGFibGVGb250TGlzdCBhZGRPYmplY3Q6aGlkZGVuRm9udEZhbWlseV07 CisgICAgfQorCiAgICAgYXZhaWxhYmxlRm9udHMgPSBhdmFpbGFibGVGb250TGlzdDsKICAgICBy ZXR1cm4gYXZhaWxhYmxlRm9udHM7CiB9Cg==