49310 2010-11-10 01:31:59 -0800 [Qt][WK2] Fix re-use of memory-mapped files 2010-11-10 02:46:54 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 kling webkit-unassigned kenneth oldest_to_newest 307248 0 kling 2010-11-10 01:31:59 -0800 See patch. 307249 1 73472 kling 2010-11-10 01:32:37 -0800 Created attachment 73472 Proposed patch 307251 2 73472 kenneth 2010-11-10 01:38:47 -0800 Comment on attachment 73472 Proposed patch Consider changing fileName to filePath, I guess that is what it really represents 307252 3 kenneth 2010-11-10 01:39:17 -0800 Maybe we need a few comments in the code to not cause unneeded regressions. 307271 4 73472 kling 2010-11-10 02:46:44 -0800 Comment on attachment 73472 Proposed patch Clearing flags on attachment: 73472 Committed r71729: <http://trac.webkit.org/changeset/71729> 307272 5 kling 2010-11-10 02:46:54 -0800 All reviewed patches have been landed. Closing bug. 73472 2010-11-10 01:32:37 -0800 2010-11-10 02:46:44 -0800 Proposed patch bug-49310.diff text/plain 5528 kling ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg ZTA0Y2JiMC4uOTU1ZjI4OSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvV2Vi S2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMyBAQAorMjAxMC0xMS0xMCAgQW5kcmVhcyBLbGlu ZyAgPGtsaW5nQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgW1F0XVtXSzJdIEZpeCByZS11c2Ugb2YgbWVtb3J5LW1hcHBlZCBmaWxl cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDkzMTAK KworICAgICAgICBRVGVtcG9yYXJ5RmlsZTo6ZmlsZU5hbWUoKSByZXR1cm5zIGFuIGVtcHR5IHN0 cmluZyBhZnRlciBjbG9zZSgpCisgICAgICAgIHNvIHdlIGhhdmUgdG8ga2VlcCBzZXBhcmF0ZSB0 cmFjayBvZiB0aGUgZmlsZW5hbWUuCisKKyAgICAgICAgQWxzbywgd2UgY2FuJ3QgcmVvcGVuIHRo ZSBmaWxlIGlmIGl0J3MgYmVlbiBRRmlsZTo6cmVtb3ZlKClkLAorICAgICAgICBzbyB3ZSBkZWZl ciB1bmxpbmtpbmcgdW50aWwgdGhlIE1hcHBlZE1lbW9yeVBvb2wgaXMgZGVzdHJveWVkIG9yCisg ICAgICAgIHRoZSBDcmFzaEhhbmRsZXIga2lja3MgaW4uCisKKyAgICAgICAgVGhpcyBtYWtlcyBy ZS11c2Ugb2YgbWVtb3J5LW1hcHBlZCBmaWxlcyB3b3JrIChhZnRlciB3ZSBraWxsIGFuCisgICAg ICAgIGFzc2VydGlvbiB0aGF0IHRoZSBmaWxlIHNpemUgPT0gdGhlIG5ldyBtbWFwIHNpemUgLSBp dCdzIGZpbmUgaWYKKyAgICAgICAgdGhlIGZpbGUgaXMgbGFyZ2VyLCB0b28uKQorCisgICAgICAg ICogUGxhdGZvcm0vcXQvTWFwcGVkTWVtb3J5UG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok1h cHBlZE1lbW9yeVBvb2w6On5NYXBwZWRNZW1vcnlQb29sKToKKyAgICAgICAgKFdlYktpdDo6TWFw cGVkTWVtb3J5UG9vbDo6Y2xlYXIpOgorICAgICAgICAoV2ViS2l0OjpNYXBwZWRNZW1vcnlQb29s OjptYXBNZW1vcnkpOgorICAgICAgICAoV2ViS2l0OjpNYXBwZWRNZW1vcnlQb29sOjptYXBGaWxl KToKKyAgICAgICAgKiBQbGF0Zm9ybS9xdC9NYXBwZWRNZW1vcnlQb29sLmg6CisgICAgICAgIChX ZWJLaXQ6Ok1hcHBlZE1lbW9yeTo6bWFwcGVkRmlsZU5hbWUpOgorICAgICAgICAqIFNoYXJlZC9x dC9DcmFzaEhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpDcmFzaEhhbmRsZXI6OmRlbGV0 ZU9iamVjdHMpOgorICAgICAgICAqIFNoYXJlZC9xdC9VcGRhdGVDaHVuay5jcHA6CisgICAgICAg IChXZWJLaXQ6OlVwZGF0ZUNodW5rOjplbmNvZGUpOgorCiAyMDEwLTExLTA5ICBCcmFkeSBFaWRz b24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSB0aGUgZXZlci1w aWNreSBXaW5kb3dzIGJ1aWxkLWJvdC4KZGlmZiAtLWdpdCBhL1dlYktpdDIvUGxhdGZvcm0vcXQv TWFwcGVkTWVtb3J5UG9vbC5jcHAgYi9XZWJLaXQyL1BsYXRmb3JtL3F0L01hcHBlZE1lbW9yeVBv b2wuY3BwCmluZGV4IDY0MTMxMmMuLjFiMGY3MGQgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvUGxhdGZv cm0vcXQvTWFwcGVkTWVtb3J5UG9vbC5jcHAKKysrIGIvV2ViS2l0Mi9QbGF0Zm9ybS9xdC9NYXBw ZWRNZW1vcnlQb29sLmNwcApAQCAtMzQsNiArMzQsMjMgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7 CiAKK01hcHBlZE1lbW9yeVBvb2w6On5NYXBwZWRNZW1vcnlQb29sKCkKK3sKKyAgICBjbGVhcigp OworfQorCit2b2lkIE1hcHBlZE1lbW9yeVBvb2w6OmNsZWFyKCkKK3sKKyAgICBmb3IgKHVuc2ln bmVkIG4gPSAwOyBuIDwgbV9wb29sLnNpemUoKTsgKytuKSB7CisgICAgICAgIE1hcHBlZE1lbW9y eSYgY3VycmVudCA9IG1fcG9vbC5hdChuKTsKKyAgICAgICAgaWYgKCFjdXJyZW50LmZpbGUpCisg ICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgY3VycmVudC5maWxlLT5yZW1vdmUoKTsKKyAg ICAgICAgZGVsZXRlIGN1cnJlbnQuZmlsZTsKKyAgICB9CisgICAgbV9wb29sLmNsZWFyKCk7Cit9 CisKIE1hcHBlZE1lbW9yeSogTWFwcGVkTWVtb3J5UG9vbDo6bWFwTWVtb3J5KHNpemVfdCBzaXpl KQogewogICAgIGZvciAodW5zaWduZWQgbiA9IDA7IG4gPCBtX3Bvb2wuc2l6ZSgpOyArK24pIHsK QEAgLTQ4LDYgKzY1LDcgQEAgTWFwcGVkTWVtb3J5KiBNYXBwZWRNZW1vcnlQb29sOjptYXBNZW1v cnkoc2l6ZV90IHNpemUpCiAgICAgbmV3TWFwLmRhdGFTaXplID0gc2l6ZTsKICAgICBuZXdNYXAu ZmlsZSA9IG5ldyBRVGVtcG9yYXJ5RmlsZShRRGlyOjp0ZW1wUGF0aCgpICsgIi9XZWJLaXQyVXBk YXRlQ2h1bmsiKTsKICAgICBuZXdNYXAuZmlsZS0+b3BlbihRSU9EZXZpY2U6OlJlYWRXcml0ZSk7 CisgICAgbmV3TWFwLmZpbGVOYW1lID0gbmV3TWFwLmZpbGUtPmZpbGVOYW1lKCk7CiAgICAgbmV3 TWFwLmZpbGUtPnJlc2l6ZShuZXdNYXAubWFwU2l6ZSgpKTsKICAgICBuZXdNYXAubWFwcGVkQnl0 ZXMgPSBuZXdNYXAuZmlsZS0+bWFwKDAsIG5ld01hcC5tYXBTaXplKCkpOwogICAgIG5ld01hcC5m aWxlLT5jbG9zZSgpOwpAQCAtNjAsNyArNzgsNyBAQCBNYXBwZWRNZW1vcnkqIE1hcHBlZE1lbW9y eVBvb2w6Om1hcEZpbGUoUVN0cmluZyBmaWxlTmFtZSwgc2l6ZV90IHNpemUpCiB7CiAgICAgZm9y ICh1bnNpZ25lZCBuID0gMDsgbiA8IG1fcG9vbC5zaXplKCk7ICsrbikgewogICAgICAgICBNYXBw ZWRNZW1vcnkmIGN1cnJlbnQgPSBtX3Bvb2wuYXQobik7Ci0gICAgICAgIGlmIChjdXJyZW50LmZp bGUtPmZpbGVOYW1lKCkgPT0gZmlsZU5hbWUpIHsKKyAgICAgICAgaWYgKGN1cnJlbnQuZmlsZU5h bWUgPT0gZmlsZU5hbWUpIHsKICAgICAgICAgICAgIEFTU0VSVCghY3VycmVudC5pc0ZyZWUoKSk7 CiAgICAgICAgICAgICByZXR1cm4gJmN1cnJlbnQ7CiAgICAgICAgIH0KQEAgLTcwLDEzICs4OCwx MiBAQCBNYXBwZWRNZW1vcnkqIE1hcHBlZE1lbW9yeVBvb2w6Om1hcEZpbGUoUVN0cmluZyBmaWxl TmFtZSwgc2l6ZV90IHNpemUpCiAgICAgbmV3TWFwLmZpbGUgPSBuZXcgUUZpbGUoZmlsZU5hbWUp OwogICAgIG5ld01hcC5kYXRhU2l6ZSA9IHNpemU7CiAgICAgQVNTRVJUKG5ld01hcC5maWxlLT5l eGlzdHMoKSk7Ci0gICAgQVNTRVJUKG5ld01hcC5maWxlLT5zaXplKCkgPT0gbmV3TWFwLm1hcFNp emUoKSk7CisgICAgQVNTRVJUKG5ld01hcC5maWxlLT5zaXplKCkgPj0gbmV3TWFwLm1hcFNpemUo KSk7CiAgICAgbmV3TWFwLmZpbGUtPm9wZW4oUUlPRGV2aWNlOjpSZWFkV3JpdGUpOwogICAgIG5l d01hcC5tYXBwZWRCeXRlcyA9IG5ld01hcC5maWxlLT5tYXAoMCwgbmV3TWFwLm1hcFNpemUoKSk7 CiAgICAgQVNTRVJUKG5ld01hcC5tYXBwZWRCeXRlcyk7CiAgICAgQVNTRVJUKCFuZXdNYXAuaXNG cmVlKCkpOwogICAgIG5ld01hcC5maWxlLT5jbG9zZSgpOwotICAgIG5ld01hcC5maWxlLT5yZW1v dmUoKTsgLy8gVGhlIG1hcCBzdGF5cyBhbGl2ZSBldmVuIHdoZW4gdGhlIGZpbGUgaXMgdW5saW5r ZWQuCiAgICAgbV9wb29sLmFwcGVuZChuZXdNYXApOwogICAgIHJldHVybiAmbV9wb29sLmxhc3Qo KTsKIH0KZGlmZiAtLWdpdCBhL1dlYktpdDIvUGxhdGZvcm0vcXQvTWFwcGVkTWVtb3J5UG9vbC5o IGIvV2ViS2l0Mi9QbGF0Zm9ybS9xdC9NYXBwZWRNZW1vcnlQb29sLmgKaW5kZXggNTMwZTdkMC4u NGIzNDEzYiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9QbGF0Zm9ybS9xdC9NYXBwZWRNZW1vcnlQb29s LmgKKysrIGIvV2ViS2l0Mi9QbGF0Zm9ybS9xdC9NYXBwZWRNZW1vcnlQb29sLmgKQEAgLTM4LDkg KzM4LDExIEBAIGNsYXNzIE1hcHBlZE1lbW9yeVBvb2w7CiAKIHN0cnVjdCBNYXBwZWRNZW1vcnkg ewogCi0gICAgUUZpbGUqIG1hcHBlZEZpbGUoKSBjb25zdAorICAgIFFTdHJpbmcgbWFwcGVkRmls ZU5hbWUoKSBjb25zdAogICAgIHsKLSAgICAgICAgcmV0dXJuIGZpbGU7CisgICAgICAgIEFTU0VS VChmaWxlKTsKKyAgICAgICAgQVNTRVJUKG1hcHBlZEJ5dGVzKTsKKyAgICAgICAgcmV0dXJuIGZp bGVOYW1lOwogICAgIH0KIAogICAgIHZvaWQgbWFya0ZyZWUoKQpAQCAtNzYsNiArNzgsNyBAQCBw cml2YXRlOgogICAgIH07CiAKICAgICBRRmlsZSogZmlsZTsKKyAgICBRU3RyaW5nIGZpbGVOYW1l OwogICAgIHVuaW9uIHsKICAgICAgICAgdWNoYXIqIG1hcHBlZEJ5dGVzOwogICAgICAgICBEYXRh KiBkYXRhUHRyOwpAQCAtOTQsOCArOTcsMTEgQEAgcHVibGljOgogICAgIE1hcHBlZE1lbW9yeSog bWFwTWVtb3J5KHNpemVfdCBzaXplKTsKICAgICBNYXBwZWRNZW1vcnkqIG1hcEZpbGUoUVN0cmlu ZyBmaWxlTmFtZSwgc2l6ZV90IHNpemUpOwogCisgICAgdm9pZCBjbGVhcigpOworCiBwcml2YXRl OgogICAgIE1hcHBlZE1lbW9yeVBvb2woKSB7IH07CisgICAgfk1hcHBlZE1lbW9yeVBvb2woKTsK IAogICAgIFZlY3RvcjxNYXBwZWRNZW1vcnk+IG1fcG9vbDsKIH07CmRpZmYgLS1naXQgYS9XZWJL aXQyL1NoYXJlZC9xdC9DcmFzaEhhbmRsZXIuY3BwIGIvV2ViS2l0Mi9TaGFyZWQvcXQvQ3Jhc2hI YW5kbGVyLmNwcAppbmRleCA3OGFjNzEzLi45ZWI3ZDNkIDEwMDY0NAotLS0gYS9XZWJLaXQyL1No YXJlZC9xdC9DcmFzaEhhbmRsZXIuY3BwCisrKyBiL1dlYktpdDIvU2hhcmVkL3F0L0NyYXNoSGFu ZGxlci5jcHAKQEAgLTI1LDYgKzI1LDcgQEAKIAogI2luY2x1ZGUgIkNyYXNoSGFuZGxlci5oIgog CisjaW5jbHVkZSAiTWFwcGVkTWVtb3J5UG9vbC5oIgogI2luY2x1ZGUgPGNzaWduYWw+CiAjaW5j bHVkZSA8Y3N0ZGxpYj4KICNpbmNsdWRlIDx3dGYvQWx3YXlzSW5saW5lLmg+CkBAIC01Niw2ICs1 Nyw4IEBAIHZvaWQgQ3Jhc2hIYW5kbGVyOjpkZWxldGVPYmplY3RzKCkKIHsKICAgICBtX2luRGVs ZXRlT2JqZWN0cyA9IHRydWU7CiAgICAgcURlbGV0ZUFsbChtX29iamVjdHMpOworCisgICAgTWFw cGVkTWVtb3J5UG9vbDo6aW5zdGFuY2UoKS0+Y2xlYXIoKTsKIH0KIAogfSAvLyBuYW1lc3BhY2Ug V2ViS2l0CmRpZmYgLS1naXQgYS9XZWJLaXQyL1NoYXJlZC9xdC9VcGRhdGVDaHVuay5jcHAgYi9X ZWJLaXQyL1NoYXJlZC9xdC9VcGRhdGVDaHVuay5jcHAKaW5kZXggNjBlNTY0My4uNzcwYzA2OSAx MDA2NDQKLS0tIGEvV2ViS2l0Mi9TaGFyZWQvcXQvVXBkYXRlQ2h1bmsuY3BwCisrKyBiL1dlYktp dDIvU2hhcmVkL3F0L1VwZGF0ZUNodW5rLmNwcApAQCAtNjIsNyArNjIsNyBAQCBVcGRhdGVDaHVu azo6flVwZGF0ZUNodW5rKCkKIHZvaWQgVXBkYXRlQ2h1bms6OmVuY29kZShDb3JlSVBDOjpBcmd1 bWVudEVuY29kZXIqIGVuY29kZXIpIGNvbnN0CiB7CiAgICAgZW5jb2Rlci0+ZW5jb2RlKG1fcmVj dCk7Ci0gICAgZW5jb2Rlci0+ZW5jb2RlKFN0cmluZyhtX21hcHBlZE1lbW9yeS0+bWFwcGVkRmls ZSgpLT5maWxlTmFtZSgpKSk7CisgICAgZW5jb2Rlci0+ZW5jb2RlKFN0cmluZyhtX21hcHBlZE1l bW9yeS0+bWFwcGVkRmlsZU5hbWUoKSkpOwogCiAgICAgbV9tYXBwZWRNZW1vcnkgPSAwOwogfQo=