31188 2009-11-05 14:51:52 -0800 REGRESSION Clean up security origin usage in DOM Storage. 2009-11-05 15:26:15 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jorlow jorlow oldest_to_newest 160960 0 jorlow 2009-11-05 14:51:52 -0800 Clean up security origin usage in DOM Storage. This fixes a bug in my refactoring here: https://bugs.webkit.org/show_bug.cgi?id=31149 Instead of having StorageAreaSync's constructor (which is called in the constructor for StorageAreaImpl) calling a method on StoargeAreaImpl to get the database identifier, simply have StorageAreaImpl pass the identifier into StorageAreaSync. 160962 1 42599 jorlow 2009-11-05 14:55:39 -0800 Created attachment 42599 Patch 160964 2 42599 dglazkov 2009-11-05 14:58:00 -0800 Comment on attachment 42599 Patch r=me. 160986 3 jorlow 2009-11-05 15:26:15 -0800 Committed r50581: <http://trac.webkit.org/changeset/50581> 42599 2009-11-05 14:55:39 -0800 2009-11-05 14:58:00 -0800 Patch bug-31188-20091105145537.patch text/plain 5889 jorlow PyAgICAgIHN2bi1jb21taXQudG1wCkluZGV4OiBXZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gNTA1NzkpCisrKyBXZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDA5LTExLTA1ICBKZXJlbXkg T3Jsb3cgIDxqb3Jsb3dAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFJFR1JFU1NJT04gQ2xlYW4gdXAgc2VjdXJpdHkgb3JpZ2lu IHVzYWdlIGluIERPTSBTdG9yYWdlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzExODgKKworICAgICAgICBDbGVhbiB1cCBzZWN1cml0eSBvcmlnaW4g dXNhZ2UgaW4gRE9NIFN0b3JhZ2UuICBUaGlzIGZpeGVzIGEgYnVnIGluIG15CisgICAgICAgIHJl ZmFjdG9yaW5nIGhlcmU6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z MTE0OQorCisgICAgICAgIEluc3RlYWQgb2YgaGF2aW5nIFN0b3JhZ2VBcmVhU3luYydzIGNvbnN0 cnVjdG9yICh3aGljaCBpcyBjYWxsZWQgaW4gdGhlCisgICAgICAgIGNvbnN0cnVjdG9yIGZvciBT dG9yYWdlQXJlYUltcGwpIGNhbGxpbmcgYSBtZXRob2Qgb24gU3RvYXJnZUFyZWFJbXBsIHRvIGdl dCB0aGUKKyAgICAgICAgZGF0YWJhc2UgaWRlbnRpZmllciwgc2ltcGx5IGhhdmUgU3RvcmFnZUFy ZWFJbXBsIHBhc3MgdGhlIGlkZW50aWZpZXIgaW50bworICAgICAgICBTdG9yYWdlQXJlYVN5bmMu CisKKyAgICAgICAgTm8gdGVzdCBiZWNhdXNlIHRoZXJlJ3Mgbm8gY2hhbmdlIGluIGV4dGVybmFs bHkgb2JzZXJ2YWJsZSBiZWhhdmlvci4KKworICAgICAgICAqIHN0b3JhZ2UvU3RvcmFnZUFyZWFJ bXBsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2VBcmVhSW1wbDo6U3RvcmFnZUFyZWFJ bXBsKToKKyAgICAgICAgKiBzdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5oOgorICAgICAgICAqIHN0 b3JhZ2UvU3RvcmFnZUFyZWFTeW5jLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2VBcmVh U3luYzo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2VBcmVhU3luYzo6U3RvcmFn ZUFyZWFTeW5jKToKKyAgICAgICAgKiBzdG9yYWdlL1N0b3JhZ2VBcmVhU3luYy5oOgorCiAyMDA5 LTExLTA1ICBLZW5uZXRoIFJ1c3NlbGwgIDxrYnJAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCkluZGV4OiBXZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZUFy ZWFJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBs LmNwcAkocmV2aXNpb24gNTA1NjEpCisrKyBXZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBs LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjUsNyArNjUsNyBAQCBTdG9yYWdlQXJlYUltcGw6OlN0 b3JhZ2VBcmVhSW1wbChTdG9yYWdlCiAgICAgLy8gRklYTUU6IElmIHRoZXJlJ3Mgbm8gYmFja2lu ZyBzdG9yYWdlIGZvciBMb2NhbFN0b3JhZ2UsIHRoZSBkZWZhdWx0IFdlYktpdCBiZWhhdmlvciBz aG91bGQgYmUgdGhhdCBvZiBwcml2YXRlIGJyb3dzaW5nLAogICAgIC8vIG5vdCBzaWxlbnRseSBp Z25vcmluZyBpdC4gIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTg5 NAogICAgIGlmIChtX3N0b3JhZ2VTeW5jTWFuYWdlcikgewotICAgICAgICBtX3N0b3JhZ2VBcmVh U3luYyA9IFN0b3JhZ2VBcmVhU3luYzo6Y3JlYXRlKG1fc3RvcmFnZVN5bmNNYW5hZ2VyLCB0aGlz KTsKKyAgICAgICAgbV9zdG9yYWdlQXJlYVN5bmMgPSBTdG9yYWdlQXJlYVN5bmM6OmNyZWF0ZSht X3N0b3JhZ2VTeW5jTWFuYWdlciwgdGhpcywgbV9zZWN1cml0eU9yaWdpbi0+ZGF0YWJhc2VJZGVu dGlmaWVyKCkpOwogICAgICAgICBBU1NFUlQobV9zdG9yYWdlQXJlYVN5bmMpOwogICAgIH0KIH0K QEAgLTIxMiwxMSArMjEyLDYgQEAgdm9pZCBTdG9yYWdlQXJlYUltcGw6OmltcG9ydEl0ZW0oY29u c3QgUwogICAgIG1fc3RvcmFnZU1hcC0+aW1wb3J0SXRlbShrZXksIHZhbHVlKTsKIH0KIAotU2Vj dXJpdHlPcmlnaW4qIFN0b3JhZ2VBcmVhSW1wbDo6c2VjdXJpdHlPcmlnaW4oKQotewotICAgIHJl dHVybiBtX3NlY3VyaXR5T3JpZ2luLmdldCgpOwotfQotCiB2b2lkIFN0b3JhZ2VBcmVhSW1wbDo6 Y2xvc2UoKQogewogICAgIGlmIChtX3N0b3JhZ2VBcmVhU3luYykKSW5kZXg6IFdlYkNvcmUvc3Rv cmFnZS9TdG9yYWdlQXJlYUltcGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3N0b3JhZ2UvU3Rv cmFnZUFyZWFJbXBsLmgJKHJldmlzaW9uIDUwNTYxKQorKysgV2ViQ29yZS9zdG9yYWdlL1N0b3Jh Z2VBcmVhSW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC01Niw5ICs1Niw4IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICAgICAgUGFzc1JlZlB0cjxTdG9yYWdlQXJlYUltcGw+IGNvcHkoKTsKICAg ICAgICAgdm9pZCBjbG9zZSgpOwogCi0gICAgICAgIC8vIENvdWxkIGJlIGNhbGxlZCBmcm9tIGEg YmFja2dyb3VuZCB0aHJlYWQuCisgICAgICAgIC8vIE9ubHkgY2FsbGVkIGZyb20gYSBiYWNrZ3Jv dW5kIHRocmVhZC4KICAgICAgICAgdm9pZCBpbXBvcnRJdGVtKGNvbnN0IFN0cmluZyYga2V5LCBj b25zdCBTdHJpbmcmIHZhbHVlKTsKLSAgICAgICAgU2VjdXJpdHlPcmlnaW4qIHNlY3VyaXR5T3Jp Z2luKCk7CiAKICAgICBwcml2YXRlOgogICAgICAgICBTdG9yYWdlQXJlYUltcGwoU3RvcmFnZVR5 cGUsIFBhc3NSZWZQdHI8U2VjdXJpdHlPcmlnaW4+LCBQYXNzUmVmUHRyPFN0b3JhZ2VTeW5jTWFu YWdlcj4sIHVuc2lnbmVkIHF1b3RhKTsKSW5kZXg6IFdlYkNvcmUvc3RvcmFnZS9TdG9yYWdlQXJl YVN5bmMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvc3RvcmFnZS9TdG9yYWdlQXJlYVN5bmMu Y3BwCShyZXZpc2lvbiA1MDU2MSkKKysrIFdlYkNvcmUvc3RvcmFnZS9TdG9yYWdlQXJlYVN5bmMu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MywxOCArNDMsMTggQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogLy8gSW5zdGVhZCwgcXVldWUgdXAgYSBiYXRjaCBvZiBpdGVtcyB0byBzeW5jIGFuZCBhY3R1 YWxseSBkbyB0aGUgc3luYyBhdCB0aGUgZm9sbG93aW5nIGludGVydmFsLgogc3RhdGljIGNvbnN0 IGRvdWJsZSBTdG9yYWdlU3luY0ludGVydmFsID0gMS4wOwogCi1QYXNzUmVmUHRyPFN0b3JhZ2VB cmVhU3luYz4gU3RvcmFnZUFyZWFTeW5jOjpjcmVhdGUoUGFzc1JlZlB0cjxTdG9yYWdlU3luY01h bmFnZXI+IHN0b3JhZ2VTeW5jTWFuYWdlciwgUGFzc1JlZlB0cjxTdG9yYWdlQXJlYUltcGw+IHN0 b3JhZ2VBcmVhKQorUGFzc1JlZlB0cjxTdG9yYWdlQXJlYVN5bmM+IFN0b3JhZ2VBcmVhU3luYzo6 Y3JlYXRlKFBhc3NSZWZQdHI8U3RvcmFnZVN5bmNNYW5hZ2VyPiBzdG9yYWdlU3luY01hbmFnZXIs IFBhc3NSZWZQdHI8U3RvcmFnZUFyZWFJbXBsPiBzdG9yYWdlQXJlYSwgU3RyaW5nIGRhdGFiYXNl SWRlbnRpZmllcikKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IFN0b3JhZ2VBcmVhU3luYyhz dG9yYWdlU3luY01hbmFnZXIsIHN0b3JhZ2VBcmVhKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5l dyBTdG9yYWdlQXJlYVN5bmMoc3RvcmFnZVN5bmNNYW5hZ2VyLCBzdG9yYWdlQXJlYSwgZGF0YWJh c2VJZGVudGlmaWVyKSk7CiB9CiAKLVN0b3JhZ2VBcmVhU3luYzo6U3RvcmFnZUFyZWFTeW5jKFBh c3NSZWZQdHI8U3RvcmFnZVN5bmNNYW5hZ2VyPiBzdG9yYWdlU3luY01hbmFnZXIsIFBhc3NSZWZQ dHI8U3RvcmFnZUFyZWFJbXBsPiBzdG9yYWdlQXJlYSkKK1N0b3JhZ2VBcmVhU3luYzo6U3RvcmFn ZUFyZWFTeW5jKFBhc3NSZWZQdHI8U3RvcmFnZVN5bmNNYW5hZ2VyPiBzdG9yYWdlU3luY01hbmFn ZXIsIFBhc3NSZWZQdHI8U3RvcmFnZUFyZWFJbXBsPiBzdG9yYWdlQXJlYSwgU3RyaW5nIGRhdGFi YXNlSWRlbnRpZmllcikKICAgICA6IG1fc3luY1RpbWVyKHRoaXMsICZTdG9yYWdlQXJlYVN5bmM6 OnN5bmNUaW1lckZpcmVkKQogICAgICwgbV9pdGVtc0NsZWFyZWQoZmFsc2UpCiAgICAgLCBtX2Zp bmFsU3luY1NjaGVkdWxlZChmYWxzZSkKICAgICAsIG1fc3RvcmFnZUFyZWEoc3RvcmFnZUFyZWEp CiAgICAgLCBtX3N5bmNNYW5hZ2VyKHN0b3JhZ2VTeW5jTWFuYWdlcikKLSAgICAsIG1fZGF0YWJh c2VJZGVudGlmaWVyKHN0b3JhZ2VBcmVhLT5zZWN1cml0eU9yaWdpbigpLT5kYXRhYmFzZUlkZW50 aWZpZXIoKS5jcm9zc1RocmVhZFN0cmluZygpKQorICAgICwgbV9kYXRhYmFzZUlkZW50aWZpZXIo ZGF0YWJhc2VJZGVudGlmaWVyLmNyb3NzVGhyZWFkU3RyaW5nKCkpCiAgICAgLCBtX2NsZWFySXRl bXNXaGlsZVN5bmNpbmcoZmFsc2UpCiAgICAgLCBtX3N5bmNTY2hlZHVsZWQoZmFsc2UpCiAgICAg LCBtX2ltcG9ydENvbXBsZXRlKGZhbHNlKQpJbmRleDogV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VB cmVhU3luYy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvc3RvcmFnZS9TdG9yYWdlQXJlYVN5bmMu aAkocmV2aXNpb24gNTA1NjEpCisrKyBXZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZUFyZWFTeW5jLmgJ KHdvcmtpbmcgY29weSkKQEAgLTQyLDcgKzQyLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAg ICAgY2xhc3MgU3RvcmFnZUFyZWFTeW5jIDogcHVibGljIFJlZkNvdW50ZWQ8U3RvcmFnZUFyZWFT eW5jPiB7CiAgICAgcHVibGljOgotICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxTdG9yYWdlQXJl YVN5bmM+IGNyZWF0ZShQYXNzUmVmUHRyPFN0b3JhZ2VTeW5jTWFuYWdlcj4gc3RvcmFnZVN5bmNN YW5hZ2VyLCBQYXNzUmVmUHRyPFN0b3JhZ2VBcmVhSW1wbD4gc3RvcmFnZUFyZWEpOworICAgICAg ICBzdGF0aWMgUGFzc1JlZlB0cjxTdG9yYWdlQXJlYVN5bmM+IGNyZWF0ZShQYXNzUmVmUHRyPFN0 b3JhZ2VTeW5jTWFuYWdlcj4gc3RvcmFnZVN5bmNNYW5hZ2VyLCBQYXNzUmVmUHRyPFN0b3JhZ2VB cmVhSW1wbD4gc3RvcmFnZUFyZWEsIFN0cmluZyBkYXRhYmFzZUlkZW50aWZpZXIpOwogICAgICAg ICB+U3RvcmFnZUFyZWFTeW5jKCk7CiAKICAgICAgICAgdm9pZCBzY2hlZHVsZUZpbmFsU3luYygp OwpAQCAtNTIsNyArNTIsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgc2No ZWR1bGVDbGVhcigpOwogCiAgICAgcHJpdmF0ZToKLSAgICAgICAgU3RvcmFnZUFyZWFTeW5jKFBh c3NSZWZQdHI8U3RvcmFnZVN5bmNNYW5hZ2VyPiBzdG9yYWdlU3luY01hbmFnZXIsIFBhc3NSZWZQ dHI8U3RvcmFnZUFyZWFJbXBsPiBzdG9yYWdlQXJlYSk7CisgICAgICAgIFN0b3JhZ2VBcmVhU3lu YyhQYXNzUmVmUHRyPFN0b3JhZ2VTeW5jTWFuYWdlcj4gc3RvcmFnZVN5bmNNYW5hZ2VyLCBQYXNz UmVmUHRyPFN0b3JhZ2VBcmVhSW1wbD4gc3RvcmFnZUFyZWEsIFN0cmluZyBkYXRhYmFzZUlkZW50 aWZpZXIpOwogCiAgICAgICAgIHZvaWQgZGlzcGF0Y2hTdG9yYWdlRXZlbnQoY29uc3QgU3RyaW5n JiBrZXksIGNvbnN0IFN0cmluZyYgb2xkVmFsdWUsIGNvbnN0IFN0cmluZyYgbmV3VmFsdWUsIEZy YW1lKiBzb3VyY2VGcmFtZSk7