112494 2013-03-16 01:28:56 -0700 Remove the temporary hack for webkit-perf.appspot.com and cleanup the code 2013-03-18 16:44:40 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa abarth benjamin dpranke eric pdr webkit.review.bot oldest_to_newest 856539 0 rniwa 2013-03-16 01:28:56 -0700 Remove the temporary hack for webkit-perf.appspot.com and cleanup the code 856543 1 193429 rniwa 2013-03-16 01:34:27 -0700 Created attachment 193429 Cleanup 857718 2 rniwa 2013-03-18 16:44:40 -0700 Committed r146150: <http://trac.webkit.org/changeset/146150> 193429 2013-03-16 01:34:27 -0700 2013-03-18 12:13:12 -0700 Cleanup bug-112494-20130316013022.patch text/plain 4600 rniwa SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE0NTk4NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDEzLTAzLTE2ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIFJlbW92ZSB0aGUgdGVtcG9yYXJ5IGhhY2sgZm9yIHdlYmtpdC1wZXJmLmFwcHNw b3QuY29tIGFuZCBjbGVhbnVwIHRoZSBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMTI0OTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBSZW1vdmVkIHRoZSBjb2RlIHRvIG92ZXJyaWRlIHdlYmtpdC1w ZXJmLmFwcHNwb3QuY29tIGJ5IHBlcmYud2Via2l0Lm9yZy4KKyAgICAgICAgQWxzbyBtZXJnZWQg dHdvIHBhaXJzIG9mIG1ldGhvZHMgdG8gY2xlYW51cCB0aGUgY29kZS4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyLnB5OgorICAg ICAgICAoUGVyZlRlc3RzUnVubmVyLnJ1bik6IE1lcmdlZCBfdXBsb2FkX2FuZF9zaG93X3Jlc3Vs dHMuCisgICAgICAgIChQZXJmVGVzdHNSdW5uZXIuX2dlbmVyYXRlX3Jlc3VsdHMpOiBNZXJnZWQg X2dlbmVyYXRlX291dHB1dF9maWxlcy4KKwogMjAxMy0wMy0xNSAgU2ltb24gRnJhc2VyICA8c2lt b24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMTQ0ODg0Pyk6IFdl YktpdDIuRE9NV2luZG93RXh0ZW5zaW9uQmFzaWMgQVBJIHRlc3QgaXMgYXNzZXJ0aW5nCkluZGV4 OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5l ci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rl c3RzL3BlcmZ0ZXN0c3J1bm5lci5weQkocmV2aXNpb24gMTQ1OTg2KQorKysgVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkJKHdvcmtpbmcg Y29weSkKQEAgLTIxMiw5ICsyMTIsMTIgQEAgY2xhc3MgUGVyZlRlc3RzUnVubmVyKG9iamVjdCk6 CiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBleGl0X2NvZGUKIAogICAgICAgICBpZiBzZWxm Ll9vcHRpb25zLmdlbmVyYXRlX3Jlc3VsdHMgYW5kIG5vdCBzZWxmLl9vcHRpb25zLnByb2ZpbGU6 Ci0gICAgICAgICAgICBleGl0X2NvZGUgPSBzZWxmLl91cGxvYWRfYW5kX3Nob3dfcmVzdWx0cygp Ci0gICAgICAgICAgICBpZiBleGl0X2NvZGU6Ci0gICAgICAgICAgICAgICAgcmV0dXJuIGV4aXRf Y29kZQorICAgICAgICAgICAgdGVzdF9yZXN1bHRzX3NlcnZlciA9IHNlbGYuX29wdGlvbnMudGVz dF9yZXN1bHRzX3NlcnZlcgorICAgICAgICAgICAgaWYgdGVzdF9yZXN1bHRzX3NlcnZlciBhbmQg bm90IHNlbGYuX3VwbG9hZF9qc29uKHRlc3RfcmVzdWx0c19zZXJ2ZXIsIHNlbGYuX291dHB1dF9q c29uX3BhdGgoKSk6CisgICAgICAgICAgICAgICAgcmV0dXJuIHNlbGYuRVhJVF9DT0RFX0ZBSUxF RF9VUExPQURJTkcKKworICAgICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5zaG93X3Jlc3VsdHM6 CisgICAgICAgICAgICAgICAgc2VsZi5fcG9ydC5zaG93X3Jlc3VsdHNfaHRtbF9maWxlKHNlbGYu X3Jlc3VsdHNfcGFnZV9wYXRoKCkpCiAKICAgICAgICAgcmV0dXJuIHVuZXhwZWN0ZWQKIApAQCAt MjQxLDIwICsyNDQsMTggQEAgY2xhc3MgUGVyZlRlc3RzUnVubmVyKG9iamVjdCk6CiAgICAgICAg IGlmIG5vdCBvdXRwdXQ6CiAgICAgICAgICAgICByZXR1cm4gc2VsZi5FWElUX0NPREVfQkFEX01F UkdFCiAKLSAgICAgICAgc2VsZi5fZ2VuZXJhdGVfb3V0cHV0X2ZpbGVzKG91dHB1dF9qc29uX3Bh dGgsIHNlbGYuX3Jlc3VsdHNfcGFnZV9wYXRoKCksIG91dHB1dCkKLQotICAgIGRlZiBfdXBsb2Fk X2FuZF9zaG93X3Jlc3VsdHMoc2VsZik6Ci0gICAgICAgIG9wdGlvbnMgPSBzZWxmLl9vcHRpb25z CisgICAgICAgIGZpbGVzeXN0ZW0gPSBzZWxmLl9ob3N0LmZpbGVzeXN0ZW0KKyAgICAgICAganNv bl9vdXRwdXQgPSBqc29uLmR1bXBzKG91dHB1dCkKKyAgICAgICAgZmlsZXN5c3RlbS53cml0ZV90 ZXh0X2ZpbGUob3V0cHV0X2pzb25fcGF0aCwganNvbl9vdXRwdXQpCiAKLSAgICAgICAgaWYgb3B0 aW9ucy50ZXN0X3Jlc3VsdHNfc2VydmVyOgotICAgICAgICAgICAgaWYgb3B0aW9ucy50ZXN0X3Jl c3VsdHNfc2VydmVyID09ICd3ZWJraXQtcGVyZi5hcHBzcG90LmNvbSc6Ci0gICAgICAgICAgICAg ICAgb3B0aW9ucy50ZXN0X3Jlc3VsdHNfc2VydmVyID0gJ3BlcmYud2Via2l0Lm9yZycKKyAgICAg ICAgdGVtcGxhdGVfcGF0aCA9IGZpbGVzeXN0ZW0uam9pbihzZWxmLl9wb3J0LnBlcmZfdGVzdHNf ZGlyKCksICdyZXNvdXJjZXMvcmVzdWx0cy10ZW1wbGF0ZS5odG1sJykKKyAgICAgICAgdGVtcGxh dGUgPSBmaWxlc3lzdGVtLnJlYWRfdGV4dF9maWxlKHRlbXBsYXRlX3BhdGgpCiAKLSAgICAgICAg ICAgIGlmIG5vdCBzZWxmLl91cGxvYWRfanNvbihvcHRpb25zLnRlc3RfcmVzdWx0c19zZXJ2ZXIs IHNlbGYuX291dHB1dF9qc29uX3BhdGgoKSk6Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHNlbGYu RVhJVF9DT0RFX0ZBSUxFRF9VUExPQURJTkcKKyAgICAgICAgYWJzb2x1dGVfcGF0aF90b190cnVu ayA9IGZpbGVzeXN0ZW0uZGlybmFtZShzZWxmLl9wb3J0LnBlcmZfdGVzdHNfZGlyKCkpCisgICAg ICAgIHJlc3VsdHNfcGFnZSA9IHRlbXBsYXRlLnJlcGxhY2UoJyVBYnNvbHV0ZVBhdGhUb1dlYktp dFRydW5rJScsIGFic29sdXRlX3BhdGhfdG9fdHJ1bmspCisgICAgICAgIHJlc3VsdHNfcGFnZSA9 IHJlc3VsdHNfcGFnZS5yZXBsYWNlKCclUGVmb3JtYW5jZVRlc3RzUmVzdWx0c0pTT04lJywganNv bl9vdXRwdXQpCiAKLSAgICAgICAgaWYgb3B0aW9ucy5zaG93X3Jlc3VsdHM6Ci0gICAgICAgICAg ICBzZWxmLl9wb3J0LnNob3dfcmVzdWx0c19odG1sX2ZpbGUoc2VsZi5fcmVzdWx0c19wYWdlX3Bh dGgoKSkKKyAgICAgICAgZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUoc2VsZi5fcmVzdWx0c19w YWdlX3BhdGgoKSwgcmVzdWx0c19wYWdlKQogCiAgICAgZGVmIF9nZW5lcmF0ZV9yZXN1bHRzX2Rp Y3Qoc2VsZiwgdGltZXN0YW1wLCBkZXNjcmlwdGlvbiwgcGxhdGZvcm0sIGJ1aWxkZXJfbmFtZSwg YnVpbGRfbnVtYmVyKToKICAgICAgICAgcmV2aXNpb25zID0ge30KQEAgLTMyNywyMiArMzI4LDYg QEAgY2xhc3MgUGVyZlRlc3RzUnVubmVyKG9iamVjdCk6CiAgICAgICAgICAgICBfbG9nLmVycm9y KCJGYWlsZWQgdG8gbWVyZ2Ugb3V0cHV0IEpTT04gZmlsZSAlczogJXMiICUgKG91dHB1dF9qc29u X3BhdGgsIGVycm9yKSkKICAgICAgICAgcmV0dXJuIE5vbmUKIAotICAgIGRlZiBfZ2VuZXJhdGVf b3V0cHV0X2ZpbGVzKHNlbGYsIG91dHB1dF9qc29uX3BhdGgsIHJlc3VsdHNfcGFnZV9wYXRoLCBv dXRwdXQpOgotICAgICAgICBmaWxlc3lzdGVtID0gc2VsZi5faG9zdC5maWxlc3lzdGVtCi0KLSAg ICAgICAganNvbl9vdXRwdXQgPSBqc29uLmR1bXBzKG91dHB1dCkKLSAgICAgICAgZmlsZXN5c3Rl bS53cml0ZV90ZXh0X2ZpbGUob3V0cHV0X2pzb25fcGF0aCwganNvbl9vdXRwdXQpCi0KLSAgICAg ICAgaWYgcmVzdWx0c19wYWdlX3BhdGg6Ci0gICAgICAgICAgICB0ZW1wbGF0ZV9wYXRoID0gZmls ZXN5c3RlbS5qb2luKHNlbGYuX3BvcnQucGVyZl90ZXN0c19kaXIoKSwgJ3Jlc291cmNlcy9yZXN1 bHRzLXRlbXBsYXRlLmh0bWwnKQotICAgICAgICAgICAgdGVtcGxhdGUgPSBmaWxlc3lzdGVtLnJl YWRfdGV4dF9maWxlKHRlbXBsYXRlX3BhdGgpCi0KLSAgICAgICAgICAgIGFic29sdXRlX3BhdGhf dG9fdHJ1bmsgPSBmaWxlc3lzdGVtLmRpcm5hbWUoc2VsZi5fcG9ydC5wZXJmX3Rlc3RzX2Rpcigp KQotICAgICAgICAgICAgcmVzdWx0c19wYWdlID0gdGVtcGxhdGUucmVwbGFjZSgnJUFic29sdXRl UGF0aFRvV2ViS2l0VHJ1bmslJywgYWJzb2x1dGVfcGF0aF90b190cnVuaykKLSAgICAgICAgICAg IHJlc3VsdHNfcGFnZSA9IHJlc3VsdHNfcGFnZS5yZXBsYWNlKCclUGVmb3JtYW5jZVRlc3RzUmVz dWx0c0pTT04lJywganNvbl9vdXRwdXQpCi0KLSAgICAgICAgICAgIGZpbGVzeXN0ZW0ud3JpdGVf dGV4dF9maWxlKHJlc3VsdHNfcGFnZV9wYXRoLCByZXN1bHRzX3BhZ2UpCi0KICAgICBkZWYgX3Vw bG9hZF9qc29uKHNlbGYsIHRlc3RfcmVzdWx0c19zZXJ2ZXIsIGpzb25fcGF0aCwgaG9zdF9wYXRo PSIvYXBpL3JlcG9ydCIsIGZpbGVfdXBsb2FkZXI9RmlsZVVwbG9hZGVyKToKICAgICAgICAgdXJs ID0gImh0dHBzOi8vJXMlcyIgJSAodGVzdF9yZXN1bHRzX3NlcnZlciwgaG9zdF9wYXRoKQogICAg ICAgICB1cGxvYWRlciA9IGZpbGVfdXBsb2FkZXIodXJsLCAxMjApCg==