26884 2009-07-01 08:17:09 -0700 [WML] WMLTestCase.js is cluttered & depends on several hacks 2009-07-01 09:47:56 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 20393 26885 1 zimmermann zimmermann manyoso staikos oldest_to_newest 129291 0 zimmermann 2009-07-01 08:17:09 -0700 As the summary says, WMLTestCase.js needs some love. It depends on timing hacks at the moment, which can be easily resolved. Attaching a patch soon. 129293 1 32123 zimmermann 2009-07-01 08:24:53 -0700 Created attachment 32123 Initial patch 129306 2 zecke 2009-07-01 09:19:05 -0700 I agree with george, the cleanup looks fine... 129307 3 zimmermann 2009-07-01 09:47:56 -0700 Landed in r45439. 32123 2009-07-01 08:24:53 -0700 2009-07-01 09:16:09 -0700 Initial patch bugzilla_requires_a_filename.patch text/plain 4925 zimmermann SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDQ1NDM2 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMDct MDEgIE5pa29sYXMgWmltbWVybWFubiAgPG5pa29sYXMuemltbWVybWFubkB0b3JjaG1vYmlsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4 ZXM6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjg4NAorCisgICAg ICAgIFdNTFRlc3RDYXNlLmpzIHJlbGllcyBvbiB0aW1pbmctZGVwZW5kYW50IGhhY2tzLCBtYWtp bmcgaXQgZGlmZmljdWx0IHRvIHByZWRpY3QgcmVzdWx0cyBvbiBzbG93ZXIgbWFjaGluZXMuCisg ICAgICAgIEZpeCBieSByZXdyaXRpbmcgYW5kIHNpbXBsaWZ5aW5nIHRoZSB0ZXN0aW5nIHByb2Nl ZHVyZSwgd2hpY2ggY29udGFpbmVkIHVubmVjZXNzYXJ5IHF1aXJrcyB3b3JraW5nIGFyb3VuZCBv bGRlciBXTUwgYnVncy4KKworICAgICAgICAqIHdtbC9yZXNvdXJjZXMvV01MVGVzdENhc2UuanM6 CisgICAgICAgIChjcmVhdGVXTUxUZXN0Q2FzZS5pZnJhbWVFbGVtZW50Lm9ubG9hZCk6CisgICAg ICAgIChjcmVhdGVXTUxUZXN0Q2FzZSk6CisgICAgICAgIChzdGFydFRlc3QpOgorCiAyMDA5LTA3 LTAxICBOaWtvbGFzIFppbW1lcm1hbm4gIDxuaWtvbGFzLnppbW1lcm1hbm5AdG9yY2htb2JpbGUu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEhvbGdlciBGcmV5dGhlci4KSW5kZXg6IHdtbC9y ZXNvdXJjZXMvV01MVGVzdENhc2UuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gd21sL3Jlc291cmNlcy9XTUxU ZXN0Q2FzZS5qcwkocmV2aXNpb24gNDU0MzYpCisrKyB3bWwvcmVzb3VyY2VzL1dNTFRlc3RDYXNl LmpzCSh3b3JraW5nIGNvcHkpCkBAIC05LDU5ICs5LDYyIEBAIGZ1bmN0aW9uIGNyZWF0ZVdNTEVs ZW1lbnQobmFtZSkgewogICAgIHJldHVybiB0ZXN0RG9jdW1lbnQuY3JlYXRlRWxlbWVudE5TKHdt bE5TLCAid21sOiIgKyBuYW1lKTsKIH0KIAotZnVuY3Rpb24gY3JlYXRlV01MVGVzdENhc2UoZGVz Yywgc3Vic3RpdHV0ZVZhcmlhYmxlcywgdGVzdE5hbWUpIHsKLSAgICBpZiAoc3Vic3RpdHV0ZVZh cmlhYmxlcyA9PSBudWxsKQotICAgICAgICBzdWJzdGl0dXRlVmFyaWFibGVzID0gdHJ1ZTsKK2Z1 bmN0aW9uIGNyZWF0ZVdNTFRlc3RDYXNlKHRlc3REZXNjcmlwdGlvbiwgc3Vic3RpdHV0ZXNWYXJp YWJsZXMsIHRlc3ROYW1lKSB7CisgICAgLy8gU2V0dXAgZGVmYXVsdCB0ZXN0IG9wdGlvbnMKKyAg ICBpZiAoc3Vic3RpdHV0ZXNWYXJpYWJsZXMgPT0gbnVsbCkgeworICAgICAgICBzdWJzdGl0dXRl c1ZhcmlhYmxlcyA9IHRydWU7CisgICAgfQogCi0gICAgdmFyIGRlZmF1bHRUZXN0ID0gdHJ1ZTsK KyAgICAvLyBTZXR1cCBkZWZhdWx0IHRlc3QgbmFtZQorICAgIHZhciB1c2VzRGVmYXVsdFRlc3RE b2N1bWVudCA9IGZhbHNlOwogICAgIGlmICh0ZXN0TmFtZSA9PSBudWxsKSB7Ci0gICAgICAgIGRl ZmF1bHRUZXN0ID0gZmFsc2U7CisgICAgICAgIHVzZXNEZWZhdWx0VGVzdERvY3VtZW50ID0gdHJ1 ZTsKICAgICAgICAgdGVzdE5hbWUgPSByZWxhdGl2ZVBhdGhUb0xheW91dFRlc3RzICsgIi93bWwv cmVzb3VyY2VzL3Rlc3QtZG9jdW1lbnQud21sIjsKICAgICB9CiAKLSAgICBkZXNjcmlwdGlvbihk ZXNjKTsKKyAgICAvLyBJbml0aWFsaXplIEpTIHRlc3QKKyAgICBkZXNjcmlwdGlvbih0ZXN0RGVz Y3JpcHRpb24pOwogICAgIGJvZHlFbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05h bWUoImJvZHkiKVswXTsKIAogICAgIC8vIENsZWFyIHZhcmlhYmxlIHN0YXRlICYgaGlzdG9yeQog ICAgIGRvY3VtZW50LnJlc2V0V01MUGFnZVN0YXRlKCk7CiAKKyAgICAvLyBTZXR1cCBEUlQgc3Bl Y2lmaWMgc2V0dGluZ3MKICAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CiAg ICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBDaGlsZEZyYW1lc0FzVGV4dCgpOwogICAg ICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci53YWl0VW50aWxEb25lKCk7CiAgICAgfQogCisgICAg Ly8gQ3JlYXRlIGNvbnRhaW5lciBlbGVtZW50IHRvIGxvYWQgdGhlIFdNTCBkb2N1bWVudAogICAg IGlmcmFtZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50TlMoeGh0bWxOUywgImlmcmFt ZSIpOwogICAgIGlmcmFtZUVsZW1lbnQuc3JjID0gdGVzdE5hbWU7CiAKLSAgICB2YXIgbG9hZGVk ID0gZmFsc2U7Ci0gICAgdmFyIGV4ZWN1dGVkID0gZmFsc2U7Ci0KKyAgICAvLyBQcm9jZXNzIGxv YWQgZXZlbnRzLCB0YWtpbmcgY2FyZSBvZiBzZXR0aW5nIHVwIHRoZSBuYXRpdmUgV01MIHRlc3Rj YXNlCiAgICAgaWZyYW1lRWxlbWVudC5vbmxvYWQgPSBmdW5jdGlvbigpIHsKLSAgICAgICAgaWYg KGV4ZWN1dGVkICYmICFkZWZhdWx0VGVzdCkKLSAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAg aWYgKHRlc3REb2N1bWVudCkgeworICAgICAgICAgICAgLy8gVmFyaWFibGUgc3Vic3RpdGl0aW9u IG1vZGU6IHJlc2V0dXAgdGVzdCBkb2N1bWVudCwgc3Vic3RpdHV0aW5nIGFsbCB2YXJpYWJsZXMg c3RvcmVkIGluIHRoZSBjdXJyZW50IFdNTCBwYWdlIHN0YXRlLgorICAgICAgICAgICAgLy8gVmFy aWFibGUgc3Vic3RpdHV0aW9uIG9ubHkgaGFwcGVucyBhZnRlciB0aGUgaW5pdGlhbCBkb2N1bWVu dCBoYXMgYmVlbiBsb2FkZWQgYW5kIGFmdGVyIGEgcmVsb2FkIHdhcyB0cmlnZ2VyZWQuICAgICAg ICAKKyAgICAgICAgICAgIGlmIChzdWJzdGl0dXRlc1ZhcmlhYmxlcykgeworICAgICAgICAgICAg ICAgIHRlc3REb2N1bWVudCA9IGlmcmFtZUVsZW1lbnQuY29udGVudERvY3VtZW50OworICAgICAg ICAgICAgICAgIHNldHVwVGVzdERvY3VtZW50KCk7CisgICAgICAgICAgICB9CiAKLSAgICAgICAg Ly8gRXh0ZXJuYWwgZGVjayBqdW1wcwotICAgICAgICBpZiAodGVzdERvY3VtZW50ICE9IG51bGwg JiYgIXN1YnN0aXR1dGVWYXJpYWJsZXMpIHsKLSAgICAgICAgICAgIGRlbGF5RXhlY3V0ZVRlc3Qo KTsKKyAgICAgICAgICAgIGV4ZWN1dGVUZXN0KCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAg ICAgIH0KIAogICAgICAgICB0ZXN0RG9jdW1lbnQgPSBpZnJhbWVFbGVtZW50LmNvbnRlbnREb2N1 bWVudDsKICAgICAgICAgc2V0dXBUZXN0RG9jdW1lbnQoKTsKLQotICAgICAgICAvLyBWYXJpYWJs ZSByZWZyZXNoCi0gICAgICAgIGlmIChsb2FkZWQgJiYgc3Vic3RpdHV0ZVZhcmlhYmxlcykgewot ICAgICAgICAgICAgZGVsYXlFeGVjdXRlVGVzdCgpOwotICAgICAgICAgICAgcmV0dXJuOwotICAg ICAgICB9Ci0KLSAgICAgICAgbG9hZGVkID0gdHJ1ZTsKICAgICAgICAgcHJlcGFyZVRlc3QoKTsK IAotICAgICAgICAvLyBJbnRlcm5hbCBkZWNrIGp1bXBzCi0gICAgICAgIGlmICghc3Vic3RpdHV0 ZVZhcmlhYmxlcykgewotICAgICAgICAgICAgZXhlY3V0ZWQgPSB0cnVlOwotICAgICAgICAgICAg ZGVsYXlFeGVjdXRlVGVzdCgpOworICAgICAgICAvLyBJbiBhIHJlZ3VsYXIgV01MIGRvY3VtZW50 LCB0aGlzIHdvdWxkIGhhcHBlbiBhZnRlciB0aGUgcGFyc2luZyBmaW5pc2hlZC4KKyAgICAgICAg Ly8gVGhvdWdoIGFzIHdlIGR5bmFtaWNhbGx5IGNyZWF0ZSB0ZXN0Y2FzZXMsIHdlIGhhdmUgdG8g dGFrZSBjYXJlIG9mIGluaXRpYWxpemluZyBXTUwgdmFyaWFibGUgc3RhdGUgbWFudWFsbHkuCisg ICAgICAgIHRlc3REb2N1bWVudC5pbml0aWFsaXplV01MUGFnZVN0YXRlKCk7CisKKyAgICAgICAg Ly8gSGFuZGxlIHRoZSBjYXNlIG9mIGEgc3BlY2lhbCBXTUwgdGVzdCBkb2N1bWVudC4gVGhhdCdz IGFsd2F5cyB0aGUgY2FzZSBmb3Igc3RhdGljIFdNTCB0ZXN0Y2FzZXMKKyAgICAgICAgLy8od2hp Y2ggYXJlIE5PVCBjcmVhdGVkIG1hbnVhbGx5IHVzaW5nIEpTIGluIHByZXBhcmVUZXN0KS4gRmly ZSBvZmYgdGVzdCBpbW1lZGlhdGVseSBmb3IgdGhvc2UuCisgICAgICAgIGlmICghdXNlc0RlZmF1 bHRUZXN0RG9jdW1lbnQpIHsKKyAgICAgICAgICAgIGV4ZWN1dGVUZXN0KCk7CiAgICAgICAgIH0K ICAgICB9CiAKQEAgLTgxLDIwICs4NCwxMCBAQCBmdW5jdGlvbiB0cmlnZ2VyVXBkYXRlKHgsIHkp IHsKIH0KIAogZnVuY3Rpb24gc3RhcnRUZXN0KHgsIHkpIHsKLSAgICAvLyBJbml0aWFsaXplIHZh cmlhYmxlIHN0YXRlCi0gICAgLy8gSW4gYSByZWd1bGFyIFdNTCBkb2N1bWVudCwgdGhpcyB3b3Vs ZCBoYXBwZW4gYWZ0ZXIgdGhlIHBhcnNpbmcgZmluaXNoZWQuCi0gICAgLy8gVGhvdWdoIGFzIHdl IGR5bmFtaWNhbGx5IGNyZWF0ZSB0ZXN0Y2FzZXMsIHdlIGhhdmUgdG8gdGFrZSBjYXJlIG9mIGlu aXRpYWxpemluZyBXTUwgdmFyaWFibGUgc3RhdGUgbWFudWFsbHkuCi0gICAgdGVzdERvY3VtZW50 LmluaXRpYWxpemVXTUxQYWdlU3RhdGUoKTsKLQogICAgIC8vIEFzc3VyZSBmaXJzdCBsYXlvdXQg ZmluaXNoZWQKICAgICB3aW5kb3cuc2V0VGltZW91dCgidHJpZ2dlclVwZGF0ZSgiICsgeCArICIs ICIgKyB5ICsgIikiLCAwKTsKIH0KIAotZnVuY3Rpb24gZGVsYXlFeGVjdXRlVGVzdCgpIHsKLSAg ICAvLyBBc3N1cmUgZmlyc3QgbGF5b3V0IGZpbmlzaGVkLCBhZnRlciBtYWtpbmcgY2hhbmdlcwot ICAgIHdpbmRvdy5zZXRUaW1lb3V0KCJleGVjdXRlVGVzdCgpIiwgMCk7Ci19Ci0KIGZ1bmN0aW9u IGNvbXBsZXRlVGVzdCgpIHsKICAgICB2YXIgc2NyaXB0ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dE5TKHhodG1sTlMsICJzY3JpcHQiKTs=