114555 2013-04-13 01:27:28 -0700 Merge watchlistloader into host since it's an unnecessary indirection 2013-04-13 02:46:01 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa benjamin commit-queue dpranke pnormand sam simon.fraser oldest_to_newest 875125 0 rniwa 2013-04-13 01:27:28 -0700 Merge watchlistloader into host since it's an unnecessary indirection 875126 1 197926 rniwa 2013-04-13 01:28:21 -0700 Created attachment 197926 Cleanup 875127 2 rniwa 2013-04-13 01:33:14 -0700 I don’t even know what to say... it’s as if we’re creating classes for the sake of creating classes. 875129 3 197926 commit-queue 2013-04-13 02:45:59 -0700 Comment on attachment 197926 Cleanup Clearing flags on attachment: 197926 Committed r148354: <http://trac.webkit.org/changeset/148354> 875130 4 commit-queue 2013-04-13 02:46:01 -0700 All reviewed patches have been landed. Closing bug. 197926 2013-04-13 01:28:21 -0700 2013-04-13 02:45:59 -0700 Cleanup bug-114555-20130413012758.patch text/plain 7328 rniwa SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE0ODM1MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDEzLTA0LTEzICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIE1lcmdlIHdhdGNobGlzdGxvYWRlciBpbnRvIGhvc3Qgc2luY2UgaXQncyBhbiB1 bm5lY2Vzc2FyeSBpbmRpcmVjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTE0NTU1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2UgZG9uJ3QgbmVlZCBhIGNsYXNzIHRvIGxvYWQgYSBmaWxlLgorCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vaG9zdC5weToKKyAgICAgICAgKEhvc3Qu d2F0Y2hfbGlzdCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0 L3dhdGNobGlzdGxvYWRlci5weTogUmVtb3ZlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0bG9hZGVyX3VuaXR0ZXN0LnB5OiBSZW1vdmVkLgor CiAyMDEzLTA0LTEzICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAg IFJlbmFtZSBKU09OUmVzdWx0c0dlbmVyYXRvckJhc2UgdG8gSlNPTlJlc3VsdHNHZW5lcmF0b3IK SW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2hvc3QucHkKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vaG9zdC5weQkocmV2aXNpb24gMTQ4MzUy KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vaG9zdC5weQkod29ya2luZyBjb3B5 KQpAQCAtMzYsNyArMzYsNyBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5jaGVja291dC5zY20uZGV0 ZWN0CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5tZW1vaXplZCBpbXBvcnQgbWVtb2l6ZWQKIGZyb20g d2Via2l0cHkuY29tbW9uLm5ldCBpbXBvcnQgYnVnemlsbGEsIGJ1aWxkYm90LCB3ZWIKIGZyb20g d2Via2l0cHkuY29tbW9uLnN5c3RlbS5zeXN0ZW1ob3N0IGltcG9ydCBTeXN0ZW1Ib3N0Ci1mcm9t IHdlYmtpdHB5LmNvbW1vbi53YXRjaGxpc3Qud2F0Y2hsaXN0bG9hZGVyIGltcG9ydCBXYXRjaExp c3RMb2FkZXIKK2Zyb20gd2Via2l0cHkuY29tbW9uLndhdGNobGlzdC53YXRjaGxpc3RwYXJzZXIg aW1wb3J0IFdhdGNoTGlzdFBhcnNlcgogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydC5m YWN0b3J5IGltcG9ydCBQb3J0RmFjdG9yeQogCiAKQEAgLTkxLDQgKzkxLDEwIEBAIGNsYXNzIEhv c3QoU3lzdGVtSG9zdCk6CiAKICAgICBAbWVtb2l6ZWQKICAgICBkZWYgd2F0Y2hfbGlzdChzZWxm KToKLSAgICAgICAgcmV0dXJuIFdhdGNoTGlzdExvYWRlcihzZWxmLmZpbGVzeXN0ZW0pLmxvYWQo KQorICAgICAgICBjb25maWdfcGF0aCA9IHNlbGYuZmlsZXN5c3RlbS5kaXJuYW1lKHNlbGYuZmls ZXN5c3RlbS5wYXRoX3RvX21vZHVsZSgnd2Via2l0cHkuY29tbW9uLmNvbmZpZycpKQorICAgICAg ICB3YXRjaF9saXN0X2Z1bGxfcGF0aCA9IHNlbGYuZmlsZXN5c3RlbS5qb2luKGNvbmZpZ19wYXRo LCAnd2F0Y2hsaXN0JykKKyAgICAgICAgaWYgbm90IHNlbGYuZmlsZXN5c3RlbS5leGlzdHMod2F0 Y2hfbGlzdF9mdWxsX3BhdGgpOgorICAgICAgICAgICAgcmFpc2UgRXhjZXB0aW9uKCdXYXRjaCBs aXN0IGZpbGUgKCVzKSBub3QgZm91bmQuJyAlIHdhdGNoX2xpc3RfZnVsbF9wYXRoKQorCisgICAg ICAgIHdhdGNoX2xpc3RfY29udGVudHMgPSBzZWxmLmZpbGVzeXN0ZW0ucmVhZF90ZXh0X2ZpbGUo d2F0Y2hfbGlzdF9mdWxsX3BhdGgpCisgICAgICAgIHJldHVybiBXYXRjaExpc3RQYXJzZXIoKS5w YXJzZSh3YXRjaF9saXN0X2NvbnRlbnRzKQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vd2F0Y2hsaXN0L3dhdGNobGlzdGxvYWRlci5weQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0bG9hZGVyLnB5CShyZXZp c2lvbiAxNDgzNDYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qv d2F0Y2hsaXN0bG9hZGVyLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xLDQzICswLDAgQEAKLSMgQ29w eXJpZ2h0IChDKSAyMDExIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0jCi0jIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAotIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCi0jIG1ldDoKLSMKLSMgICAgICogUmVkaXN0cmlidXRp b25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSMgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy LgotIyAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2Ug dGhlIGFib3ZlCi0jIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFu ZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKLSMgaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29y IG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQotIyBkaXN0cmlidXRpb24uCi0jICAg ICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMK LSMgY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0 cyBkZXJpdmVkIGZyb20KLSMgdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdy aXR0ZW4gcGVybWlzc2lvbi4KLSMKLSMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUg Q09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUwotIyAiQVMgSVMiIEFORCBBTlkgRVhQ UkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAotIyBMSU1JVEVE IFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVT UyBGT1IKLSMgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5U IFNIQUxMIFRIRSBDT1BZUklHSFQKLSMgT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBG T1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCi0jIFNQRUNJQUwsIEVYRU1QTEFS WSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKLSMgTElNSVRF RCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBP RiBVU0UsCi0jIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9X RVZFUiBDQVVTRUQgQU5EIE9OIEFOWQotIyBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElO IENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCi0jIChJTkNMVURJTkcgTkVHTElH RU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQotIyBP RiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNV Q0ggREFNQUdFLgotCi1mcm9tIHdlYmtpdHB5LmNvbW1vbi53YXRjaGxpc3Qud2F0Y2hsaXN0cGFy c2VyIGltcG9ydCBXYXRjaExpc3RQYXJzZXIKLQotCi1jbGFzcyBXYXRjaExpc3RMb2FkZXIob2Jq ZWN0KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgZmlsZXN5c3RlbSk6Ci0gICAgICAgIHNlbGYu X2ZpbGVzeXN0ZW0gPSBmaWxlc3lzdGVtCi0KLSAgICBkZWYgbG9hZChzZWxmKToKLSAgICAgICAg Y29uZmlnX3BhdGggPSBzZWxmLl9maWxlc3lzdGVtLmRpcm5hbWUoc2VsZi5fZmlsZXN5c3RlbS5w YXRoX3RvX21vZHVsZSgnd2Via2l0cHkuY29tbW9uLmNvbmZpZycpKQotICAgICAgICB3YXRjaF9s aXN0X2Z1bGxfcGF0aCA9IHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihjb25maWdfcGF0aCwgJ3dhdGNo bGlzdCcpCi0gICAgICAgIGlmIG5vdCBzZWxmLl9maWxlc3lzdGVtLmV4aXN0cyh3YXRjaF9saXN0 X2Z1bGxfcGF0aCk6Ci0gICAgICAgICAgICByYWlzZSBFeGNlcHRpb24oJ1dhdGNoIGxpc3QgZmls ZSAoJXMpIG5vdCBmb3VuZC4nICUgd2F0Y2hfbGlzdF9mdWxsX3BhdGgpCi0KLSAgICAgICAgd2F0 Y2hfbGlzdF9jb250ZW50cyA9IHNlbGYuX2ZpbGVzeXN0ZW0ucmVhZF90ZXh0X2ZpbGUod2F0Y2hf bGlzdF9mdWxsX3BhdGgpCi0gICAgICAgIHJldHVybiBXYXRjaExpc3RQYXJzZXIoKS5wYXJzZSh3 YXRjaF9saXN0X2NvbnRlbnRzKQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v d2F0Y2hsaXN0L3dhdGNobGlzdGxvYWRlcl91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0bG9hZGVyX3VuaXR0 ZXN0LnB5CShyZXZpc2lvbiAxNDgzNDYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi93YXRjaGxpc3Qvd2F0Y2hsaXN0bG9hZGVyX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBA IC0xLDQ1ICswLDAgQEAKLSMgQ29weXJpZ2h0IChDKSAyMDExIEdvb2dsZSBJbmMuIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCi0jCi0jIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBi aW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAotIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0 ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCi0jIG1ldDoKLSMK LSMgICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFi b3ZlIGNvcHlyaWdodAotIyBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIuCi0jICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBm b3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQotIyBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxp c3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCi0jIGluIHRoZSBk b2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKLSMg ZGlzdHJpYnV0aW9uLgotIyAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9y IHRoZSBuYW1lcyBvZiBpdHMKLSMgY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ug b3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KLSMgdGhpcyBzb2Z0d2FyZSB3aXRob3V0 IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KLSMKLSMgVEhJUyBTT0ZUV0FSRSBJ UyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUwotIyAi QVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywg QlVUIE5PVAotIyBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5U QUJJTElUWSBBTkQgRklUTkVTUyBGT1IKLSMgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NM QUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKLSMgT1dORVIgT1IgQ09OVFJJ QlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCi0j IFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcs IEJVVCBOT1QKLSMgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBP UiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCi0jIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNT IElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWQotIyBUSEVPUlkgT0YgTElB QklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCi0j IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBP VVQgT0YgVEhFIFVTRQotIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgotCi0nJydVbml0IHRlc3RzIGZvciB3YXRjaGxp c3Rsb2FkZXIucHkuJycnCi0KLWZyb20gd2Via2l0cHkuY29tbW9uIGltcG9ydCB3ZWJraXR1bml0 dGVzdAotZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtIGltcG9ydCBmaWxlc3lzdGVtX21vY2sK LWZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbSBpbXBvcnQgZmlsZXN5c3RlbQotZnJvbSB3ZWJr aXRweS5jb21tb24uc3lzdGVtLm91dHB1dGNhcHR1cmUgaW1wb3J0IE91dHB1dENhcHR1cmUKLWZy b20gd2Via2l0cHkuY29tbW9uLndhdGNobGlzdC53YXRjaGxpc3Rsb2FkZXIgaW1wb3J0IFdhdGNo TGlzdExvYWRlcgotCi0KLWNsYXNzIFdhdGNoTGlzdExvYWRlclRlc3Qod2Via2l0dW5pdHRlc3Qu VGVzdENhc2UpOgotICAgIGRlZiB0ZXN0X3dhdGNoX2xpc3Rfbm90X2ZvdW5kKHNlbGYpOgotICAg ICAgICBsb2FkZXIgPSBXYXRjaExpc3RMb2FkZXIoZmlsZXN5c3RlbV9tb2NrLk1vY2tGaWxlU3lz dGVtKCkpCi0gICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzUmVnZXhwKEV4Y2VwdGlvbiwgcidXYXRj aCBsaXN0IGZpbGUgXCguKi93YXRjaGxpc3RcKSBub3QgZm91bmRcLicsIGxvYWRlci5sb2FkKQot Ci0gICAgZGVmIHRlc3Rfd2F0Y2hfbGlzdF9sb2FkKHNlbGYpOgotICAgICAgICAjIFRlc3QgcGFy c2luZyBvZiB0aGUgY2hlY2tlZC1pbiB3YXRjaCBsaXN0LgotICAgICAgICBPdXRwdXRDYXB0dXJl KCkuYXNzZXJ0X291dHB1dHMoc2VsZiwgV2F0Y2hMaXN0TG9hZGVyKGZpbGVzeXN0ZW0uRmlsZVN5 c3RlbSgpKS5sb2FkLCBleHBlY3RlZF9sb2dzPSIiKQo=