143890 2015-04-17 12:17:34 -0700 Fix NetworkCache Statistics database bootstrapping after r182803 2015-04-18 07:43:18 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez commit-queue koivisto oldest_to_newest 1086388 0 cdumez 2015-04-17 12:17:34 -0700 r182803 updated the NetworkCache storage format and the NetworkCache Statistics database bootstrapping code needs to be updated as a result. 1086391 1 251038 cdumez 2015-04-17 12:23:53 -0700 Created attachment 251038 Patch 1086549 2 251038 commit-queue 2015-04-18 07:43:13 -0700 Comment on attachment 251038 Patch Clearing flags on attachment: 251038 Committed r182983: <http://trac.webkit.org/changeset/182983> 1086550 3 commit-queue 2015-04-18 07:43:18 -0700 All reviewed patches have been landed. Closing bug. 251038 2015-04-17 12:23:53 -0700 2015-04-18 07:43:13 -0700 Patch bug-143890-20150417122254.patch text/plain 4497 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyOTU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDMyNmEyMGZlMTMxZjM0 ZmM1MjRiODEwNGMxOWM5NGUxMGQ2ZWM4ZS4uMTlkYjYwZDUwNTJmNzcxOTU2MjcxYjZhYjYxN2Qz MzliODFhODZjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE1LTA0LTE3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IE5ldHdvcmtDYWNoZSBT dGF0aXN0aWNzIGRhdGFiYXNlIGJvb3RzdHJhcHBpbmcgYWZ0ZXIgcjE4MjgwMworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzODkwCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIHRoZSBOZXR3b3Jr Q2FjaGUgU3RhdGlzdGljcyBkYXRhYmFzZSBib290c3RyYXBwaW5nIGNvZGUgdG8gdXNlCisgICAg ICAgIHRoZSByZWNvcmRzIHBhdGggaW5zdGVhZCBvZiB0aGUgdmVyc2lvbiBwYXRoLiBBbHNvIGNo ZWNrIHRoYXQgdGhlCisgICAgICAgIGZpbGVuYW1lcyBpbiB0aGUgZm9sZGVyIGFyZSB2YWxpZCBo YXNoZXMgdG8gZGlzY2FyZCB0aGUgKi1ib2R5IGZpbGVzLgorCisgICAgICAgICogTmV0d29ya1By b2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0Nh Y2hlOjpDYWNoZTo6cmVjb3Jkc1BhdGgpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6 OkNhY2hlOjpzdG9yYWdlUGF0aCk6IERlbGV0ZWQuCisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mv Y2FjaGUvTmV0d29ya0NhY2hlLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0 d29ya0NhY2hlU3RhdGlzdGljcy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6 U3RhdGlzdGljczo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6 U3RhdGlzdGljczo6Ym9vdHN0cmFwRnJvbU5ldHdvcmtDYWNoZSk6CisgICAgICAgIChXZWJLaXQ6 Ok5ldHdvcmtDYWNoZTo6U3RhdGlzdGljczo6c2hyaW5rSWZOZWVkZWQpOgorCiAyMDE1LTA0LTE3 ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJl dmlld2VkLCByb2xsaW5nIG91dCByMTgyOTEyIGFuZCByMTgyOTIwLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcCBiL1NvdXJj ZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5jcHAKaW5kZXggNTJh ZjY0NTE1OTQ2ZTljNDBkZDE4ZTkwYzM1MzljOTk2NjI3Mzc2MC4uZmNkZWY2MDUxNWRmMmRkNDkx YWI5ODg2OTBjYTE3OWNjZWIzZjA2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29y a1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwCkBAIC00OTcsOSArNDk3LDkgQEAgdm9p ZCBDYWNoZTo6Y2xlYXIoKQogICAgICAgICBtX3N0YXRpc3RpY3MtPmNsZWFyKCk7CiB9CiAKLVN0 cmluZyBDYWNoZTo6c3RvcmFnZVBhdGgoKSBjb25zdAorU3RyaW5nIENhY2hlOjpyZWNvcmRzUGF0 aCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fc3RvcmFnZSA/IG1fc3RvcmFnZS0+dmVyc2lvblBh dGgoKSA6IFN0cmluZygpOworICAgIHJldHVybiBtX3N0b3JhZ2UgPyBtX3N0b3JhZ2UtPnJlY29y ZHNQYXRoKCkgOiBTdHJpbmcoKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv TmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmggYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuaAppbmRleCA5OTZjOGI1ZmQ2Y2M3ZWNiNWUz YmVlMTVjM2Q1MzI5MTk3NTc5N2I5Li5lNTA5NjhmMTc4N2JkNjk2NWNmOTUzYmFhNGYxZmJkYWQ1 NTBmMjdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9O ZXR3b3JrQ2FjaGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9O ZXR3b3JrQ2FjaGUuaApAQCAtMTAzLDcgKzEwMyw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgZHVt cENvbnRlbnRzVG9GaWxlKCk7CiAKLSAgICBTdHJpbmcgc3RvcmFnZVBhdGgoKSBjb25zdDsKKyAg ICBTdHJpbmcgcmVjb3Jkc1BhdGgoKSBjb25zdDsKIAogcHJpdmF0ZToKICAgICBDYWNoZSgpID0g ZGVmYXVsdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hl L05ldHdvcmtDYWNoZVN0YXRpc3RpY3MuY3BwIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nl c3MvY2FjaGUvTmV0d29ya0NhY2hlU3RhdGlzdGljcy5jcHAKaW5kZXggMWIwZjdiODI3MGNhZGY0 N2Q1Y2NmMTk0NjM5NDdmNDJmY2E5ZjAyZC4uZTAwZWUzNDZkNDdkYTc2OWNhMjM1NmVlNmVjMmNl MTc3ZjJjZTNkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2Fj aGUvTmV0d29ya0NhY2hlU3RhdGlzdGljcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29y a1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RhdGlzdGljcy5jcHAKQEAgLTk1LDcgKzk1LDcg QEAgdm9pZCBTdGF0aXN0aWNzOjppbml0aWFsaXplKGNvbnN0IFN0cmluZyYgZGF0YWJhc2VQYXRo KQogICAgIGF1dG8gc3RhcnRUaW1lID0gc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6bm93KCk7 CiAKICAgICBTdHJpbmdDYXB0dXJlIGRhdGFiYXNlUGF0aENhcHR1cmUoZGF0YWJhc2VQYXRoKTsK LSAgICBTdHJpbmdDYXB0dXJlIG5ldHdvcmtDYWNoZVBhdGhDYXB0dXJlKHNpbmdsZXRvbigpLnN0 b3JhZ2VQYXRoKCkpOworICAgIFN0cmluZ0NhcHR1cmUgbmV0d29ya0NhY2hlUGF0aENhcHR1cmUo c2luZ2xldG9uKCkucmVjb3Jkc1BhdGgoKSk7CiAgICAgc2VyaWFsQmFja2dyb3VuZElPUXVldWUo KS5kaXNwYXRjaChbdGhpcywgZGF0YWJhc2VQYXRoQ2FwdHVyZSwgbmV0d29ya0NhY2hlUGF0aENh cHR1cmUsIHN0YXJ0VGltZV0gewogICAgICAgICBXZWJDb3JlOjpTUUxpdGVUcmFuc2FjdGlvbklu UHJvZ3Jlc3NBdXRvQ291bnRlciB0cmFuc2FjdGlvbkNvdW50ZXI7CiAKQEAgLTE0NCw4ICsxNDQs MTIgQEAgdm9pZCBTdGF0aXN0aWNzOjpib290c3RyYXBGcm9tTmV0d29ya0NhY2hlKGNvbnN0IFN0 cmluZyYgbmV0d29ya0NhY2hlUGF0aCkKICAgICBMT0coTmV0d29ya0NhY2hlLCAiKE5ldHdvcmtQ cm9jZXNzKSBCb290c3RyYXBwaW5nIHRoZSBuZXR3b3JrIGNhY2hlIHN0YXRpc3RpY3MgZGF0YWJh c2UgZnJvbSB0aGUgbmV0d29yayBjYWNoZS4uLiIpOwogCiAgICAgVmVjdG9yPFN0cmluZ0NhcHR1 cmU+IGhhc2hlczsKLSAgICB0cmF2ZXJzZUNhY2hlRmlsZXMobmV0d29ya0NhY2hlUGF0aCwgWyZo YXNoZXNdKGNvbnN0IFN0cmluZyYgaGFzaCwgY29uc3QgU3RyaW5nJikgewotICAgICAgICBoYXNo ZXMuYXBwZW5kKGhhc2gpOworICAgIHRyYXZlcnNlQ2FjaGVGaWxlcyhuZXR3b3JrQ2FjaGVQYXRo LCBbJmhhc2hlc10oY29uc3QgU3RyaW5nJiBoYXNoU3RyaW5nLCBjb25zdCBTdHJpbmcmKSB7Cisg ICAgICAgIEtleTo6SGFzaFR5cGUgaGFzaDsKKyAgICAgICAgaWYgKCFLZXk6OnN0cmluZ1RvSGFz aChoYXNoU3RyaW5nLCBoYXNoKSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBoYXNo ZXMuYXBwZW5kKGhhc2hTdHJpbmcpOwogICAgIH0pOwogCiAgICAgV2ViQ29yZTo6U1FMaXRlVHJh bnNhY3Rpb25JblByb2dyZXNzQXV0b0NvdW50ZXIgdHJhbnNhY3Rpb25Db3VudGVyOwpAQCAtMTY5 LDcgKzE3Myw3IEBAIHZvaWQgU3RhdGlzdGljczo6c2hyaW5rSWZOZWVkZWQoKQogCiAgICAgY2xl YXIoKTsKIAotICAgIFN0cmluZ0NhcHR1cmUgbmV0d29ya0NhY2hlUGF0aENhcHR1cmUoc2luZ2xl dG9uKCkuc3RvcmFnZVBhdGgoKSk7CisgICAgU3RyaW5nQ2FwdHVyZSBuZXR3b3JrQ2FjaGVQYXRo Q2FwdHVyZShzaW5nbGV0b24oKS5yZWNvcmRzUGF0aCgpKTsKICAgICBzZXJpYWxCYWNrZ3JvdW5k SU9RdWV1ZSgpLmRpc3BhdGNoKFt0aGlzLCBuZXR3b3JrQ2FjaGVQYXRoQ2FwdHVyZV0gewogICAg ICAgICBib290c3RyYXBGcm9tTmV0d29ya0NhY2hlKG5ldHdvcmtDYWNoZVBhdGhDYXB0dXJlLnN0 cmluZygpKTsKICAgICAgICAgTE9HKE5ldHdvcmtDYWNoZSwgIihOZXR3b3JrUHJvY2Vzcykgc3Rh dGlzdGljcyBjYWNoZSBzaHJpbmsgY29tcGxldGVkIG1fYXBwcm94aW1hdGVFbnRyeUNvdW50PSVs dSIsIHN0YXRpY19jYXN0PHNpemVfdD4obV9hcHByb3hpbWF0ZUVudHJ5Q291bnQpKTsK