116354 2013-05-17 14:40:03 -0700 Only import local storage items from the database once 2013-05-17 14:50:57 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 890677 0 andersca 2013-05-17 14:40:03 -0700 Only import local storage items from the database once 890681 1 202159 andersca 2013-05-17 14:44:31 -0700 Created attachment 202159 Patch 890684 2 andersca 2013-05-17 14:50:57 -0700 Committed r150301: <http://trac.webkit.org/changeset/150301> 202159 2013-05-17 14:44:31 -0700 2013-05-17 14:47:23 -0700 Patch bug-116354-20130517144324.patch text/plain 5967 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwMjk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjlmZTY4OTU0NzBlN2Y0 OTJhMGVkNDg1NGVjZGZiNWNhNTJmOTY0OS4uY2YyYjEzNTVjODE2NjlhY2JlZDg4OTdlM2NkMmVk OGQ0NmIxOGVmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDEzLTA1LTE3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgT25seSBpbXBvcnQg bG9jYWwgc3RvcmFnZSBpdGVtcyBmcm9tIHRoZSBkYXRhYmFzZSBvbmNlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYzNTQKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBpbXBvcnQgaXRlbXMgZnJvbSB0 aGUgZGF0YWJhc2Ugb3ZlciBhbmQgb3Zlciwgd2hlbiB3ZSBvbmx5IHdhbnQgdG8gZG8gaXQgb25j ZS4gVXNlIGEgCisgICAgICAgIGJvb2xlYW4gZmxhZyB0byBndWFyZCBhZ2FpbnN0IGRvaW5nIGl0 IG1vcmUgdGhhbiBvbmNlLiAKKyAgICAgICAgCisgICAgICAgIEFsc28sIHJlbmFtZSBpbXBvcnRJ dGVtc0Zyb21EYXRhYmFzZSB0byBvcGVuRGF0YWJhc2VBbmRJbXBvcnRJdGVtc0lmTmVlZGVkIHNp bmNlIGl0IG5vdworICAgICAgICBhbHNvIG9wZW5zIHRoZSBkYXRhYmFzZSAoZXZlbiBpZiBpdCBk b2Vzbid0IG5lZWQgdG8gaW1wb3J0IGFueXRoaW5nKS4gVGhpcyBpcyBwcmVwYXJhdGlvbiBmb3Ig YW4KKyAgICAgICAgdXBjb21pbmcgcGF0Y2ggd2hlcmUgdGhlIGRhdGFiYXNlIHdpbGwgYmUgY2xv c2VkIHdoZW4gaXQncyBjbGVhcmVkLgorCisgICAgICAgICogVUlQcm9jZXNzL1N0b3JhZ2UvU3Rv cmFnZU1hbmFnZXIuY3BwOgorICAgICAgICAoU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhKToK KyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjpTdG9yYWdlQXJl YSk6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6c2V0SXRl bSk6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6cmVtb3Zl SXRlbSk6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6Y2xl YXIpOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6Oml0ZW1z KToKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjpvcGVuRGF0 YWJhc2VBbmRJbXBvcnRJdGVtc0lmTmVlZGVkKToKKworMjAxMy0wNS0xNyAgQW5kZXJzIENhcmxz c29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIFdLS2V5VmFsdWVTdG9yYWdlTWFu YWdlckdldEtleVZhbHVlU3RvcmFnZU9yaWdpbnMgc2hvdWxkIGdldCBvcmlnaW5zIGZyb20gdGhl IFVJIHByb2Nlc3MKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExNjM0NgogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTM4NTI4Mjk+CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAKaW5kZXgg YmMxMGM1MjNkM2Y3NWRlODgxOGNlMDE1NDVjZTQ4YWEyMjFmOWFiNC4uODYxNmZhODI5YzI3Mzhi MDZhNGYyZDZiNzQ5ZWEzYWE1M2M5YWYzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcApAQCAtNjIsMTMgKzYyLDE0IEBAIHB1 YmxpYzoKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgU3RvcmFnZUFyZWEoTG9jYWxTdG9yYWdlTmFt ZXNwYWNlKiwgUGFzc1JlZlB0cjxTZWN1cml0eU9yaWdpbj4sIHVuc2lnbmVkIHF1b3RhSW5CeXRl cyk7CiAKLSAgICB2b2lkIGltcG9ydEl0ZW1zRnJvbURhdGFiYXNlKCk7CisgICAgdm9pZCBvcGVu RGF0YWJhc2VBbmRJbXBvcnRJdGVtc0lmTmVlZGVkKCk7CiAKICAgICB2b2lkIGRpc3BhdGNoRXZl bnRzKENvcmVJUEM6OkNvbm5lY3Rpb24qIHNvdXJjZUNvbm5lY3Rpb24sIHVpbnQ2NF90IHNvdXJj ZVN0b3JhZ2VBcmVhSUQsIGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIG9sZFZhbHVl LCBjb25zdCBTdHJpbmcmIG5ld1ZhbHVlLCBjb25zdCBTdHJpbmcmIHVybFN0cmluZykgY29uc3Q7 CiAKICAgICAvLyBXaWxsIGJlIG51bGwgaWYgdGhlIHN0b3JhZ2UgYXJlYSBiZWxvbmdzIHRvIGEg c2Vzc2lvbiBzdG9yYWdlIG5hbWVzcGFjZS4KICAgICBMb2NhbFN0b3JhZ2VOYW1lc3BhY2UqIG1f bG9jYWxTdG9yYWdlTmFtZXNwYWNlOwogICAgIFJlZlB0cjxMb2NhbFN0b3JhZ2VEYXRhYmFzZT4g bV9sb2NhbFN0b3JhZ2VEYXRhYmFzZTsKKyAgICBib29sIG1fZGlkSW1wb3J0SXRlbXNGcm9tRGF0 YWJhc2U7CiAKICAgICBSZWZQdHI8U2VjdXJpdHlPcmlnaW4+IG1fc2VjdXJpdHlPcmlnaW47CiAg ICAgdW5zaWduZWQgbV9xdW90YUluQnl0ZXM7CkBAIC0xMDUsMTIgKzEwNiwxMSBAQCBQYXNzUmVm UHRyPFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYT4gU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VB cmVhOjpjcmVhdGUoTG9jYQogCiBTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6OlN0b3JhZ2VB cmVhKExvY2FsU3RvcmFnZU5hbWVzcGFjZSogbG9jYWxTdG9yYWdlTmFtZXNwYWNlLCBQYXNzUmVm UHRyPFNlY3VyaXR5T3JpZ2luPiBzZWN1cml0eU9yaWdpbiwgdW5zaWduZWQgcXVvdGFJbkJ5dGVz KQogICAgIDogbV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2UobG9jYWxTdG9yYWdlTmFtZXNwYWNlKQor ICAgICwgbV9kaWRJbXBvcnRJdGVtc0Zyb21EYXRhYmFzZShmYWxzZSkKICAgICAsIG1fc2VjdXJp dHlPcmlnaW4oc2VjdXJpdHlPcmlnaW4pCiAgICAgLCBtX3F1b3RhSW5CeXRlcyhxdW90YUluQnl0 ZXMpCiAgICAgLCBtX3N0b3JhZ2VNYXAoU3RvcmFnZU1hcDo6Y3JlYXRlKG1fcXVvdGFJbkJ5dGVz KSkKIHsKLSAgICBpZiAobV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2UpCi0gICAgICAgIG1fbG9jYWxT dG9yYWdlRGF0YWJhc2UgPSBMb2NhbFN0b3JhZ2VEYXRhYmFzZTo6Y3JlYXRlKG1fbG9jYWxTdG9y YWdlTmFtZXNwYWNlLT5zdG9yYWdlTWFuYWdlcigpLT5tX3F1ZXVlLCBtX2xvY2FsU3RvcmFnZU5h bWVzcGFjZS0+c3RvcmFnZU1hbmFnZXIoKS0+bV9sb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIs IG1fc2VjdXJpdHlPcmlnaW4uZ2V0KCkpOwogfQogCiBTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFy ZWE6On5TdG9yYWdlQXJlYSgpCkBAIC0xNDgsNyArMTQ4LDcgQEAgUGFzc1JlZlB0cjxTdG9yYWdl TWFuYWdlcjo6U3RvcmFnZUFyZWE+IFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6Y2xvbmUo KSBjb24KIAogdm9pZCBTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6OnNldEl0ZW0oQ29yZUlQ Qzo6Q29ubmVjdGlvbiogc291cmNlQ29ubmVjdGlvbiwgdWludDY0X3Qgc291cmNlU3RvcmFnZUFy ZWFJRCwgY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgdmFsdWUsIGNvbnN0IFN0cmlu ZyYgdXJsU3RyaW5nLCBib29sJiBxdW90YUV4Y2VwdGlvbikKIHsKLSAgICBpbXBvcnRJdGVtc0Zy b21EYXRhYmFzZSgpOworICAgIG9wZW5EYXRhYmFzZUFuZEltcG9ydEl0ZW1zSWZOZWVkZWQoKTsK IAogICAgIFN0cmluZyBvbGRWYWx1ZTsKIApAQCAtMTY3LDcgKzE2Nyw3IEBAIHZvaWQgU3RvcmFn ZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjpzZXRJdGVtKENvcmVJUEM6OkNvbm5lY3Rpb24qIHNvdXJj ZUNvbm5lY3Rpb24sCiAKIHZvaWQgU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjpyZW1vdmVJ dGVtKENvcmVJUEM6OkNvbm5lY3Rpb24qIHNvdXJjZUNvbm5lY3Rpb24sIHVpbnQ2NF90IHNvdXJj ZVN0b3JhZ2VBcmVhSUQsIGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHVybFN0cmlu ZykKIHsKLSAgICBpbXBvcnRJdGVtc0Zyb21EYXRhYmFzZSgpOworICAgIG9wZW5EYXRhYmFzZUFu ZEltcG9ydEl0ZW1zSWZOZWVkZWQoKTsKIAogICAgIFN0cmluZyBvbGRWYWx1ZTsKICAgICBSZWZQ dHI8U3RvcmFnZU1hcD4gbmV3U3RvcmFnZU1hcCA9IG1fc3RvcmFnZU1hcC0+cmVtb3ZlSXRlbShr ZXksIG9sZFZhbHVlKTsKQEAgLTE4NSw3ICsxODUsNyBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpT dG9yYWdlQXJlYTo6cmVtb3ZlSXRlbShDb3JlSVBDOjpDb25uZWN0aW9uKiBzb3VyY2VDb25uZWN0 aQogCiB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6Y2xlYXIoQ29yZUlQQzo6Q29u bmVjdGlvbiogc291cmNlQ29ubmVjdGlvbiwgdWludDY0X3Qgc291cmNlU3RvcmFnZUFyZWFJRCwg Y29uc3QgU3RyaW5nJiB1cmxTdHJpbmcpCiB7Ci0gICAgaW1wb3J0SXRlbXNGcm9tRGF0YWJhc2Uo KTsKKyAgICBvcGVuRGF0YWJhc2VBbmRJbXBvcnRJdGVtc0lmTmVlZGVkKCk7CiAKICAgICBpZiAo IW1fc3RvcmFnZU1hcC0+bGVuZ3RoKCkpCiAgICAgICAgIHJldHVybjsKQEAgLTIwMCwxNyArMjAw LDI1IEBAIHZvaWQgU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjpjbGVhcihDb3JlSVBDOjpD b25uZWN0aW9uKiBzb3VyY2VDb25uZWN0aW9uLCB1CiAKIGNvbnN0IEhhc2hNYXA8U3RyaW5nLCBT dHJpbmc+JiBTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6Oml0ZW1zKCkKIHsKLSAgICBpbXBv cnRJdGVtc0Zyb21EYXRhYmFzZSgpOworICAgIG9wZW5EYXRhYmFzZUFuZEltcG9ydEl0ZW1zSWZO ZWVkZWQoKTsKIAogICAgIHJldHVybiBtX3N0b3JhZ2VNYXAtPml0ZW1zKCk7CiB9CiAKLXZvaWQg U3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjppbXBvcnRJdGVtc0Zyb21EYXRhYmFzZSgpCit2 b2lkIFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6b3BlbkRhdGFiYXNlQW5kSW1wb3J0SXRl bXNJZk5lZWRlZCgpCiB7CisgICAgaWYgKCFtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZSkKKyAgICAg ICAgcmV0dXJuOworCisgICAgLy8gV2Ugb3BlbiB0aGUgZGF0YWJhc2UgaGVyZSBldmVuIGlmIHdl J3ZlIGFscmVhZHkgaW1wb3J0ZWQgb3VyIGl0ZW1zIHRvIGVuc3VyZSB0aGF0IHRoZSBkYXRhYmFz ZSBpcyBvcGVuIGlmIHdlIG5lZWQgdG8gd3JpdGUgdG8gaXQuCiAgICAgaWYgKCFtX2xvY2FsU3Rv cmFnZURhdGFiYXNlKQorICAgICAgICBtX2xvY2FsU3RvcmFnZURhdGFiYXNlID0gTG9jYWxTdG9y YWdlRGF0YWJhc2U6OmNyZWF0ZShtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZS0+c3RvcmFnZU1hbmFn ZXIoKS0+bV9xdWV1ZSwgbV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2UtPnN0b3JhZ2VNYW5hZ2VyKCkt Pm1fbG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLCBtX3NlY3VyaXR5T3JpZ2luLmdldCgpKTsK KworICAgIGlmIChtX2RpZEltcG9ydEl0ZW1zRnJvbURhdGFiYXNlKQogICAgICAgICByZXR1cm47 CiAKICAgICBtX2xvY2FsU3RvcmFnZURhdGFiYXNlLT5pbXBvcnRJdGVtcygqbV9zdG9yYWdlTWFw KTsKKyAgICBtX2RpZEltcG9ydEl0ZW1zRnJvbURhdGFiYXNlID0gdHJ1ZTsKIH0KIAogdm9pZCBT dG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6OmRpc3BhdGNoRXZlbnRzKENvcmVJUEM6OkNvbm5l Y3Rpb24qIHNvdXJjZUNvbm5lY3Rpb24sIHVpbnQ2NF90IHNvdXJjZVN0b3JhZ2VBcmVhSUQsIGNv bnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIG9sZFZhbHVlLCBjb25zdCBTdHJpbmcmIG5l d1ZhbHVlLCBjb25zdCBTdHJpbmcmIHVybFN0cmluZykgY29uc3QK