58805 2011-04-18 12:02:17 -0700 If deleting the StorageTracker.db file fails, local storage is left in a strange state 2011-04-18 16:35:51 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 jberlin jberlin adauria ap beidson jberlin jorlow oldest_to_newest 387909 0 jberlin 2011-04-18 12:02:17 -0700 There are no .localstorage files left, but the StorageTracker.db thinks that there are still websites with local storage. <rdar://problem/9204492> 387997 1 90083 jberlin 2011-04-18 13:33:18 -0700 Created attachment 90083 Patch 388163 2 90083 jberlin 2011-04-18 16:35:44 -0700 Comment on attachment 90083 Patch Commited in http://trac.webkit.org/changeset/84208 90083 2011-04-18 13:33:18 -0700 2011-04-18 16:35:44 -0700 Patch fixLocalStorageStickingAround.patch text/plain 4033 jberlin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg0MTYzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDQtMTggIEplc3NpZSBC ZXJsaW4gIDxqYmVybGluQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBJZiBkZWxldGluZyB0aGUgU3RvcmFnZVRyYWNrZXIuZGIgZmls ZSBmYWlscywgbG9jYWwgc3RvcmFnZSBpcyBsZWZ0IGluIGEgc3RyYW5nZSBzdGF0ZS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU4ODA1CisKKyAgICAg ICAgKiBzdG9yYWdlL1N0b3JhZ2VUcmFja2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0b3Jh Z2VUcmFja2VyOjpzeW5jRmlsZVN5c3RlbUFuZFRyYWNrZXJEYXRhYmFzZSk6CisgICAgICAgIFdo ZW4gY2xlYW5pbmcgdXAgdGhlIFN0b3JhZ2VUcmFja2VyLmRiIGZpbGUsIGlzIG5vdCBlbm91Z2gg dG8gY2FsbCBzeW5jRGVsZXRlT3JpZ2luLgorICAgICAgICBkZWxldGVPcmlnaW4gaXRzZWxmIG11 c3QgYmUgY2FsbGVkIHRvIHVwZGF0ZSB0aGUgZGF0YSBzdHJ1Y3R1cmVzIHRoYXQgc3luY0RlbGV0 ZU9yaWdpbgorICAgICAgICBkZXBlbmRzIG9uIGFuZCB0byBwcmV2ZW50IGNsYXNoZXMgYmV0d2Vl biBhIHRoZW9yZXRpY2FsIHdlYiBwYWdlIGVkaXRpbmcgbG9jYWwgc3RvcmFnZQorICAgICAgICBh dCB0aGUgc2FtZSB0aW1lIHRoaXMgbWV0aG9kIGlzIGNhbGxlZC4KKyAgICAgICAgKFdlYkNvcmU6 OlN0b3JhZ2VUcmFja2VyOjpzeW5jRGVsZXRlQWxsT3JpZ2lucyk6CisgICAgICAgIElmIGl0IGlz IG5vdCBwb3NzaWJsZSB0byBkZWxldGUgdGhlIFN0b3JhZ2VUcmFja2VyLmRiIGZpbGUsIGVtcHR5 IGl0LgorICAgICAgICAoV2ViQ29yZTo6U3RvcmFnZVRyYWNrZXI6OmRlbGV0ZU9yaWdpbk9uTWFp blRocmVhZCk6CisgICAgICAgIFdyYXBwZXIgZm9yIGRlbGV0ZU9yaWdpbi4KKyAgICAgICAgKiBz dG9yYWdlL1N0b3JhZ2VUcmFja2VyLmg6CisKIDIwMTEtMDQtMTUgIFN0ZXBoZW4gV2hpdGUgIDxz ZW5vcmJsYW5jb0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBS dXNzZWxsLgpJbmRleDogU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlVHJhY2tlci5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlVHJhY2tlci5jcHAJ KHJldmlzaW9uIDg0MTQ1KQorKysgU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlVHJhY2tl ci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIzMiw4ICsyMzIsMTAgQEAgdm9pZCBTdG9yYWdlVHJh Y2tlcjo6c3luY0ZpbGVTeXN0ZW1BbmRUcgogICAgIC8vIERlbGV0ZSBzdGFsZSBTdG9yYWdlVHJh Y2tlciByZWNvcmRzLgogICAgIE9yaWdpblNldDo6Y29uc3RfaXRlcmF0b3Igc2V0RW5kID0gb3Jp Z2luU2V0Q29weS5lbmQoKTsKICAgICBmb3IgKE9yaWdpblNldDo6Y29uc3RfaXRlcmF0b3IgaXQg PSBvcmlnaW5TZXRDb3B5LmJlZ2luKCk7IGl0ICE9IHNldEVuZDsgKytpdCkgewotICAgICAgICBp ZiAoIWZvdW5kT3JpZ2lucy5jb250YWlucygqaXQpKQotICAgICAgICAgICAgc3luY0RlbGV0ZU9y aWdpbigqaXQpOworICAgICAgICBpZiAoIWZvdW5kT3JpZ2lucy5jb250YWlucygqaXQpKSB7Cisg ICAgICAgICAgICBSZWZQdHI8U3RyaW5nSW1wbD4gb3JpZ2luSWRlbnRpZmllciA9ICgqaXQpLnRo cmVhZHNhZmVDb3B5KCkuaW1wbCgpOworICAgICAgICAgICAgY2FsbE9uTWFpblRocmVhZChkZWxl dGVPcmlnaW5Pbk1haW5UaHJlYWQsIG9yaWdpbklkZW50aWZpZXIucmVsZWFzZSgpLmxlYWtSZWYo KSk7CisgICAgICAgIH0KICAgICB9CiB9CiAKQEAgLTM3NiwxMCArMzc4LDMzIEBAIHZvaWQgU3Rv cmFnZVRyYWNrZXI6OnN5bmNEZWxldGVBbGxPcmlnaW4KICAgICBpZiAobV9kYXRhYmFzZS5pc09w ZW4oKSkKICAgICAgICAgbV9kYXRhYmFzZS5jbG9zZSgpOwogICAgIAotICAgIFNRTGl0ZUZpbGVT eXN0ZW06OmRlbGV0ZURhdGFiYXNlRmlsZSh0cmFja2VyRGF0YWJhc2VQYXRoKCkpOworICAgIGlm ICghU1FMaXRlRmlsZVN5c3RlbTo6ZGVsZXRlRGF0YWJhc2VGaWxlKHRyYWNrZXJEYXRhYmFzZVBh dGgoKSkpIHsKKyAgICAgICAgLy8gSW4gdGhlIGNhc2Ugd2hlcmUgaXQgaXMgbm90IHBvc3NpYmxl IHRvIGRlbGV0ZSB0aGUgZGF0YWJhc2UgZmlsZSAoZS5nIHNvbWUgb3RoZXIgcHJvZ3JhbQorICAg ICAgICAvLyBsaWtlIGEgdmlydXMgc2Nhbm5lciBpcyBhY2Nlc3NpbmcgaXQpLCBtYWtlIHN1cmUg dG8gcmVtb3ZlIGFsbCBlbnRyaWVzLgorICAgICAgICBvcGVuVHJhY2tlckRhdGFiYXNlKGZhbHNl KTsKKyAgICAgICAgaWYgKCFtX2RhdGFiYXNlLmlzT3BlbigpKQorICAgICAgICAgICAgcmV0dXJu OworICAgICAgICBTUUxpdGVTdGF0ZW1lbnQgZGVsZXRlU3RhdGVtZW50KG1fZGF0YWJhc2UsICJE RUxFVEUgRlJPTSBPcmlnaW5zIik7CisgICAgICAgIGlmIChkZWxldGVTdGF0ZW1lbnQucHJlcGFy ZSgpICE9IFNRTFJlc3VsdE9rKSB7CisgICAgICAgICAgICBMT0dfRVJST1IoIlVuYWJsZSB0byBw cmVwYXJlIGRlbGV0aW9uIG9mIGFsbCBvcmlnaW5zIik7CisgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgIH0KKyAgICAgICAgaWYgKCFkZWxldGVTdGF0ZW1lbnQuZXhlY3V0ZUNvbW1hbmQoKSkg eworICAgICAgICAgICAgTE9HX0VSUk9SKCJVbmFibGUgdG8gZXhlY3V0ZSBkZWxldGlvbiBvZiBh bGwgb3JpZ2lucyIpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgfQogICAg IFNRTGl0ZUZpbGVTeXN0ZW06OmRlbGV0ZUVtcHR5RGF0YWJhc2VEaXJlY3RvcnkobV9zdG9yYWdl RGlyZWN0b3J5UGF0aCk7CiB9CiAKK3ZvaWQgU3RvcmFnZVRyYWNrZXI6OmRlbGV0ZU9yaWdpbk9u TWFpblRocmVhZCh2b2lkKiBvcmlnaW5JZGVudGlmaWVyKQoreworICAgIEFTU0VSVChpc01haW5U aHJlYWQoKSk7CisKKyAgICBTdHJpbmcgaWRlbnRpZmllciA9IGFkb3B0UmVmKHJlaW50ZXJwcmV0 X2Nhc3Q8U3RyaW5nSW1wbCo+KG9yaWdpbklkZW50aWZpZXIpKTsKKyAgICB0cmFja2VyKCkuZGVs ZXRlT3JpZ2luKGlkZW50aWZpZXIpOworfQorCiB2b2lkIFN0b3JhZ2VUcmFja2VyOjpkZWxldGVP cmlnaW4oY29uc3QgU3RyaW5nJiBvcmlnaW5JZGVudGlmaWVyKQogewogICAgIGRlbGV0ZU9yaWdp bihTZWN1cml0eU9yaWdpbjo6Y3JlYXRlRnJvbURhdGFiYXNlSWRlbnRpZmllcihvcmlnaW5JZGVu dGlmaWVyKS5nZXQoKSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VUcmFj a2VyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlVHJhY2tl ci5oCShyZXZpc2lvbiA4NDE0NSkKKysrIFNvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZVRy YWNrZXIuaAkod29ya2luZyBjb3B5KQpAQCAtODYsNiArODYsNyBAQCBwcml2YXRlOgogICAgIGJv b2wgY2FuRGVsZXRlT3JpZ2luKGNvbnN0IFN0cmluZyYgb3JpZ2luSWRlbnRpZmllcik7CiAgICAg dm9pZCB3aWxsRGVsZXRlT3JpZ2luKGNvbnN0IFN0cmluZyYgb3JpZ2luSWRlbnRpZmllcik7CiAg ICAgdm9pZCB3aWxsRGVsZXRlQWxsT3JpZ2lucygpOworICAgIHN0YXRpYyB2b2lkIGRlbGV0ZU9y aWdpbk9uTWFpblRocmVhZCh2b2lkKiBvcmlnaW5JZGVudGlmaWVyKTsKIAogICAgIHZvaWQgb3Jp Z2luRmlsZVBhdGhzKFZlY3RvcjxTdHJpbmc+JiBwYXRocyk7CiAgICAgCg==