88761 2012-06-11 00:22:53 -0700 Use testRunner instead of layoutTestController in battery status and canvas tests 2012-06-14 23:23:27 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 88210 1 rniwa rniwa abarth darin kbr kenneth kihong.kwon kling krit oldest_to_newest 645781 0 rniwa 2012-06-11 00:22:53 -0700 Use testRunner instead of layoutTestController in battery status and canvas tests 645787 1 146799 rniwa 2012-06-11 00:28:30 -0700 Created attachment 146799 Patch 645788 2 146800 rniwa 2012-06-11 00:30:37 -0700 Created attachment 146800 Patch 645790 3 rniwa 2012-06-11 00:34:10 -0700 Ran: find LayoutTests/batterystatus/ LayoutTests/platform/*/batterystatus/ -type f -not -iwholename "*.svn*" -not -name "*.png" -not -name "*.ttf" -not -name "*.gif" | xargs sed -i -e "s/layoutTestController/testRunner/g" find LayoutTests/canvas/ LayoutTests/platform/*/canvas/ -type f -not -iwholename "*.svn*" -not -name "*.png" -not -name "*.ttf" -not -name "*.gif" | xargs sed -i -e "s/layoutTestController/testRunner/g" 646064 4 146800 tony 2012-06-11 10:13:05 -0700 Comment on attachment 146800 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=146800&action=review > LayoutTests/canvas/philip/tests/2d.text-custom-font-load-crash.html:30 > }), 500); This timeout is unfortunate, but unrelated to your patch. 649918 5 rniwa 2012-06-14 23:23:27 -0700 Committed r120407: <http://trac.webkit.org/changeset/120407> 146799 2012-06-11 00:28:30 -0700 2012-06-11 00:30:35 -0700 Patch bug-88761-20120611002830.patch text/plain 2657 rniwa SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDExOTk1NykKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA2LTExICBSeW9zdWtlIE5pd2EgIDxy bml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFVzZSB0ZXN0UnVubmVyIGluc3RlYWQgb2YgbGF5 b3V0VGVzdENvbnRyb2xsZXIgaW4gYmF0dGVyeSBzdGF0dXMgYW5kIGNhbnZhcyB0ZXN0cworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg3NjEKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGNhbnZhcy9waGls aXAvdGVzdHMuanM6CisgICAgICAgIChfYWRkVGVzdC5lbmRUZXN0KToKKyAgICAgICAgKF9hZGRU ZXN0LndpbmRvdy5vbmxvYWQpOgorICAgICAgICAoX2FkZFRlc3QpOgorICAgICAgICAqIGNhbnZh cy9waGlsaXAvdGVzdHMvMmQudGV4dC1jdXN0b20tZm9udC1sb2FkLWNyYXNoLmh0bWw6CisKIDIw MTItMDYtMDggIEtpbnVrbyBZYXN1ZGEgIDxraW51a29AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFVzaW5nIEJsb2JCdWlsZGVyIHNob3VsZCBzaG93IGEgZGVwcmVjYXRpb24gd2FybmluZyBtZXNz YWdlIChpZiBpdCBpcyBlbmFibGVkKQpJbmRleDogTGF5b3V0VGVzdHMvY2FudmFzL3BoaWxpcC90 ZXN0cy5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9jYW52YXMvcGhpbGlwL3Rlc3RzLmpz CShyZXZpc2lvbiAxMTk5NDYpCisrKyBMYXlvdXRUZXN0cy9jYW52YXMvcGhpbGlwL3Rlc3RzLmpz CSh3b3JraW5nIGNvcHkpCkBAIC0xMzEsOCArMTMxLDggQEAgZnVuY3Rpb24gX2FkZFRlc3QodGVz dCkKICAgICAgICAgICAgIGRvY3VtZW50LmRvY3VtZW50RWxlbWVudC5jbGFzc05hbWUgKz0gJyBw YXNzJzsKICAgICAgICAgICAgIHdpbmRvdy5fdGVzdFN0YXR1cyA9IFsncGFzcycsIGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCdkJykuaW5uZXJIVE1MXTsKICAgICAgICAgfQotICAgICAgICBpZiAo d2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQotICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRy b2xsZXIubm90aWZ5RG9uZSgpOworICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAg ICAgICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKICAgICB9OwogICAgIHdpbmRvdy5lbmRU ZXN0ID0gZW5kVGVzdDsKICAgICB3aW5kb3cud3JhcEZ1bmN0aW9uID0gZnVuY3Rpb24gKGYpCkBA IC0xNTMsOSArMTUzLDkgQEAgZnVuY3Rpb24gX2FkZFRlc3QodGVzdCkKIAogICAgIHdpbmRvdy5v bmxvYWQgPSBmdW5jdGlvbiAoKQogICAgIHsKLSAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0 Q29udHJvbGxlcikgewotICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4 dCgpOwotICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9uZSgpOwor ICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpIHsKKyAgICAgICAgICAgIHRlc3RSdW5uZXIu ZHVtcEFzVGV4dCgpOworICAgICAgICAgICAgdGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7CiAg ICAgICAgIH0KICAgICAgICAgdHJ5CiAgICAgICAgIHsKSW5kZXg6IExheW91dFRlc3RzL2NhbnZh cy9waGlsaXAvdGVzdHMvMmQudGV4dC1jdXN0b20tZm9udC1sb2FkLWNyYXNoLmh0bWwKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvY2FudmFzL3BoaWxpcC90ZXN0cy8yZC50ZXh0LWN1c3RvbS1m b250LWxvYWQtY3Jhc2guaHRtbAkocmV2aXNpb24gMTE5OTQ2KQorKysgTGF5b3V0VGVzdHMvY2Fu dmFzL3BoaWxpcC90ZXN0cy8yZC50ZXh0LWN1c3RvbS1mb250LWxvYWQtY3Jhc2guaHRtbAkod29y a2luZyBjb3B5KQpAQCAtMTIsOCArMTIsOCBAQCBmb250LWZhbWlseTogQ2FudmFzVGVzdDsgDQog PC9hcHBsZXQ+DQogPHVsIGlkPSJkIj48L3VsPg0KIDxzY3JpcHQ+DQotaWYgKHdpbmRvdy5sYXlv dXRUZXN0Q29udHJvbGxlcikNCi0gICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgp Ow0KK2lmICh3aW5kb3cudGVzdFJ1bm5lcikNCisgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7 DQogDQogX2FkZFRlc3QoZnVuY3Rpb24oY2FudmFzLCBjdHgpIHsNCiANCkBAIC0yNSw4ICsyNSw4 IEBAIGRlZmVyVGVzdCgpOw0KIHNldFRpbWVvdXQod3JhcEZ1bmN0aW9uKGZ1bmN0aW9uICgpIHsN CiAgICAgY3R4LmZpbGxUZXh0KCdBQScsIDAsIDUwKTsNCiANCi0gICAgaWYgKHdpbmRvdy5sYXlv dXRUZXN0Q29udHJvbGxlcikNCi0gICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURv bmUoKTsNCisgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQ0KKyAgICAgICAgdGVzdFJ1bm5lci5u b3RpZnlEb25lKCk7DQogfSksIDUwMCk7DQogDQogfSk7DQo= 146800 2012-06-11 00:30:37 -0700 2012-06-11 10:13:05 -0700 Patch bug-88761-20120611003037.patch text/plain 4182 rniwa SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDExOTk1NykKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA2LTExICBSeW9zdWtlIE5pd2EgIDxy bml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFVzZSB0ZXN0UnVubmVyIGluc3RlYWQgb2YgbGF5 b3V0VGVzdENvbnRyb2xsZXIgaW4gYmF0dGVyeSBzdGF0dXMgYW5kIGNhbnZhcyB0ZXN0cworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg3NjEKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGJhdHRlcnlzdGF0 dXMvcmVzb3VyY2VzL2V2ZW50LWFmdGVyLW5hdmlnYXRpb24tbmV3Lmh0bWw6CisgICAgICAgICog YmF0dGVyeXN0YXR1cy9zY3JpcHQtdGVzdHMvZXZlbnQtYWZ0ZXItbmF2aWdhdGlvbi5qczoKKyAg ICAgICAgKiBjYW52YXMvcGhpbGlwL3Rlc3RzLmpzOgorICAgICAgICAoX2FkZFRlc3QuZW5kVGVz dCk6CisgICAgICAgIChfYWRkVGVzdC53aW5kb3cub25sb2FkKToKKyAgICAgICAgKF9hZGRUZXN0 KToKKyAgICAgICAgKiBjYW52YXMvcGhpbGlwL3Rlc3RzLzJkLnRleHQtY3VzdG9tLWZvbnQtbG9h ZC1jcmFzaC5odG1sOgorCiAyMDEyLTA2LTA4ICBLaW51a28gWWFzdWRhICA8a2ludWtvQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBVc2luZyBCbG9iQnVpbGRlciBzaG91bGQgc2hvdyBhIGRlcHJl Y2F0aW9uIHdhcm5pbmcgbWVzc2FnZSAoaWYgaXQgaXMgZW5hYmxlZCkKSW5kZXg6IExheW91dFRl c3RzL2JhdHRlcnlzdGF0dXMvcmVzb3VyY2VzL2V2ZW50LWFmdGVyLW5hdmlnYXRpb24tbmV3Lmh0 bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvYmF0dGVyeXN0YXR1cy9yZXNvdXJjZXMvZXZl bnQtYWZ0ZXItbmF2aWdhdGlvbi1uZXcuaHRtbAkocmV2aXNpb24gMTE5OTQ2KQorKysgTGF5b3V0 VGVzdHMvYmF0dGVyeXN0YXR1cy9yZXNvdXJjZXMvZXZlbnQtYWZ0ZXItbmF2aWdhdGlvbi1uZXcu aHRtbAkod29ya2luZyBjb3B5KQpAQCAtNyw3ICs3LDcgQEAKICAgICBTVUNDRVNTCiAgICAgPHNj cmlwdD4KICAgICAgICAgaW50ZXJuYWxzLnNldEJhdHRlcnlTdGF0dXMoZG9jdW1lbnQsICdjaGFy Z2luZ2NoYW5nZScsIHRydWUsIDMwMDAsIE51bWJlci5QT1NJVElWRV9JTkZJTklUWSwgMC41KTsK LSAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIubm90aWZ5RG9uZSgpOworICAgICAgICB0ZXN0 UnVubmVyLm5vdGlmeURvbmUoKTsKICAgICA8L3NjcmlwdD4KICAgPC9ib2R5PgotPC9odG1sPgpc IE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKKzwvaHRtbD4KSW5kZXg6IExheW91dFRlc3RzL2Jh dHRlcnlzdGF0dXMvc2NyaXB0LXRlc3RzL2V2ZW50LWFmdGVyLW5hdmlnYXRpb24uanMKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvYmF0dGVyeXN0YXR1cy9zY3JpcHQtdGVzdHMvZXZlbnQtYWZ0 ZXItbmF2aWdhdGlvbi5qcwkocmV2aXNpb24gMTE5OTQ2KQorKysgTGF5b3V0VGVzdHMvYmF0dGVy eXN0YXR1cy9zY3JpcHQtdGVzdHMvZXZlbnQtYWZ0ZXItbmF2aWdhdGlvbi5qcwkod29ya2luZyBj b3B5KQpAQCAtMSw3ICsxLDcgQEAKIGRlc2NyaXB0aW9uKCdUZXN0cyBmb3IgYSBjcmFzaCB3aGVy ZSBhbiBldmVudCBpcyBmaXJlZCBhZnRlciB0aGUgcGFnZSBoYXMgYmVlbiBuYXZpZ2F0ZWQgYXdh eSB3aGVuIHRoZSBvcmlnaW5hbCBwYWdlIGlzIGluIHRoZSBwYWdlIGNhY2hlLicpOwogCi1pZiAo d2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQotICAgIGxheW91dFRlc3RDb250cm9sbGVyLm92 ZXJyaWRlUHJlZmVyZW5jZSgnV2ViS2l0VXNlc1BhZ2VDYWNoZVByZWZlcmVuY2VLZXknLCAxKTsK K2lmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICB0ZXN0UnVubmVyLm92ZXJyaWRlUHJlZmVyZW5j ZSgnV2ViS2l0VXNlc1BhZ2VDYWNoZVByZWZlcmVuY2VLZXknLCAxKTsKIGVsc2UKICAgICBkZWJ1 ZygnVGhpcyB0ZXN0IGNhbiBub3QgYmUgcnVuIHdpdGhvdXQgdGhlIExheW91dFRlc3RDb250cm9s bGVyJyk7CiAKSW5kZXg6IExheW91dFRlc3RzL2NhbnZhcy9waGlsaXAvdGVzdHMuanMKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvY2FudmFzL3BoaWxpcC90ZXN0cy5qcwkocmV2aXNpb24gMTE5 OTQ2KQorKysgTGF5b3V0VGVzdHMvY2FudmFzL3BoaWxpcC90ZXN0cy5qcwkod29ya2luZyBjb3B5 KQpAQCAtMTMxLDggKzEzMSw4IEBAIGZ1bmN0aW9uIF9hZGRUZXN0KHRlc3QpCiAgICAgICAgICAg ICBkb2N1bWVudC5kb2N1bWVudEVsZW1lbnQuY2xhc3NOYW1lICs9ICcgcGFzcyc7CiAgICAgICAg ICAgICB3aW5kb3cuX3Rlc3RTdGF0dXMgPSBbJ3Bhc3MnLCBkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgnZCcpLmlubmVySFRNTF07CiAgICAgICAgIH0KLSAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRU ZXN0Q29udHJvbGxlcikKLSAgICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURv bmUoKTsKKyAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICAgICAgdGVzdFJ1 bm5lci5ub3RpZnlEb25lKCk7CiAgICAgfTsKICAgICB3aW5kb3cuZW5kVGVzdCA9IGVuZFRlc3Q7 CiAgICAgd2luZG93LndyYXBGdW5jdGlvbiA9IGZ1bmN0aW9uIChmKQpAQCAtMTUzLDkgKzE1Myw5 IEBAIGZ1bmN0aW9uIF9hZGRUZXN0KHRlc3QpCiAKICAgICB3aW5kb3cub25sb2FkID0gZnVuY3Rp b24gKCkKICAgICB7Ci0gICAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsK LSAgICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKLSAgICAgICAg ICAgIGxheW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKKyAgICAgICAgaWYgKHdp bmRvdy50ZXN0UnVubmVyKSB7CisgICAgICAgICAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsK KyAgICAgICAgICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOwogICAgICAgICB9CiAgICAg ICAgIHRyeQogICAgICAgICB7CkluZGV4OiBMYXlvdXRUZXN0cy9jYW52YXMvcGhpbGlwL3Rlc3Rz LzJkLnRleHQtY3VzdG9tLWZvbnQtbG9hZC1jcmFzaC5odG1sCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL2NhbnZhcy9waGlsaXAvdGVzdHMvMmQudGV4dC1jdXN0b20tZm9udC1sb2FkLWNyYXNo Lmh0bWwJKHJldmlzaW9uIDExOTk0NikKKysrIExheW91dFRlc3RzL2NhbnZhcy9waGlsaXAvdGVz dHMvMmQudGV4dC1jdXN0b20tZm9udC1sb2FkLWNyYXNoLmh0bWwJKHdvcmtpbmcgY29weSkKQEAg LTEyLDggKzEyLDggQEAgZm9udC1mYW1pbHk6IENhbnZhc1Rlc3Q7IA0KIDwvYXBwbGV0Pg0KIDx1 bCBpZD0iZCI+PC91bD4NCiA8c2NyaXB0Pg0KLWlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xs ZXIpDQotICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsNCitpZiAod2luZG93 LnRlc3RSdW5uZXIpDQorICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOw0KIA0KIF9hZGRUZXN0 KGZ1bmN0aW9uKGNhbnZhcywgY3R4KSB7DQogDQpAQCAtMjUsOCArMjUsOCBAQCBkZWZlclRlc3Qo KTsNCiBzZXRUaW1lb3V0KHdyYXBGdW5jdGlvbihmdW5jdGlvbiAoKSB7DQogICAgIGN0eC5maWxs VGV4dCgnQUEnLCAwLCA1MCk7DQogDQotICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xs ZXIpDQotICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7DQorICAgIGlm ICh3aW5kb3cudGVzdFJ1bm5lcikNCisgICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOw0K IH0pLCA1MDApOw0KIA0KIH0pOw0K