139549 2014-12-11 12:09:39 -0800 Stop using SQLiteFileSystem in the storage code 2014-12-11 12:17:18 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1054573 0 andersca 2014-12-11 12:09:39 -0800 Stop using SQLiteFileSystem in the storage code 1054575 1 243136 andersca 2014-12-11 12:11:31 -0800 Created attachment 243136 Patch 1054578 2 andersca 2014-12-11 12:17:18 -0800 Committed r177172: <http://trac.webkit.org/changeset/177172> 243136 2014-12-11 12:11:31 -0800 2014-12-11 12:13:17 -0800 Patch bug-139549-20141211121214.patch text/plain 6848 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3MTY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGI5ODI5NDZmNmZmZTJk OTI2ZDk3OGFkZDM3NjdiNjlhOGQ4ODkxZC4uOWUyMGJjMDhjNTdkZTMxMzE1MjRiMzc3ZDcyZjFm YjJiM2Y4YjVlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE0LTEyLTExICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgU3RvcCB1c2luZyBT UUxpdGVGaWxlU3lzdGVtIGluIHRoZSBzdG9yYWdlIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTU0OQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEp1c3QgaW5saW5lIHRoZSBTUUxpdGVGaWxlU3lz dGVtIGNhbGxzIGludG8gdGhlaXIgcmVzcGVjdGl2ZSBjYWxsIHNpdGVzLgorICAgICAgICBUaGlz IGlzIG1vcmUgcHJlcGFyYXRpb24gZm9yIG1vdmluZyB0aGUgb2xkIHN0b3JhZ2UgY29kZSBpbnRv IFdlYktpdCBwcm9wZXIuCisKKyAgICAgICAgKiBzdG9yYWdlL1N0b3JhZ2VBcmVhU3luYy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTdG9yYWdlQXJlYVN5bmM6OmRlbGV0ZUVtcHR5RGF0YWJhc2Up OgorICAgICAgICAqIHN0b3JhZ2UvU3RvcmFnZVRyYWNrZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6U3RvcmFnZVRyYWNrZXI6OnRyYWNrZXJEYXRhYmFzZVBhdGgpOgorICAgICAgICAoV2ViQ29y ZTo6ZW5zdXJlRGF0YWJhc2VGaWxlRXhpc3RzKToKKyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2VU cmFja2VyOjpvcGVuVHJhY2tlckRhdGFiYXNlKToKKyAgICAgICAgKFdlYkNvcmU6OnRydW5jYXRl RGF0YWJhc2VGaWxlKToKKyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2VUcmFja2VyOjpzeW5jRGVs ZXRlQWxsT3JpZ2lucyk6CisgICAgICAgIChXZWJDb3JlOjpTdG9yYWdlVHJhY2tlcjo6c3luY0Rl bGV0ZU9yaWdpbik6CisgICAgICAgIChXZWJDb3JlOjpTdG9yYWdlVHJhY2tlcjo6ZGlza1VzYWdl Rm9yT3JpZ2luKToKKworMjAxNC0xMi0xMSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBw bGUuY29tPgorCiAgICAgICAgIENhbGwgU3RvcmFnZVRocmVhZDo6cmVsZWFzZUZhc3RNYWxsb2NG cmVlTWVtb3J5SW5BbGxUaHJlYWRzIGZyb20gV2ViS2l0CiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk1NDcKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvc3RvcmFnZS9TdG9yYWdlQXJlYVN5bmMuY3BwIGIvU291cmNlL1dlYkNvcmUvc3RvcmFn ZS9TdG9yYWdlQXJlYVN5bmMuY3BwCmluZGV4IDFiOTlkZTk4ZjhjZmRiODYxMjZlY2E4OTBhODYw YTg2NTA1YjBiNmQuLjYwYzQyY2YzMDAzYjVmN2QyODE0MGUzOTNkN2I1MmE2MTY4NzVmMTggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZUFyZWFTeW5jLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VBcmVhU3luYy5jcHAKQEAgLTI4LDcgKzI4 LDYgQEAKIAogI2luY2x1ZGUgIkZpbGVTeXN0ZW0uaCIKICNpbmNsdWRlICJTUUxpdGVEYXRhYmFz ZVRyYWNrZXIuaCIKLSNpbmNsdWRlICJTUUxpdGVGaWxlU3lzdGVtLmgiCiAjaW5jbHVkZSAiU1FM aXRlU3RhdGVtZW50LmgiCiAjaW5jbHVkZSAiU1FMaXRlVHJhbnNhY3Rpb24uaCIKICNpbmNsdWRl ICJTdG9yYWdlQXJlYUltcGwuaCIKQEAgLTUyNSw3ICs1MjQsNyBAQCB2b2lkIFN0b3JhZ2VBcmVh U3luYzo6ZGVsZXRlRW1wdHlEYXRhYmFzZSgpCiAgICAgICAgICAgICB9KTsKICAgICAgICAgfSBl bHNlIHsKICAgICAgICAgICAgIFN0cmluZyBkYXRhYmFzZUZpbGVuYW1lID0gbV9zeW5jTWFuYWdl ci0+ZnVsbERhdGFiYXNlRmlsZW5hbWUobV9kYXRhYmFzZUlkZW50aWZpZXIpOwotICAgICAgICAg ICAgaWYgKCFTUUxpdGVGaWxlU3lzdGVtOjpkZWxldGVEYXRhYmFzZUZpbGUoZGF0YWJhc2VGaWxl bmFtZSkpCisgICAgICAgICAgICBpZiAoIWRlbGV0ZUZpbGUoZGF0YWJhc2VGaWxlbmFtZSkpCiAg ICAgICAgICAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8gZGVsZXRlIGRhdGFiYXNlIGZpbGUg JXNcbiIsIGRhdGFiYXNlRmlsZW5hbWUudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIH0KICAgICB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VUcmFja2VyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZVRyYWNrZXIuY3BwCmluZGV4IGY3Y2JiZTUx NjkyNjhiNDc2MTEyNzViMjcyMWU4YWJiMDU4YzUyOTguLjhmYTUwOTM3NmNlZDMzYTBhZjU2MmU2 ZmQ2YmI5ODk5YmRmMjRlYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3Rv cmFnZVRyYWNrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZVRyYWNr ZXIuY3BwCkBAIC0yOSw3ICsyOSw2IEBACiAjaW5jbHVkZSAiRmlsZVN5c3RlbS5oIgogI2luY2x1 ZGUgIlBhZ2VHcm91cC5oIgogI2luY2x1ZGUgIlNRTGl0ZURhdGFiYXNlVHJhY2tlci5oIgotI2lu Y2x1ZGUgIlNRTGl0ZUZpbGVTeXN0ZW0uaCIKICNpbmNsdWRlICJTUUxpdGVTdGF0ZW1lbnQuaCIK ICNpbmNsdWRlICJTZWN1cml0eU9yaWdpbi5oIgogI2luY2x1ZGUgIlN0b3JhZ2VUaHJlYWQuaCIK QEAgLTQwLDYgKzM5LDEwIEBACiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogI2luY2x1ZGUgPHd0 Zi90ZXh0L0NTdHJpbmcuaD4KIAorI2lmIFBMQVRGT1JNKElPUykKKyNpbmNsdWRlIDxzcWxpdGUz X3ByaXZhdGUuaD4KKyNlbmRpZgorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHN0YXRpYyBTdG9y YWdlVHJhY2tlciogc3RvcmFnZVRyYWNrZXIgPSAwOwpAQCAtMTIzLDcgKzEyNiwxNSBAQCBTdHJp bmcgU3RvcmFnZVRyYWNrZXI6OmRhdGFiYXNlRGlyZWN0b3J5UGF0aCgpIGNvbnN0CiBTdHJpbmcg U3RvcmFnZVRyYWNrZXI6OnRyYWNrZXJEYXRhYmFzZVBhdGgoKQogewogICAgIEFTU0VSVCghbV9k YXRhYmFzZU11dGV4LnRyeUxvY2soKSk7Ci0gICAgcmV0dXJuIFNRTGl0ZUZpbGVTeXN0ZW06OmFw cGVuZERhdGFiYXNlRmlsZU5hbWVUb1BhdGgobV9zdG9yYWdlRGlyZWN0b3J5UGF0aCwgIlN0b3Jh Z2VUcmFja2VyLmRiIik7CisgICAgcmV0dXJuIHBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChtX3N0 b3JhZ2VEaXJlY3RvcnlQYXRoLCAiU3RvcmFnZVRyYWNrZXIuZGIiKTsKK30KKworc3RhdGljIGJv b2wgZW5zdXJlRGF0YWJhc2VGaWxlRXhpc3RzKGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIGJvb2wg Y3JlYXRlSWZEb2VzTm90RXhpc3QpCit7CisgICAgaWYgKGNyZWF0ZUlmRG9lc05vdEV4aXN0KQor ICAgICAgICByZXR1cm4gbWFrZUFsbERpcmVjdG9yaWVzKGRpcmVjdG9yeU5hbWUoZmlsZU5hbWUp KTsKKworICAgIHJldHVybiBmaWxlRXhpc3RzKGZpbGVOYW1lKTsKIH0KIAogdm9pZCBTdG9yYWdl VHJhY2tlcjo6b3BlblRyYWNrZXJEYXRhYmFzZShib29sIGNyZWF0ZUlmRG9lc05vdEV4aXN0KQpA QCAtMTQwLDcgKzE1MSw3IEBAIHZvaWQgU3RvcmFnZVRyYWNrZXI6Om9wZW5UcmFja2VyRGF0YWJh c2UoYm9vbCBjcmVhdGVJZkRvZXNOb3RFeGlzdCkKICAgICAKICAgICBTdHJpbmcgZGF0YWJhc2VQ YXRoID0gdHJhY2tlckRhdGFiYXNlUGF0aCgpOwogICAgIAotICAgIGlmICghU1FMaXRlRmlsZVN5 c3RlbTo6ZW5zdXJlRGF0YWJhc2VGaWxlRXhpc3RzKGRhdGFiYXNlUGF0aCwgY3JlYXRlSWZEb2Vz Tm90RXhpc3QpKSB7CisgICAgaWYgKCFlbnN1cmVEYXRhYmFzZUZpbGVFeGlzdHMoZGF0YWJhc2VQ YXRoLCBjcmVhdGVJZkRvZXNOb3RFeGlzdCkpIHsKICAgICAgICAgaWYgKGNyZWF0ZUlmRG9lc05v dEV4aXN0KQogICAgICAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8gY3JlYXRlIGRhdGFiYXNl IGZpbGUgJyVzJyIsIGRhdGFiYXNlUGF0aC5hc2NpaSgpLmRhdGEoKSk7CiAgICAgICAgIHJldHVy bjsKQEAgLTM5Miw3ICs0MDMsMTQgQEAgdm9pZCBTdG9yYWdlVHJhY2tlcjo6ZGVsZXRlQWxsT3Jp Z2lucygpCiAgICAgICAgIHN5bmNEZWxldGVBbGxPcmlnaW5zKCk7CiAgICAgfSk7CiB9Ci0gICAg CisKKyNpZiBQTEFURk9STShJT1MpCitzdGF0aWMgdm9pZCB0cnVuY2F0ZURhdGFiYXNlRmlsZShT UUxpdGVEYXRhYmFzZSYgZGF0YWJhc2UpCit7CisgICAgc3FsaXRlM19maWxlX2NvbnRyb2woZGF0 YWJhc2Uuc3FsaXRlM0hhbmRsZSgpLCAwLCBTUUxJVEVfVFJVTkNBVEVfREFUQUJBU0UsIDApOwor fQorI2VuZGlmCisKIHZvaWQgU3RvcmFnZVRyYWNrZXI6OnN5bmNEZWxldGVBbGxPcmlnaW5zKCkK IHsKICAgICBBU1NFUlQoIWlzTWFpblRocmVhZCgpKTsKQEAgLTQxNiw3ICs0MzQsNyBAQCB2b2lk IFN0b3JhZ2VUcmFja2VyOjpzeW5jRGVsZXRlQWxsT3JpZ2lucygpCiAgICAgICAgIGlmICghY2Fu RGVsZXRlT3JpZ2luKHN0YXRlbWVudC5nZXRDb2x1bW5UZXh0KDApKSkKICAgICAgICAgICAgIGNv bnRpbnVlOwogCi0gICAgICAgIFNRTGl0ZUZpbGVTeXN0ZW06OmRlbGV0ZURhdGFiYXNlRmlsZShz dGF0ZW1lbnQuZ2V0Q29sdW1uVGV4dCgxKSk7CisgICAgICAgIGRlbGV0ZUZpbGUoc3RhdGVtZW50 LmdldENvbHVtblRleHQoMSkpOwogCiAgICAgICAgIHsKICAgICAgICAgICAgIE11dGV4TG9ja2Vy IGxvY2tlcihtX2NsaWVudE11dGV4KTsKQEAgLTQzMCwxMyArNDQ4LDEzIEBAIHZvaWQgU3RvcmFn ZVRyYWNrZXI6OnN5bmNEZWxldGVBbGxPcmlnaW5zKCkKIAogICAgIGlmIChtX2RhdGFiYXNlLmlz T3BlbigpKSB7CiAjaWYgUExBVEZPUk0oSU9TKQotICAgICAgICBTUUxpdGVGaWxlU3lzdGVtOjp0 cnVuY2F0ZURhdGFiYXNlRmlsZShtX2RhdGFiYXNlLnNxbGl0ZTNIYW5kbGUoKSk7CisgICAgICAg IHRydW5jYXRlRGF0YWJhc2VGaWxlKG1fZGF0YWJhc2Uuc3FsaXRlM0hhbmRsZSgpKTsKICNlbmRp ZgogICAgICAgICBtX2RhdGFiYXNlLmNsb3NlKCk7CiAgICAgfQogCiAjaWYgIVBMQVRGT1JNKElP UykKLSAgICBpZiAoIVNRTGl0ZUZpbGVTeXN0ZW06OmRlbGV0ZURhdGFiYXNlRmlsZSh0cmFja2Vy RGF0YWJhc2VQYXRoKCkpKSB7CisgICAgaWYgKCFkZWxldGVGaWxlKHRyYWNrZXJEYXRhYmFzZVBh dGgoKSkpIHsKICAgICAgICAgLy8gSW4gdGhlIGNhc2Ugd2hlcmUgaXQgaXMgbm90IHBvc3NpYmxl IHRvIGRlbGV0ZSB0aGUgZGF0YWJhc2UgZmlsZSAoZS5nIHNvbWUgb3RoZXIgcHJvZ3JhbQogICAg ICAgICAvLyBsaWtlIGEgdmlydXMgc2Nhbm5lciBpcyBhY2Nlc3NpbmcgaXQpLCBtYWtlIHN1cmUg dG8gcmVtb3ZlIGFsbCBlbnRyaWVzLgogICAgICAgICBvcGVuVHJhY2tlckRhdGFiYXNlKGZhbHNl KTsKQEAgLTQ1Miw3ICs0NzAsNyBAQCB2b2lkIFN0b3JhZ2VUcmFja2VyOjpzeW5jRGVsZXRlQWxs T3JpZ2lucygpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICB9Ci0gICAgU1FM aXRlRmlsZVN5c3RlbTo6ZGVsZXRlRW1wdHlEYXRhYmFzZURpcmVjdG9yeShtX3N0b3JhZ2VEaXJl Y3RvcnlQYXRoKTsKKyAgICBkZWxldGVFbXB0eURpcmVjdG9yeShtX3N0b3JhZ2VEaXJlY3RvcnlQ YXRoKTsKICNlbmRpZgogfQogCkBAIC01MjcsNyArNTQ1LDcgQEAgdm9pZCBTdG9yYWdlVHJhY2tl cjo6c3luY0RlbGV0ZU9yaWdpbihjb25zdCBTdHJpbmcmIG9yaWdpbklkZW50aWZpZXIpCiAgICAg ICAgIHJldHVybjsKICAgICB9CiAKLSAgICBTUUxpdGVGaWxlU3lzdGVtOjpkZWxldGVEYXRhYmFz ZUZpbGUocGF0aCk7CisgICAgZGVsZXRlRmlsZShwYXRoKTsKICAgICAKICAgICBib29sIHNob3Vs ZERlbGV0ZVRyYWNrZXJGaWxlcyA9IGZhbHNlOwogICAgIHsKQEAgLTUzOCwxMiArNTU2LDEyIEBA IHZvaWQgU3RvcmFnZVRyYWNrZXI6OnN5bmNEZWxldGVPcmlnaW4oY29uc3QgU3RyaW5nJiBvcmln aW5JZGVudGlmaWVyKQogCiAgICAgaWYgKHNob3VsZERlbGV0ZVRyYWNrZXJGaWxlcykgewogI2lm IFBMQVRGT1JNKElPUykKLSAgICAgICAgU1FMaXRlRmlsZVN5c3RlbTo6dHJ1bmNhdGVEYXRhYmFz ZUZpbGUobV9kYXRhYmFzZS5zcWxpdGUzSGFuZGxlKCkpOworICAgICAgICB0cnVuY2F0ZURhdGFi YXNlRmlsZShtX2RhdGFiYXNlKTsKICNlbmRpZgogICAgICAgICBtX2RhdGFiYXNlLmNsb3NlKCk7 CiAjaWYgIVBMQVRGT1JNKElPUykKLSAgICAgICAgU1FMaXRlRmlsZVN5c3RlbTo6ZGVsZXRlRGF0 YWJhc2VGaWxlKHRyYWNrZXJEYXRhYmFzZVBhdGgoKSk7Ci0gICAgICAgIFNRTGl0ZUZpbGVTeXN0 ZW06OmRlbGV0ZUVtcHR5RGF0YWJhc2VEaXJlY3RvcnkobV9zdG9yYWdlRGlyZWN0b3J5UGF0aCk7 CisgICAgICAgIGRlbGV0ZUZpbGUodHJhY2tlckRhdGFiYXNlUGF0aCgpKTsKKyAgICAgICAgZGVs ZXRlRW1wdHlEaXJlY3RvcnkobV9zdG9yYWdlRGlyZWN0b3J5UGF0aCk7CiAjZW5kaWYKICAgICB9 CiAKQEAgLTYzNSw3ICs2NTMsOCBAQCBsb25nIGxvbmcgU3RvcmFnZVRyYWNrZXI6OmRpc2tVc2Fn ZUZvck9yaWdpbihTZWN1cml0eU9yaWdpbiogb3JpZ2luKQogICAgIGlmIChwYXRoLmlzRW1wdHko KSkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICByZXR1cm4gU1FMaXRlRmlsZVN5c3RlbTo6Z2V0 RGF0YWJhc2VGaWxlU2l6ZShwYXRoKTsKKyAgICBsb25nIGxvbmcgc2l6ZTsKKyAgICByZXR1cm4g Z2V0RmlsZVNpemUocGF0aCwgc2l6ZSkgPyBzaXplIDogMDsKIH0KIAogfSAvLyBuYW1lc3BhY2Ug V2ViQ29yZQo=