114459 2013-04-11 13:06:44 -0700 Clean up related storage areas when a connection is destroyed 2013-04-12 07:49:46 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca bdakin oldest_to_newest 874077 0 andersca 2013-04-11 13:06:44 -0700 Clean up related storage areas when a connection is destroyed 874080 1 197658 andersca 2013-04-11 13:08:34 -0700 Created attachment 197658 Patch 874089 2 andersca 2013-04-11 13:13:33 -0700 Committed r148229: <http://trac.webkit.org/changeset/148229> 874722 3 197658 darin 2013-04-12 07:49:46 -0700 Comment on attachment 197658 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=197658&action=review > Source/WebKit2/UIProcess/Storage/StorageManager.h:82 > - HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> > m_storageAreas; > + HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> > m_storageAreasByConnection; I think a typedef for the pair type would really help readability. And probably a typedef for the map type too. 197658 2013-04-11 13:08:34 -0700 2013-04-12 07:49:46 -0700 Patch bug-114459-20130411130813.patch text/plain 6895 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4MjE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjAyODI1OGNjNzI5YmJl ZGM1MjYwZjBiZTZlMGFlYTU5ZmYzMWY2Yy4uY2VjMjcyOGU4M2QxMmE5ZDgxMTY5N2MyYzQ3NGQ0 ZjQ4OTM1ZTRjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDEzLTA0LTExICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQ2xlYW4gdXAgcmVs YXRlZCBzdG9yYWdlIGFyZWFzIHdoZW4gYSBjb25uZWN0aW9uIGlzIGRlc3Ryb3llZAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE0NDU5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvU3Rv cmFnZS9TdG9yYWdlTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2Vy Ojpwcm9jZXNzV2lsbENsb3NlQ29ubmVjdGlvbik6CisgICAgICAgIERpc3BhdGNoIGludmFsaWRh dGVDb25uZWN0aW9uSW50ZXJuYWwgb24gdGhlIHdvcmsgcXVldWUuCisgICAgICAgIAorICAgICAg ICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6Y3JlYXRlU3RvcmFnZU1hcCk6CisgICAgICAgIChX ZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpkZXN0cm95U3RvcmFnZU1hcCk6CisgICAgICAgIFJlbmFt ZSBtX3N0b3JhZ2VBcmVhcyB0byBtX3N0b3JhZ2VBcmVhc0J5Q29ubmVjdGlvbi4KKworICAgICAg ICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6aW52YWxpZGF0ZUNvbm5lY3Rpb25JbnRlcm5hbCk6 CisgICAgICAgIEdvIG92ZXIgYWxsIGtub3duIHN0b3JhZ2UgYXJlYXMgYW5kIHJlbW92ZSB0aGlz IGNvbm5lY3Rpb24gYXMgYSBsaXN0ZW5lci4KKworICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFu YWdlcjo6ZmluZFN0b3JhZ2VBcmVhKToKKyAgICAgICAgUmVuYW1lIG1fc3RvcmFnZUFyZWFzIHRv IG1fc3RvcmFnZUFyZWFzQnlDb25uZWN0aW9uLgorCisgICAgICAgICogVUlQcm9jZXNzL1N0b3Jh Z2UvU3RvcmFnZU1hbmFnZXIuaDoKKyAgICAgICAgUmVuYW1lIG1fc3RvcmFnZUFyZWFzIHRvIG1f c3RvcmFnZUFyZWFzQnlDb25uZWN0aW9uLgorCisyMDEzLTA0LTExICBBbmRlcnMgQ2FybHNzb24g IDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgTWFrZSBTdG9yYWdlQXJlYU1hcCBkaXNw YXRjaCBzZXNzaW9uIHN0b3JhZ2UgZXZlbnRzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMTQ0NTQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCmluZGV4IDg0MGQ1MWM4ZWYxMWZkYjU0 OTVjY2FiYTZlN2VhMmVlNWI1MGU3NGUuLjRlMjVkNDEyMjQxZjk4MmI4NDJjZWY3YTkyODQ5MzIx NWUzMDAzYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0 b3JhZ2VNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9T dG9yYWdlTWFuYWdlci5jcHAKQEAgLTIwNiw2ICsyMDYsOCBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2Vy Ojpwcm9jZXNzV2lsbE9wZW5Db25uZWN0aW9uKFdlYlByb2Nlc3NQcm94eSogd2ViUHJvY2Vzc1By b3h5KQogdm9pZCBTdG9yYWdlTWFuYWdlcjo6cHJvY2Vzc1dpbGxDbG9zZUNvbm5lY3Rpb24oV2Vi UHJvY2Vzc1Byb3h5KiB3ZWJQcm9jZXNzUHJveHkpCiB7CiAgICAgd2ViUHJvY2Vzc1Byb3h5LT5j b25uZWN0aW9uKCktPnJlbW92ZVdvcmtRdWV1ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6U3Rv cmFnZU1hbmFnZXI6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSk7CisKKyAgICBtX3F1ZXVlLT5kaXNw YXRjaChiaW5kKCZTdG9yYWdlTWFuYWdlcjo6aW52YWxpZGF0ZUNvbm5lY3Rpb25JbnRlcm5hbCwg dGhpcywgUmVmUHRyPENvcmVJUEM6OkNvbm5lY3Rpb24+KHdlYlByb2Nlc3NQcm94eS0+Y29ubmVj dGlvbigpKSkpOwogfQogCiB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGVTdG9yYWdlTWFwKENv cmVJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIHVpbnQ2NF90IHN0b3JhZ2VNYXBJRCwgdWlu dDY0X3Qgc3RvcmFnZU5hbWVzcGFjZUlELCBjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEmIHNlY3Vy aXR5T3JpZ2luRGF0YSkKQEAgLTIxNSw3ICsyMTcsNyBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpj cmVhdGVTdG9yYWdlTWFwKENvcmVJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIHVpbnQ2NF90 CiAgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGJlIGEgbWVzc2FnZSBjaGVjay4KICAgICBBU1NF UlQoKEhhc2hNYXA8c3RkOjpwYWlyPFJlZlB0cjxDb3JlSVBDOjpDb25uZWN0aW9uPiwgdWludDY0 X3Q+LCBSZWZQdHI8U3RvcmFnZUFyZWE+ID46OmlzVmFsaWRLZXkoY29ubmVjdGlvbkFuZFN0b3Jh Z2VNYXBJRFBhaXIpKSk7CiAKLSAgICBIYXNoTWFwPHN0ZDo6cGFpcjxSZWZQdHI8Q29yZUlQQzo6 Q29ubmVjdGlvbj4sIHVpbnQ2NF90PiwgUmVmUHRyPFN0b3JhZ2VBcmVhPiA+OjpBZGRSZXN1bHQg cmVzdWx0ID0gbV9zdG9yYWdlQXJlYXMuYWRkKGNvbm5lY3Rpb25BbmRTdG9yYWdlTWFwSURQYWly LCAwKTsKKyAgICBIYXNoTWFwPHN0ZDo6cGFpcjxSZWZQdHI8Q29yZUlQQzo6Q29ubmVjdGlvbj4s IHVpbnQ2NF90PiwgUmVmUHRyPFN0b3JhZ2VBcmVhPiA+OjpBZGRSZXN1bHQgcmVzdWx0ID0gbV9z dG9yYWdlQXJlYXNCeUNvbm5lY3Rpb24uYWRkKGNvbm5lY3Rpb25BbmRTdG9yYWdlTWFwSURQYWly LCAwKTsKIAogICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBiZSBhIG1lc3NhZ2UgY2hlY2suCiAg ICAgQVNTRVJUKHJlc3VsdC5pc05ld0VudHJ5KTsKQEAgLTI0NSwxNCArMjQ3LDEzIEBAIHZvaWQg U3RvcmFnZU1hbmFnZXI6OmRlc3Ryb3lTdG9yYWdlTWFwKENvcmVJUEM6OkNvbm5lY3Rpb24qIGNv bm5lY3Rpb24sIHVpbnQ2NF90CiAgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGJlIGEgbWVzc2Fn ZSBjaGVjay4KICAgICBBU1NFUlQoKEhhc2hNYXA8c3RkOjpwYWlyPFJlZlB0cjxDb3JlSVBDOjpD b25uZWN0aW9uPiwgdWludDY0X3Q+LCBSZWZQdHI8U3RvcmFnZUFyZWE+ID46OmlzVmFsaWRLZXko Y29ubmVjdGlvbkFuZFN0b3JhZ2VNYXBJRFBhaXIpKSk7CiAKLSAgICBIYXNoTWFwPHN0ZDo6cGFp cjxSZWZQdHI8Q29yZUlQQzo6Q29ubmVjdGlvbj4sIHVpbnQ2NF90PiwgUmVmUHRyPFN0b3JhZ2VB cmVhPiA+OjppdGVyYXRvciBpdCA9IG1fc3RvcmFnZUFyZWFzLmZpbmQoY29ubmVjdGlvbkFuZFN0 b3JhZ2VNYXBJRFBhaXIpOworICAgIEhhc2hNYXA8c3RkOjpwYWlyPFJlZlB0cjxDb3JlSVBDOjpD b25uZWN0aW9uPiwgdWludDY0X3Q+LCBSZWZQdHI8U3RvcmFnZUFyZWE+ID46Oml0ZXJhdG9yIGl0 ID0gbV9zdG9yYWdlQXJlYXNCeUNvbm5lY3Rpb24uZmluZChjb25uZWN0aW9uQW5kU3RvcmFnZU1h cElEUGFpcik7CiAKICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYmUgYSBtZXNzYWdlIGNoZWNr LgotICAgIEFTU0VSVChpdCAhPSBtX3N0b3JhZ2VBcmVhcy5lbmQoKSk7CisgICAgQVNTRVJUKGl0 ICE9IG1fc3RvcmFnZUFyZWFzQnlDb25uZWN0aW9uLmVuZCgpKTsKIAogICAgIGl0LT52YWx1ZS0+ cmVtb3ZlTGlzdGVuZXIoY29ubmVjdGlvbiwgc3RvcmFnZU1hcElEKTsKLQotICAgIG1fc3RvcmFn ZUFyZWFzLnJlbW92ZShjb25uZWN0aW9uQW5kU3RvcmFnZU1hcElEUGFpcik7CisgICAgbV9zdG9y YWdlQXJlYXNCeUNvbm5lY3Rpb24ucmVtb3ZlKGNvbm5lY3Rpb25BbmRTdG9yYWdlTWFwSURQYWly KTsKIH0KIAogdm9pZCBTdG9yYWdlTWFuYWdlcjo6Z2V0VmFsdWVzKENvcmVJUEM6OkNvbm5lY3Rp b24qLCB1aW50NjRfdCwgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4mKQpAQCAtMzA0LDEzICszMDUs MjkgQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6Y2xvbmVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZUlu dGVybmFsKHVpbnQ2NF90IHN0b3JhZ2VOYW1lc3AKICAgICBzZXNzaW9uU3RvcmFnZU5hbWVzcGFj ZS0+Y2xvbmVUbygqbmV3U2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UpOwogfQogCit2b2lkIFN0b3Jh Z2VNYW5hZ2VyOjppbnZhbGlkYXRlQ29ubmVjdGlvbkludGVybmFsKENvcmVJUEM6OkNvbm5lY3Rp b24qIGNvbm5lY3Rpb24pCit7CisgICAgVmVjdG9yPHN0ZDo6cGFpcjxSZWZQdHI8Q29yZUlQQzo6 Q29ubmVjdGlvbj4sIHVpbnQ2NF90PiA+IGNvbm5lY3Rpb25BbmRTdG9yYWdlTWFwSURQYWlyc1Rv UmVtb3ZlOworICAgIEhhc2hNYXA8c3RkOjpwYWlyPFJlZlB0cjxDb3JlSVBDOjpDb25uZWN0aW9u PiwgdWludDY0X3Q+LCBSZWZQdHI8U3RvcmFnZUFyZWE+ID4gc3RvcmFnZUFyZWFzQnlDb25uZWN0 aW9uID0gbV9zdG9yYWdlQXJlYXNCeUNvbm5lY3Rpb247CisgICAgZm9yIChIYXNoTWFwPHN0ZDo6 cGFpcjxSZWZQdHI8Q29yZUlQQzo6Q29ubmVjdGlvbj4sIHVpbnQ2NF90PiwgUmVmUHRyPFN0b3Jh Z2VBcmVhPiA+Ojpjb25zdF9pdGVyYXRvciBpdCA9IHN0b3JhZ2VBcmVhc0J5Q29ubmVjdGlvbi5i ZWdpbigpLCBlbmQgPSBzdG9yYWdlQXJlYXNCeUNvbm5lY3Rpb24uZW5kKCk7IGl0ICE9IGVuZDsg KytpdCkgeworICAgICAgICBpZiAoaXQtPmtleS5maXJzdCAhPSBjb25uZWN0aW9uKQorICAgICAg ICAgICAgY29udGludWU7CisKKyAgICAgICAgaXQtPnZhbHVlLT5yZW1vdmVMaXN0ZW5lcihpdC0+ a2V5LmZpcnN0LmdldCgpLCBpdC0+a2V5LnNlY29uZCk7CisgICAgICAgIGNvbm5lY3Rpb25BbmRT dG9yYWdlTWFwSURQYWlyc1RvUmVtb3ZlLmFwcGVuZChpdC0+a2V5KTsKKyAgICB9CisKKyAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IGNvbm5lY3Rpb25BbmRTdG9yYWdlTWFwSURQYWlyc1RvUmVt b3ZlLnNpemUoKTsgKytpKQorICAgICAgICBtX3N0b3JhZ2VBcmVhc0J5Q29ubmVjdGlvbi5yZW1v dmUoY29ubmVjdGlvbkFuZFN0b3JhZ2VNYXBJRFBhaXJzVG9SZW1vdmVbaV0pOworfQorCiBTdG9y YWdlTWFuYWdlcjo6U3RvcmFnZUFyZWEqIFN0b3JhZ2VNYW5hZ2VyOjpmaW5kU3RvcmFnZUFyZWEo Q29yZUlQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgdWludDY0X3Qgc3RvcmFnZU1hcElEKSBj b25zdAogewogICAgIHN0ZDo6cGFpcjxDb3JlSVBDOjpDb25uZWN0aW9uKiwgdWludDY0X3Q+IGNv bm5lY3Rpb25BbmRTdG9yYWdlTWFwSURQYWlyKGNvbm5lY3Rpb24sIHN0b3JhZ2VNYXBJRCk7CiAg ICAgaWYgKCFIYXNoTWFwPHN0ZDo6cGFpcjxSZWZQdHI8Q29yZUlQQzo6Q29ubmVjdGlvbj4sIHVp bnQ2NF90PiwgUmVmUHRyPFN0b3JhZ2VBcmVhPiA+Ojppc1ZhbGlkS2V5KGNvbm5lY3Rpb25BbmRT dG9yYWdlTWFwSURQYWlyKSkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICByZXR1cm4gbV9zdG9y YWdlQXJlYXMuZ2V0KGNvbm5lY3Rpb25BbmRTdG9yYWdlTWFwSURQYWlyKS5nZXQoKTsKKyAgICBy ZXR1cm4gbV9zdG9yYWdlQXJlYXNCeUNvbm5lY3Rpb24uZ2V0KGNvbm5lY3Rpb25BbmRTdG9yYWdl TWFwSURQYWlyKS5nZXQoKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuaAppbmRleCBjYzc2 ZjYwZjY3NTAzYWRmY2FjZjdmYzllN2NjMDVmMTcwOWE2NmQ5Li5kZTU3NTJmNGFjZGUxODNmNWVj YTg4MTE3NzFlZjA5ZDAzYzcxMTU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmgKQEAgLTY5LDYgKzY5LDggQEAgcHJpdmF0ZToKICAg ICB2b2lkIHNldEFsbG93ZWRTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZUNvbm5lY3Rpb25JbnRlcm5h bCh1aW50NjRfdCBzdG9yYWdlTmFtZXNwYWNlSUQsIENvcmVJUEM6OkNvbm5lY3Rpb24qIGFsbG93 ZWRDb25uZWN0aW9uKTsKICAgICB2b2lkIGNsb25lU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VJbnRl cm5hbCh1aW50NjRfdCBzdG9yYWdlTmFtZXNwYWNlSUQsIHVpbnQ2NF90IG5ld1N0b3JhZ2VOYW1l c3BhY2VJRCk7CiAKKyAgICB2b2lkIGludmFsaWRhdGVDb25uZWN0aW9uSW50ZXJuYWwoQ29yZUlQ Qzo6Q29ubmVjdGlvbiopOworCiAgICAgY2xhc3MgU3RvcmFnZUFyZWE7CiAgICAgU3RvcmFnZUFy ZWEqIGZpbmRTdG9yYWdlQXJlYShDb3JlSVBDOjpDb25uZWN0aW9uKiwgdWludDY0X3QpIGNvbnN0 OwogCkBAIC03Nyw3ICs3OSw3IEBAIHByaXZhdGU6CiAgICAgY2xhc3MgU2Vzc2lvblN0b3JhZ2VO YW1lc3BhY2U7CiAgICAgSGFzaE1hcDx1aW50NjRfdCwgUmVmUHRyPFNlc3Npb25TdG9yYWdlTmFt ZXNwYWNlPiA+IG1fc2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VzOwogCi0gICAgSGFzaE1hcDxzdGQ6 OnBhaXI8UmVmUHRyPENvcmVJUEM6OkNvbm5lY3Rpb24+LCB1aW50NjRfdD4sIFJlZlB0cjxTdG9y YWdlQXJlYT4gPiBtX3N0b3JhZ2VBcmVhczsKKyAgICBIYXNoTWFwPHN0ZDo6cGFpcjxSZWZQdHI8 Q29yZUlQQzo6Q29ubmVjdGlvbj4sIHVpbnQ2NF90PiwgUmVmUHRyPFN0b3JhZ2VBcmVhPiA+IG1f c3RvcmFnZUFyZWFzQnlDb25uZWN0aW9uOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg==