226788 2021-06-08 16:21:45 -0700 Rely on SQLiteDatabase::setMaximumSize() for quota management in LocalStorageDatabase 2021-06-16 08:44:18 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=226814 InRadar P2 Normal --- 226832 1 cdumez cdumez achristensen ggaren kkinnunen pascal sihui_liu webkit-bug-importer oldest_to_newest 1767948 0 cdumez 2021-06-08 16:21:45 -0700 Rely on SQLiteDatabase::setMaximumSize() for quota management in LocalStorageDatabase. It simplifies the code a bit. 1767950 1 430907 cdumez 2021-06-08 16:23:39 -0700 Created attachment 430907 Patch 1768056 2 430907 kkinnunen 2021-06-08 22:33:06 -0700 Comment on attachment 430907 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=430907&action=review looks good as far as I understand the part (which is not terribly much) > Source/WebKit/NetworkProcess/WebStorage/LocalStorageDatabase.cpp:232 > + if (result == SQLITE_FULL) (Not specific to this patch, but I'd imagine this can happen in other operations too, such as the removeItem above.) 1768070 3 ews-feeder 2021-06-09 00:02:48 -0700 Committed r278651 (238633@main): <https://commits.webkit.org/238633@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430907. 1768071 4 webkit-bug-importer 2021-06-09 00:03:16 -0700 <rdar://problem/79060435> 1770203 5 cdumez 2021-06-16 08:44:18 -0700 *** Bug 226814 has been marked as a duplicate of this bug. *** 430907 2021-06-08 16:23:39 -0700 2021-06-09 00:02:49 -0700 Patch bug-226788-20210608162338.patch text/plain 6122 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NjI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTY4ZmE5MTJiOGE2MGNh MjE4ZWMwMjM5MTVhNTExZTMwMGExODk2ZC4uNGYwZTk1MDFlYWIyMzg3OWFiZWVkODU0NjllZDg4 NTBjMTk4ZTdkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTA2LTA4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVseSBvbiBTUUxpdGVEYXRh YmFzZTo6c2V0TWF4aW11bVNpemUoKSBmb3IgcXVvdGEgbWFuYWdlbWVudCBpbiBMb2NhbFN0b3Jh Z2VEYXRhYmFzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjI2Nzg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgRXhwb3J0IFNRTGl0ZURhdGFiYXNlOjpzZXRNYXhpbXVtU2l6ZSgpIHNvIGl0IGNhbiBiZSB1 c2VkIGZyb20gV2ViS2l0Mi4KKworICAgICAgICAqIHBsYXRmb3JtL3NxbC9TUUxpdGVEYXRhYmFz ZS5oOgorCiAyMDIxLTA2LTA4ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AZ25vbWUu b3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIGZpeCBidWlsZCBhZnRlciByMjc4NjIxCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CmluZGV4IDE5YjllZGExZTAxZjEzZmIwMDhiOWYzMWNiM2EyMDUyNWJhYjIzZGQuLjhkMmM3NjMy NjRlZmY0NTA0NTlkNjg3M2QwM2NjYzlhZjRhM2EzZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMjEtMDYtMDggIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAg ICBSZWx5IG9uIFNRTGl0ZURhdGFiYXNlOjpzZXRNYXhpbXVtU2l6ZSgpIGZvciBxdW90YSBtYW5h Z2VtZW50IGluIExvY2FsU3RvcmFnZURhdGFiYXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY3ODgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZWx5IG9uIFNRTGl0ZURhdGFiYXNlOjpzZXRNYXhpbXVt U2l6ZSgpIGZvciBxdW90YSBtYW5hZ2VtZW50IGluIExvY2FsU3RvcmFnZURhdGFiYXNlLgorICAg ICAgICBJdCBzaW1wbGlmaWVzIHRoZSBjb2RlIGEgYml0LgorCisgICAgICAgIE5vIG5ldyB0ZXN0 LCBjb3ZlcmVkIGJ5IHN0b3JhZ2UvZG9tc3RvcmFnZS9xdW90YS5odG1sIHRoYXQgaXMgc3RpbGwg cGFzc2luZy4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvTG9jYWxTdG9y YWdlRGF0YWJhc2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpMb2NhbFN0b3JhZ2VEYXRhYmFzZTo6 b3BlbkRhdGFiYXNlKToKKyAgICAgICAgKFdlYktpdDo6TG9jYWxTdG9yYWdlRGF0YWJhc2U6OnJl bW92ZUl0ZW0pOgorICAgICAgICAoV2ViS2l0OjpMb2NhbFN0b3JhZ2VEYXRhYmFzZTo6c2V0SXRl bSk6CisgICAgICAgIChXZWJLaXQ6OkxvY2FsU3RvcmFnZURhdGFiYXNlOjpjbGVhcik6CisgICAg ICAgICogTmV0d29ya1Byb2Nlc3MvV2ViU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZS5oOgor CiAyMDIxLTA2LTA4ICBUcnVpdHQgU2F2ZWxsICA8dHNhdmVsbEBhcHBsZS5jb20+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNzg2MDkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlRGF0YWJhc2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3NxbC9TUUxpdGVEYXRhYmFzZS5oCmluZGV4IGI5Mjc1MDg0MTdjN2Y1YTA1OGM1MWJlOTA0 YzRhYjM4YjE1Mjg4NmYuLjRiMjJjOGZlNjhlMzVmYmRkMDk3MjU4NjhjNGM5YTBlNWNhYjJjZjAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVEYXRhYmFzZS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVEYXRhYmFzZS5oCkBAIC0x MDMsNyArMTAzLDcgQEAgcHVibGljOgogICAgIC8vIFRoZXNlIGNodW5rcyB3aWxsIG5ldmVyIGJl IGFueXRoaW5nIG90aGVyIHRoYW4gNTEyLCAxMDI0LCAyMDQ4LCA0MDk2LCA4MTkyLCAxNjM4NCwg b3IgMzI3NjggYnl0ZXMgaW4gc2l6ZS4KICAgICAvLyBzZXRNYXhpbXVtU2l6ZSgpIHdpbGwgcm91 bmQgdGhlIHNpemUgZG93biB0byB0aGUgbmV4dCBzbWFsbGVzdCBjaHVuayBpZiB0aGUgcGFzc2Vk IHNpemUgZG9lc24ndCBhbGlnbi4KICAgICBpbnQ2NF90IG1heGltdW1TaXplKCk7Ci0gICAgdm9p ZCBzZXRNYXhpbXVtU2l6ZShpbnQ2NF90KTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldE1h eGltdW1TaXplKGludDY0X3QpOwogICAgIAogICAgIC8vIEdldHMgdGhlIG51bWJlciBvZiB1bnVz ZWQgYnl0ZXMgaW4gdGhlIGRhdGFiYXNlIGZpbGUuCiAgICAgaW50NjRfdCBmcmVlU3BhY2VTaXpl KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2Uv TG9jYWxTdG9yYWdlRGF0YWJhc2UuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9X ZWJTdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlLmNwcAppbmRleCBlOGJlNTA1ZjM3ZWZlNzlj ZDFlMWIzOGRiZGZjOWYzNjQ0Njc4NjhhLi40YTYzNzVjY2FkZDYxOTA3NTE0YzM0MTkwY2IwYmE5 Zjc0NjQ2YTUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1dlYlN0 b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvV2ViU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZS5jcHAKQEAgLTkwLDYgKzkw LDkgQEAgYm9vbCBMb2NhbFN0b3JhZ2VEYXRhYmFzZTo6b3BlbkRhdGFiYXNlKFNob3VsZENyZWF0 ZURhdGFiYXNlIHNob3VsZENyZWF0ZURhdGFiYXMKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAg IH0KIAorICAgIGlmIChtX3F1b3RhSW5CeXRlcyAhPSBXZWJDb3JlOjpTdG9yYWdlTWFwOjpub1F1 b3RhKQorICAgICAgICBtX2RhdGFiYXNlLnNldE1heGltdW1TaXplKG1fcXVvdGFJbkJ5dGVzKTsK KwogICAgIHJldHVybiB0cnVlOwogfQogCkBAIC0xODEsMTQgKzE4NCw2IEBAIHZvaWQgTG9jYWxT dG9yYWdlRGF0YWJhc2U6OnJlbW92ZUl0ZW0oY29uc3QgU3RyaW5nJiBrZXksIFN0cmluZyYgb2xk VmFsdWUpCiAgICAgICAgIExPR19FUlJPUigiRmFpbGVkIHRvIGRlbGV0ZSBpdGVtIGluIHRoZSBs b2NhbCBzdG9yYWdlIGRhdGFiYXNlIC0gJWkiLCByZXN1bHQpOwogICAgICAgICByZXR1cm47CiAg ICAgfQotCi0gICAgaWYgKG1fZGF0YWJhc2VTaXplKSB7Ci0gICAgICAgIGF1dG8gc2l6ZURlY3Jl YXNlID0ga2V5LnNpemVJbkJ5dGVzKCkgKyBvbGRWYWx1ZS5zaXplSW5CeXRlcygpOwotICAgICAg ICBpZiAoc2l6ZURlY3JlYXNlID49ICptX2RhdGFiYXNlU2l6ZSkKLSAgICAgICAgICAgICptX2Rh dGFiYXNlU2l6ZSA9IDA7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgICptX2RhdGFiYXNlU2l6 ZSAtPSBzaXplRGVjcmVhc2U7Ci0gICAgfQogfQogCiBTdHJpbmcgTG9jYWxTdG9yYWdlRGF0YWJh c2U6Oml0ZW0oY29uc3QgU3RyaW5nJiBrZXkpIGNvbnN0CkBAIC0yMjIsMjEgKzIxNyw2IEBAIHZv aWQgTG9jYWxTdG9yYWdlRGF0YWJhc2U6OnNldEl0ZW0oY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0 IFN0cmluZyYgdmFsdWUsIFN0cmluCiAKICAgICBvbGRWYWx1ZSA9IGl0ZW0oa2V5KTsKIAotICAg IGlmIChtX3F1b3RhSW5CeXRlcyAhPSBXZWJDb3JlOjpTdG9yYWdlTWFwOjpub1F1b3RhKSB7Ci0g ICAgICAgIGlmICghbV9kYXRhYmFzZVNpemUpCi0gICAgICAgICAgICBtX2RhdGFiYXNlU2l6ZSA9 IFNRTGl0ZUZpbGVTeXN0ZW06OmRhdGFiYXNlRmlsZVNpemUobV9kYXRhYmFzZVBhdGgpOwotICAg ICAgICBDaGVja2VkVWludDY0IG5ld0RhdGFiYXNlU2l6ZSA9ICptX2RhdGFiYXNlU2l6ZTsKLSAg ICAgICAgbmV3RGF0YWJhc2VTaXplIC09IG9sZFZhbHVlLnNpemVJbkJ5dGVzKCk7Ci0gICAgICAg IG5ld0RhdGFiYXNlU2l6ZSArPSB2YWx1ZS5zaXplSW5CeXRlcygpOwotICAgICAgICBpZiAob2xk VmFsdWUuaXNOdWxsKCkpCi0gICAgICAgICAgICBuZXdEYXRhYmFzZVNpemUgKz0ga2V5LnNpemVJ bkJ5dGVzKCk7Ci0gICAgICAgIGlmIChuZXdEYXRhYmFzZVNpemUuaGFzT3ZlcmZsb3dlZCgpIHx8 IG5ld0RhdGFiYXNlU2l6ZSA+IG1fcXVvdGFJbkJ5dGVzKSB7Ci0gICAgICAgICAgICBxdW90YUV4 Y2VwdGlvbiA9IHRydWU7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLSAgICAgICAg bV9kYXRhYmFzZVNpemUgPSBuZXdEYXRhYmFzZVNpemU7Ci0gICAgfQotCiAgICAgYXV0byBpbnNl cnRTdGF0ZW1lbnQgPSBzY29wZWRTdGF0ZW1lbnQobV9pbnNlcnRTdGF0ZW1lbnQsICJJTlNFUlQg SU5UTyBJdGVtVGFibGUgVkFMVUVTICg/LCA/KSJfcyk7CiAgICAgaWYgKCFpbnNlcnRTdGF0ZW1l bnQpIHsKICAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8gcHJlcGFyZSBpbnNlcnQgc3RhdGVt ZW50IC0gY2Fubm90IHdyaXRlIHRvIGxvY2FsIHN0b3JhZ2UgZGF0YWJhc2UiKTsKQEAgLTI0Nyw4 ICsyMjcsMTEgQEAgdm9pZCBMb2NhbFN0b3JhZ2VEYXRhYmFzZTo6c2V0SXRlbShjb25zdCBTdHJp bmcmIGtleSwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgU3RyaW4KICAgICBpbnNlcnRTdGF0ZW1lbnQt PmJpbmRCbG9iKDIsIHZhbHVlKTsKIAogICAgIGludCByZXN1bHQgPSBpbnNlcnRTdGF0ZW1lbnQt PnN0ZXAoKTsKLSAgICBpZiAocmVzdWx0ICE9IFNRTElURV9ET05FKQorICAgIGlmIChyZXN1bHQg IT0gU1FMSVRFX0RPTkUpIHsKICAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8gdXBkYXRlIGl0 ZW0gaW4gdGhlIGxvY2FsIHN0b3JhZ2UgZGF0YWJhc2UgLSAlaSIsIHJlc3VsdCk7CisgICAgICAg IGlmIChyZXN1bHQgPT0gU1FMSVRFX0ZVTEwpCisgICAgICAgICAgICBxdW90YUV4Y2VwdGlvbiA9 IHRydWU7CisgICAgfQogfQogCiBib29sIExvY2FsU3RvcmFnZURhdGFiYXNlOjpjbGVhcigpCkBA IC0yNjksOCArMjUyLDYgQEAgYm9vbCBMb2NhbFN0b3JhZ2VEYXRhYmFzZTo6Y2xlYXIoKQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCi0gICAgbV9kYXRhYmFzZVNpemUgPSAwOwotCiAg ICAgcmV0dXJuIG1fZGF0YWJhc2UubGFzdENoYW5nZXMoKSA+IDA7CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvV2ViU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRh YmFzZS5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9XZWJTdG9yYWdlL0xvY2FsU3Rv cmFnZURhdGFiYXNlLmgKaW5kZXggYWEwNWM1OTljYzU0M2ViZGVmNWY2OThmZTBhMTMxNGNiZThl NTcyMS4uZTQxNzg4NjVjNzAxNjFkNTMxMjUxMmFhZjM1N2RmOGIwMTE0ZGY3ZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9XZWJTdG9yYWdlL0xvY2FsU3RvcmFnZURh dGFiYXNlLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9XZWJTdG9yYWdlL0xv Y2FsU3RvcmFnZURhdGFiYXNlLmgKQEAgLTY4LDcgKzY4LDYgQEAgcHJpdmF0ZToKICAgICBtdXRh YmxlIFdlYkNvcmU6OlNRTGl0ZURhdGFiYXNlIG1fZGF0YWJhc2U7CiAgICAgY29uc3QgdW5zaWdu ZWQgbV9xdW90YUluQnl0ZXMgeyAwIH07CiAgICAgYm9vbCBtX2lzQ2xvc2VkIHsgZmFsc2UgfTsK LSAgICBzdGQ6Om9wdGlvbmFsPHVpbnQ2NF90PiBtX2RhdGFiYXNlU2l6ZTsKIAogICAgIG11dGFi bGUgc3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OlNRTGl0ZVN0YXRlbWVudD4gbV9jbGVhclN0YXRl bWVudDsKICAgICBtdXRhYmxlIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpTUUxpdGVTdGF0ZW1l bnQ+IG1faW5zZXJ0U3RhdGVtZW50Owo=