31100 2009-11-03 23:03:33 -0800 Clean up StorageAreaSync 2009-11-05 00:47:17 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jorlow jorlow beidson darin oldest_to_newest 160330 0 jorlow 2009-11-03 23:03:33 -0800 There are a bunch of small problems with StorageAreaSync and StorageAreaImpl's use of it. Clean them up. 160332 1 42453 jorlow 2009-11-03 23:17:58 -0800 Created attachment 42453 Patch 160753 2 jorlow 2009-11-05 00:47:17 -0800 Committed r50555: <http://trac.webkit.org/changeset/50555> 42453 2009-11-03 23:17:58 -0800 2009-11-05 00:12:26 -0800 Patch bug-31100-20091103231757.patch text/plain 7522 jorlow SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDQ5OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzcgQEAKKzIwMDktMTEtMDMgIEplcmVteSBPcmxvdyAgPGpvcmxvd0BjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Q2xlYW4gdXAgU3RvcmFnZUFyZWFTeW5jCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0zMTEwMAorCisgICAgICAgIE1ham9yIGZpeGVzOiBCcmVhayB0aGUg cmVmIGNvdW50IGN5Y2xlIGZvciBTdG9yYWdlQXJlYSBvbiB0aGUgbWFpbgorICAgICAgICB0aHJl YWQsIG5vdCB0aGUgYmFja2dyb3VuZCB0aHJlYWQgc2luY2UgdGhlIGxhdHRlciBpcyBub3Qgc2Fm ZS4KKyAgICAgICAgTGVuZ3RoKCkgbmVlZHMgdG8gYmxvY2sgb24gdGhlIGltcG9ydCBjb21wbGV0 aW5nLgorCisgICAgICAgIFNtYWxsIGZpeGVzOiBzZXRJdGVtIG5lZWRzIHRvIGhhbmRsZSB0aGUg Y29weSBvbiB3cml0ZSBjYXNlIGV2ZW4gaWYgaXQKKyAgICAgICAgaGFzIGFuIGV4Y2VwdGlvbi4g IHNldEl0ZW0gYW5kIHJlbW92ZUl0ZW0gc2hvdWxkIGp1c3QgYmFpbCBmcm9tIHRoZQorICAgICAg ICB0aGUgZnVuY3Rpb24gaWYgdGhlIHZhbHVlIGhhc24ndCBjaGFuZ2VkIHJhdGhlciB0aGFuIHdy YXBwaW5nIHRoZSBlbmQKKyAgICAgICAgaW4gYW4gaWYgYmxvY2suICBDbGVhciBzaG91bGQgb25s eSBzZW5kIGFuIGV2ZW50IGlmIGl0IHdhc24ndCBhbHJlYWR5CisgICAgICAgIGNsZWFyZWQuICBT dG9yYWdlQXJlYVN5bmMgc2hvdWxkIGFzc2VydCB0aGF0IHRoZSBmaW5hbCBzeW5jIHdhcworICAg ICAgICBzY2hlZHVsZWQuCisKKyAgICAgICAgKiBzdG9yYWdlL1N0b3JhZ2VBcmVhSW1wbC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTdG9yYWdlQXJlYUltcGw6Omxlbmd0aCk6CisgICAgICAgICAg Rm9yZ290IHRvIGJsb2NrIG9uIHRoZSBpbXBvcnQuCisgICAgICAgIChXZWJDb3JlOjpTdG9yYWdl QXJlYUltcGw6OmtleSk6CisgICAgICAgIChXZWJDb3JlOjpTdG9yYWdlQXJlYUltcGw6OnNldEl0 ZW0pOgorICAgICAgICAgIEhhbmRsZSB0aGUgY29weSBvbiB3cml0ZSBjYXNlIGV2ZW4gd2hlbiB0 aGVyZSdzIGFuIGV4Y2VwdGlvbi4KKyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2VBcmVhSW1wbDo6 cmVtb3ZlSXRlbSk6CisgICAgICAgIChXZWJDb3JlOjpTdG9yYWdlQXJlYUltcGw6OmNsZWFyKToK KyAgICAgICAgKiBzdG9yYWdlL1N0b3JhZ2VBcmVhU3luYy5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTdG9yYWdlQXJlYVN5bmM6On5TdG9yYWdlQXJlYVN5bmMpOgorICAgICAgICAoV2ViQ29yZTo6 U3RvcmFnZUFyZWFTeW5jOjpzY2hlZHVsZUZpbmFsU3luYyk6CisgICAgICAgIChXZWJDb3JlOjpT dG9yYWdlQXJlYVN5bmM6OnBlcmZvcm1JbXBvcnQpOgorICAgICAgICAoV2ViQ29yZTo6U3RvcmFn ZUFyZWFTeW5jOjptYXJrSW1wb3J0ZWQpOgorICAgICAgICAoV2ViQ29yZTo6U3RvcmFnZUFyZWFT eW5jOjpibG9ja1VudGlsSW1wb3J0Q29tcGxldGUpOgorICAgICAgICAqIHN0b3JhZ2UvU3RvcmFn ZUFyZWFTeW5jLmg6CisKIDIwMDktMTEtMDMgIFNpbW9uIEhhdXNtYW5uICA8aGF1c21hbm5Ad2Vi a2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeCBmb3IgV2ViSW5zcGVjdG9y IHdpdGggUXQgYnVpbGQuCkluZGV4OiBXZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmNwcAkocmV2 aXNpb24gNTA0OTkpCisrKyBXZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZUFyZWFJbXBsLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTA3LDYgKzEwNyw4IEBAIHN0YXRpYyBib29sIHByaXZhdGVCcm93c2lu Z0VuYWJsZWQoRnJhbWUKIHVuc2lnbmVkIFN0b3JhZ2VBcmVhSW1wbDo6bGVuZ3RoKCkgY29uc3QK IHsKICAgICBBU1NFUlQoIW1faXNTaHV0ZG93bik7CisgICAgYmxvY2tVbnRpbEltcG9ydENvbXBs ZXRlKCk7CisKICAgICByZXR1cm4gbV9zdG9yYWdlTWFwLT5sZW5ndGgoKTsKIH0KIApAQCAtMTE0 LDYgKzExNiw3IEBAIFN0cmluZyBTdG9yYWdlQXJlYUltcGw6OmtleSh1bnNpZ25lZCBpbmQKIHsK ICAgICBBU1NFUlQoIW1faXNTaHV0ZG93bik7CiAgICAgYmxvY2tVbnRpbEltcG9ydENvbXBsZXRl KCk7CisKICAgICByZXR1cm4gbV9zdG9yYWdlTWFwLT5rZXkoaW5kZXgpOwogfQogCkBAIC0xMzks MjEgKzE0MiwyMCBAQCB2b2lkIFN0b3JhZ2VBcmVhSW1wbDo6c2V0SXRlbShjb25zdCBTdHJpCiAg ICAgU3RyaW5nIG9sZFZhbHVlOwogICAgIGJvb2wgcXVvdGFFeGNlcHRpb247CiAgICAgUmVmUHRy PFN0b3JhZ2VNYXA+IG5ld01hcCA9IG1fc3RvcmFnZU1hcC0+c2V0SXRlbShrZXksIHZhbHVlLCBv bGRWYWx1ZSwgcXVvdGFFeGNlcHRpb24pOworICAgIGlmIChuZXdNYXApCisgICAgICAgIG1fc3Rv cmFnZU1hcCA9IG5ld01hcC5yZWxlYXNlKCk7CiAKICAgICBpZiAocXVvdGFFeGNlcHRpb24pIHsK ICAgICAgICAgZWMgPSBRVU9UQV9FWENFRURFRF9FUlI7CiAgICAgICAgIHJldHVybjsKICAgICB9 CiAKLSAgICBpZiAobmV3TWFwKQotICAgICAgICBtX3N0b3JhZ2VNYXAgPSBuZXdNYXAucmVsZWFz ZSgpOworICAgIGlmIChvbGRWYWx1ZSA9PSB2YWx1ZSkKKyAgICAgICAgcmV0dXJuOwogCi0gICAg Ly8gT25seSBub3RpZnkgdGhlIGNsaWVudCBpZiBhbiBpdGVtIHdhcyBhY3R1YWxseSBjaGFuZ2Vk Ci0gICAgaWYgKG9sZFZhbHVlICE9IHZhbHVlKSB7Ci0gICAgICAgIGlmIChtX3N0b3JhZ2VBcmVh U3luYykKLSAgICAgICAgICAgIG1fc3RvcmFnZUFyZWFTeW5jLT5zY2hlZHVsZUl0ZW1Gb3JTeW5j KGtleSwgdmFsdWUpOwotICAgICAgICBTdG9yYWdlRXZlbnREaXNwYXRjaGVyOjpkaXNwYXRjaChr ZXksIG9sZFZhbHVlLCB2YWx1ZSwgbV9zdG9yYWdlVHlwZSwgbV9zZWN1cml0eU9yaWdpbi5nZXQo KSwgZnJhbWUpOwotICAgIH0KKyAgICBpZiAobV9zdG9yYWdlQXJlYVN5bmMpCisgICAgICAgIG1f c3RvcmFnZUFyZWFTeW5jLT5zY2hlZHVsZUl0ZW1Gb3JTeW5jKGtleSwgdmFsdWUpOworICAgIFN0 b3JhZ2VFdmVudERpc3BhdGNoZXI6OmRpc3BhdGNoKGtleSwgb2xkVmFsdWUsIHZhbHVlLCBtX3N0 b3JhZ2VUeXBlLCBtX3NlY3VyaXR5T3JpZ2luLmdldCgpLCBmcmFtZSk7CiB9CiAKIHZvaWQgU3Rv cmFnZUFyZWFJbXBsOjpyZW1vdmVJdGVtKGNvbnN0IFN0cmluZyYga2V5LCBGcmFtZSogZnJhbWUp CkBAIC0xNjksMTIgKzE3MSwxMiBAQCB2b2lkIFN0b3JhZ2VBcmVhSW1wbDo6cmVtb3ZlSXRlbShj b25zdCBTCiAgICAgaWYgKG5ld01hcCkKICAgICAgICAgbV9zdG9yYWdlTWFwID0gbmV3TWFwLnJl bGVhc2UoKTsKIAotICAgIC8vIE9ubHkgbm90aWZ5IHRoZSBjbGllbnQgaWYgYW4gaXRlbSB3YXMg YWN0dWFsbHkgcmVtb3ZlZAotICAgIGlmICghb2xkVmFsdWUuaXNOdWxsKCkpIHsKLSAgICAgICAg aWYgKG1fc3RvcmFnZUFyZWFTeW5jKQotICAgICAgICAgICAgbV9zdG9yYWdlQXJlYVN5bmMtPnNj aGVkdWxlSXRlbUZvclN5bmMoa2V5LCBTdHJpbmcoKSk7Ci0gICAgICAgIFN0b3JhZ2VFdmVudERp c3BhdGNoZXI6OmRpc3BhdGNoKGtleSwgb2xkVmFsdWUsIFN0cmluZygpLCBtX3N0b3JhZ2VUeXBl LCBtX3NlY3VyaXR5T3JpZ2luLmdldCgpLCBmcmFtZSk7Ci0gICAgfQorICAgIGlmIChvbGRWYWx1 ZS5pc051bGwoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKG1fc3RvcmFnZUFyZWFTeW5j KQorICAgICAgICBtX3N0b3JhZ2VBcmVhU3luYy0+c2NoZWR1bGVJdGVtRm9yU3luYyhrZXksIFN0 cmluZygpKTsKKyAgICBTdG9yYWdlRXZlbnREaXNwYXRjaGVyOjpkaXNwYXRjaChrZXksIG9sZFZh bHVlLCBTdHJpbmcoKSwgbV9zdG9yYWdlVHlwZSwgbV9zZWN1cml0eU9yaWdpbi5nZXQoKSwgZnJh bWUpOwogfQogCiB2b2lkIFN0b3JhZ2VBcmVhSW1wbDo6Y2xlYXIoRnJhbWUqIGZyYW1lKQpAQCAt MTg1LDYgKzE4Nyw5IEBAIHZvaWQgU3RvcmFnZUFyZWFJbXBsOjpjbGVhcihGcmFtZSogZnJhbWUK ICAgICBpZiAocHJpdmF0ZUJyb3dzaW5nRW5hYmxlZChmcmFtZSkpCiAgICAgICAgIHJldHVybjsK IAorICAgIGlmICghbV9zdG9yYWdlTWFwLT5sZW5ndGgoKSkKKyAgICAgICAgcmV0dXJuOworCiAg ICAgdW5zaWduZWQgcXVvdGEgPSBtX3N0b3JhZ2VNYXAtPnF1b3RhKCk7CiAgICAgbV9zdG9yYWdl TWFwID0gU3RvcmFnZU1hcDo6Y3JlYXRlKHF1b3RhKTsKIApJbmRleDogV2ViQ29yZS9zdG9yYWdl L1N0b3JhZ2VBcmVhU3luYy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9zdG9yYWdlL1N0b3Jh Z2VBcmVhU3luYy5jcHAJKHJldmlzaW9uIDUwNDk5KQorKysgV2ViQ29yZS9zdG9yYWdlL1N0b3Jh Z2VBcmVhU3luYy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcxLDYgKzcxLDcgQEAgU3RvcmFnZUFy ZWFTeW5jOjp+U3RvcmFnZUFyZWFTeW5jKCkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkp OwogICAgIEFTU0VSVCghbV9zeW5jVGltZXIuaXNBY3RpdmUoKSk7CisgICAgQVNTRVJUKG1fZmlu YWxTeW5jU2NoZWR1bGVkKTsKIH0KIAogdm9pZCBTdG9yYWdlQXJlYVN5bmM6OnNjaGVkdWxlRmlu YWxTeW5jKCkKQEAgLTc4LDYgKzc5LDcgQEAgdm9pZCBTdG9yYWdlQXJlYVN5bmM6OnNjaGVkdWxl RmluYWxTeW5jKAogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAgICAgLy8gRklYTUU6IFdl IGRvIHRoaXMgdG8gYXZvaWQgcmFjZXMsIGJ1dCBpdCdkIGJlIGJldHRlciB0byBtYWtlIHRoaW5n cyBzYWZlIHdpdGhvdXQgYmxvY2tpbmcuCiAgICAgYmxvY2tVbnRpbEltcG9ydENvbXBsZXRlKCk7 CisgICAgbV9zdG9yYWdlQXJlYSA9IDA7ICAvLyBUaGlzIGlzIGRvbmUgaW4gYmxvY2tVbnRpbElt cG9ydENvbXBsZXRlKCkgYnV0IHRoaXMgaXMgaGVyZSBhcyBhIGZvcm0gb2YgZG9jdW1lbnRhdGlv biB0aGF0IHdlIG11c3QgYmUgYWJzb2x1dGVseSBzdXJlIHRoZSByZWYgY291bnQgY3ljbGUgaXMg YnJva2VuLgogCiAgICAgaWYgKG1fc3luY1RpbWVyLmlzQWN0aXZlKCkpCiAgICAgICAgIG1fc3lu Y1RpbWVyLnN0b3AoKTsKQEAgLTIwNiwyNyArMjA4LDE4IEBAIHZvaWQgU3RvcmFnZUFyZWFTeW5j OjpwZXJmb3JtSW1wb3J0KCkKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIE11dGV4TG9j a2VyIGxvY2tlcihtX2ltcG9ydExvY2spOwotCiAgICAgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz46 Oml0ZXJhdG9yIGl0ID0gaXRlbU1hcC5iZWdpbigpOwogICAgIEhhc2hNYXA8U3RyaW5nLCBTdHJp bmc+OjppdGVyYXRvciBlbmQgPSBpdGVtTWFwLmVuZCgpOwogCiAgICAgZm9yICg7IGl0ICE9IGVu ZDsgKytpdCkKICAgICAgICAgbV9zdG9yYWdlQXJlYS0+aW1wb3J0SXRlbShpdC0+Zmlyc3QsIGl0 LT5zZWNvbmQpOwogCi0gICAgLy8gQnJlYWsgdGhlIChyZWYgY291bnQpIGN5Y2xlLgotICAgIG1f c3RvcmFnZUFyZWEgPSAwOwotICAgIG1faW1wb3J0Q29tcGxldGUgPSB0cnVlOwotICAgIG1faW1w b3J0Q29uZGl0aW9uLnNpZ25hbCgpOworICAgIG1hcmtJbXBvcnRlZCgpOwogfQogCiB2b2lkIFN0 b3JhZ2VBcmVhU3luYzo6bWFya0ltcG9ydGVkKCkKIHsKLSAgICBBU1NFUlQoIWlzTWFpblRocmVh ZCgpKTsKLQogICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX2ltcG9ydExvY2spOwotICAgIC8vIEJy ZWFrIHRoZSAocmVmIGNvdW50KSBjeWNsZS4KLSAgICBtX3N0b3JhZ2VBcmVhID0gMDsKICAgICBt X2ltcG9ydENvbXBsZXRlID0gdHJ1ZTsKICAgICBtX2ltcG9ydENvbmRpdGlvbi5zaWduYWwoKTsK IH0KQEAgLTIzOCwxOSArMjMxLDE4IEBAIHZvaWQgU3RvcmFnZUFyZWFTeW5jOjptYXJrSW1wb3J0 ZWQoKQogLy8gaXRlbSBjdXJyZW50bHkgaW4gdGhlIG1hcC4gR2V0L3JlbW92ZSBjYW4gd29yayB3 aGV0aGVyIG9yIG5vdCBpdCdzIGluIHRoZSBtYXAsIGJ1dCB3ZSdsbCBuZWVkIGEgbGlzdAogLy8g b2YgaXRlbXMgdGhlIGltcG9ydCBzaG91bGQgbm90IG92ZXJ3cml0ZS4gQ2xlYXIgY2FuIGFsc28g d29yaywgYnV0IGl0J2xsIG5lZWQgdG8ga2lsbCB0aGUgaW1wb3J0CiAvLyBqb2IgZmlyc3QuCi12 b2lkIFN0b3JhZ2VBcmVhU3luYzo6YmxvY2tVbnRpbEltcG9ydENvbXBsZXRlKCkgY29uc3QKK3Zv aWQgU3RvcmFnZUFyZWFTeW5jOjpibG9ja1VudGlsSW1wb3J0Q29tcGxldGUoKQogewogICAgIEFT U0VSVChpc01haW5UaHJlYWQoKSk7CiAKLSAgICAvLyBGYXN0IHBhdGggdG8gYXZvaWQgbG9ja2lu Zy4KLSAgICBpZiAobV9pbXBvcnRDb21wbGV0ZSkKKyAgICAvLyBGYXN0IHBhdGguICBXZSBzZXQg bV9zdG9yYWdlQXJlYSB0byAwIG9ubHkgYWZ0ZXIgbV9pbXBvcnRDb21wbGV0ZSBiZWluZyB0cnVl LgorICAgIGlmICghbV9zdG9yYWdlQXJlYSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgTXV0ZXhM b2NrZXIgbG9ja2VyKG1faW1wb3J0TG9jayk7CiAgICAgd2hpbGUgKCFtX2ltcG9ydENvbXBsZXRl KQogICAgICAgICBtX2ltcG9ydENvbmRpdGlvbi53YWl0KG1faW1wb3J0TG9jayk7Ci0gICAgQVNT RVJUKG1faW1wb3J0Q29tcGxldGUpOwotICAgIEFTU0VSVCghbV9zdG9yYWdlQXJlYSk7CisgICAg bV9zdG9yYWdlQXJlYSA9IDA7CiB9CiAKIHZvaWQgU3RvcmFnZUFyZWFTeW5jOjpzeW5jKGJvb2wg Y2xlYXJJdGVtcywgY29uc3QgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4mIGl0ZW1zKQpJbmRleDog V2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VBcmVhU3luYy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv c3RvcmFnZS9TdG9yYWdlQXJlYVN5bmMuaAkocmV2aXNpb24gNTA0OTkpCisrKyBXZWJDb3JlL3N0 b3JhZ2UvU3RvcmFnZUFyZWFTeW5jLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDcgKzQ2LDcgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB+U3RvcmFnZUFyZWFTeW5jKCk7CiAKICAgICAg ICAgdm9pZCBzY2hlZHVsZUZpbmFsU3luYygpOwotICAgICAgICB2b2lkIGJsb2NrVW50aWxJbXBv cnRDb21wbGV0ZSgpIGNvbnN0OworICAgICAgICB2b2lkIGJsb2NrVW50aWxJbXBvcnRDb21wbGV0 ZSgpOwogCiAgICAgICAgIHZvaWQgc2NoZWR1bGVJdGVtRm9yU3luYyhjb25zdCBTdHJpbmcmIGtl eSwgY29uc3QgU3RyaW5nJiB2YWx1ZSk7CiAgICAgICAgIHZvaWQgc2NoZWR1bGVDbGVhcigpOw==