142546 2015-03-10 15:18:10 -0700 Add interface to delete disk cache entries 2015-03-10 21:09:27 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned andersca commit-queue oldest_to_newest 1076101 0 koivisto 2015-03-10 15:18:10 -0700 For Anders 1076104 1 248364 koivisto 2015-03-10 15:24:27 -0700 Created attachment 248364 patch 1076210 2 248364 commit-queue 2015-03-10 21:09:23 -0700 Comment on attachment 248364 patch Clearing flags on attachment: 248364 Committed r181364: <http://trac.webkit.org/changeset/181364> 1076211 3 commit-queue 2015-03-10 21:09:27 -0700 All reviewed patches have been landed. Closing bug. 248364 2015-03-10 15:24:27 -0700 2015-03-10 21:09:23 -0700 patch disk-cache-remove.patch text/plain 6481 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MTM0OCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE1LTAzLTEwICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgaW50ZXJmYWNlIHRvIGRl bGV0ZSBkaXNrIGNhY2hlIGVudHJpZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0MjU0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcDoK KyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpDYWNoZTo6cmVtb3ZlKToKKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuaDoKKyAgICAgICAgKiBOZXR3b3Jr UHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 TmV0d29ya0NhY2hlOjpTdG9yYWdlOjpTdG9yYWdlKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29y a0NhY2hlOjpTdG9yYWdlOjpyZW1vdmUpOgorCisgICAgICAgICAgICBNb3ZlIGRlbGV0aW9uIHRv IGEgc2VyaWFsIHF1ZXVlIHNvIHdlIGNhbid0IGNyZWF0ZSBsYXJnZSBudW1iZXIgb2YgdGhyZWFk cy4KKworICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlN0b3JhZ2U6OmRpc3BhdGNoUmVh ZE9wZXJhdGlvbik6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3RvcmFnZTo6ZGlz cGF0Y2hIZWFkZXJXcml0ZU9wZXJhdGlvbik6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNo ZTo6U3RvcmFnZTo6cmVtb3ZlRW50cnkpOiBEZWxldGVkLgorICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuaDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29y a0NhY2hlOjpTdG9yYWdlOjpkZWxldGVRdWV1ZSk6CisKIDIwMTUtMDMtMTAgIFRpbW90aHkgSG9y dG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCB0aGUgYnVpbGQK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0 d29ya0NhY2hlLmNwcAkocmV2aXNpb24gMTgxMzQ1KQorKysgU291cmNlL1dlYktpdDIvTmV0d29y a1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzczLDYg KzM3MywxMyBAQCB2b2lkIENhY2hlOjp1cGRhdGUoY29uc3QgV2ViQ29yZTo6UmVzb3VyCiAgICAg fSk7CiB9CiAKK3ZvaWQgQ2FjaGU6OnJlbW92ZShjb25zdCBFbnRyeSYgZW50cnkpCit7CisgICAg QVNTRVJUKGlzRW5hYmxlZCgpKTsKKworICAgIG1fc3RvcmFnZS0+cmVtb3ZlKGVudHJ5LnN0b3Jh Z2VFbnRyeS5rZXkpOworfQorCiB2b2lkIENhY2hlOjp0cmF2ZXJzZShzdGQ6OmZ1bmN0aW9uPHZv aWQgKGNvbnN0IEVudHJ5Kik+JiYgdHJhdmVyc2VIYW5kbGVyKQogewogICAgIEFTU0VSVChpc0Vu YWJsZWQoKSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3 b3JrQ2FjaGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9j YWNoZS9OZXR3b3JrQ2FjaGUuaAkocmV2aXNpb24gMTgxMzQ1KQorKysgU291cmNlL1dlYktpdDIv TmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEw Myw2ICsxMDMsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCB1cGRhdGUoY29uc3QgV2ViQ29yZTo6UmVz b3VyY2VSZXF1ZXN0JiwgY29uc3QgRW50cnkmLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3Bv bnNlJiB2YWxpZGF0aW5nUmVzcG9uc2UpOwogCiAgICAgdm9pZCB0cmF2ZXJzZShzdGQ6OmZ1bmN0 aW9uPHZvaWQgKGNvbnN0IEVudHJ5Kik+JiYpOworICAgIHZvaWQgcmVtb3ZlKGNvbnN0IEVudHJ5 Jik7CiAKICAgICB2b2lkIGNsZWFyKCk7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQ cm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuY3BwCShy ZXZpc2lvbiAxODEzNDUpCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9O ZXR3b3JrQ2FjaGVTdG9yYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjQsNyArNjQsOCBAQCBT dG9yYWdlOjpTdG9yYWdlKGNvbnN0IFN0cmluZyYgYmFzZURpcmVjCiAgICAgOiBtX2Jhc2VEaXJl Y3RvcnlQYXRoKGJhc2VEaXJlY3RvcnlQYXRoKQogICAgICwgbV9kaXJlY3RvcnlQYXRoKG1ha2VW ZXJzaW9uZWREaXJlY3RvcnlQYXRoKGJhc2VEaXJlY3RvcnlQYXRoKSkKICAgICAsIG1faW9RdWV1 ZShXb3JrUXVldWU6OmNyZWF0ZSgiY29tLmFwcGxlLldlYktpdC5DYWNoZS5TdG9yYWdlIiwgV29y a1F1ZXVlOjpUeXBlOjpDb25jdXJyZW50KSkKLSAgICAsIG1fYmFja2dyb3VuZElPUXVldWUoV29y a1F1ZXVlOjpjcmVhdGUoImNvbS5hcHBsZS5XZWJLaXQuQ2FjaGUuU3RvcmFnZSIsIFdvcmtRdWV1 ZTo6VHlwZTo6Q29uY3VycmVudCwgV29ya1F1ZXVlOjpRT1M6OkJhY2tncm91bmQpKQorICAgICwg bV9iYWNrZ3JvdW5kSU9RdWV1ZShXb3JrUXVldWU6OmNyZWF0ZSgiY29tLmFwcGxlLldlYktpdC5D YWNoZS5TdG9yYWdlLmJhY2tncm91bmQiLCBXb3JrUXVldWU6OlR5cGU6OkNvbmN1cnJlbnQsIFdv cmtRdWV1ZTo6UU9TOjpCYWNrZ3JvdW5kKSkKKyAgICAsIG1fZGVsZXRlUXVldWUoV29ya1F1ZXVl OjpjcmVhdGUoImNvbS5hcHBsZS5XZWJLaXQuQ2FjaGUuU3RvcmFnZS5kZWxldGUiLCBXb3JrUXVl dWU6OlR5cGU6OlNlcmlhbCwgV29ya1F1ZXVlOjpRT1M6OkJhY2tncm91bmQpKQogewogICAgIGRl bGV0ZU9sZFZlcnNpb25zKCk7CiAgICAgaW5pdGlhbGl6ZSgpOwpAQCAtMjYzLDE4ICsyNjQsMTgg QEAgc3RhdGljIERhdGEgZW5jb2RlRW50cnlIZWFkZXIoY29uc3QgU3RvcgogICAgIHJldHVybiBj b25jYXRlbmF0ZShoZWFkZXJEYXRhLCBhbGlnbm1lbnREYXRhKTsKIH0KIAotdm9pZCBTdG9yYWdl OjpyZW1vdmVFbnRyeShjb25zdCBLZXkmIGtleSkKK3ZvaWQgU3RvcmFnZTo6cmVtb3ZlKGNvbnN0 IEtleSYga2V5KQogewogICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CiAKLSAgICAvLyBG b3Igc2ltcGxpY2l0eSB3ZSBkb24ndCByZWR1Y2UgbV9hcHByb3hpbWF0ZVNpemUgb24gcmVtb3Zh bHMgY2F1c2VkIGJ5IGxvYWQgb3IgZGVjb2RlIGVycm9ycy4KKyAgICAvLyBGb3Igc2ltcGxpY2l0 eSB3ZSBkb24ndCByZWR1Y2UgbV9hcHByb3hpbWF0ZVNpemUgb24gcmVtb3ZhbHMuCiAgICAgLy8g VGhlIG5leHQgY2FjaGUgc2hyaW5rIHdpbGwgdXBkYXRlIHRoZSBzaXplLgogCiAgICAgaWYgKG1f Y29udGVudHNGaWx0ZXIubWF5Q29udGFpbihrZXkuc2hvcnRIYXNoKCkpKQogICAgICAgICBtX2Nv bnRlbnRzRmlsdGVyLnJlbW92ZShrZXkuc2hvcnRIYXNoKCkpOwogCiAgICAgU3RyaW5nQ2FwdHVy ZSBmaWxlUGF0aENhcHR1cmUoZmlsZVBhdGhGb3JLZXkoa2V5LCBtX2RpcmVjdG9yeVBhdGgpKTsK LSAgICBiYWNrZ3JvdW5kSU9RdWV1ZSgpLmRpc3BhdGNoKFt0aGlzLCBmaWxlUGF0aENhcHR1cmVd IHsKKyAgICBkZWxldGVRdWV1ZSgpLmRpc3BhdGNoKFt0aGlzLCBmaWxlUGF0aENhcHR1cmVdIHsK ICAgICAgICAgV2ViQ29yZTo6ZGVsZXRlRmlsZShmaWxlUGF0aENhcHR1cmUuc3RyaW5nKCkpOwog ICAgIH0pOwogfQpAQCAtMjkwLDEzICsyOTEsMTMgQEAgdm9pZCBTdG9yYWdlOjpkaXNwYXRjaFJl YWRPcGVyYXRpb24oY29ucwogICAgICAgICBpbnQgZmQgPSBjaGFubmVsLT5maWxlRGVzY3JpcHRv cigpOwogICAgICAgICBjaGFubmVsLT5yZWFkKDAsIHN0ZDo6bnVtZXJpY19saW1pdHM8c2l6ZV90 Pjo6bWF4KCksIFt0aGlzLCAmcmVhZCwgZmRdKERhdGEmIGZpbGVEYXRhLCBpbnQgZXJyb3IpIHsK ICAgICAgICAgICAgIGlmIChlcnJvcikgewotICAgICAgICAgICAgICAgIHJlbW92ZUVudHJ5KHJl YWQua2V5KTsKKyAgICAgICAgICAgICAgICByZW1vdmUocmVhZC5rZXkpOwogICAgICAgICAgICAg ICAgIHJlYWQuY29tcGxldGlvbkhhbmRsZXIobnVsbHB0cik7CiAgICAgICAgICAgICB9IGVsc2Ug ewogICAgICAgICAgICAgICAgIGF1dG8gZW50cnkgPSBkZWNvZGVFbnRyeShmaWxlRGF0YSwgZmQs IHJlYWQua2V5KTsKICAgICAgICAgICAgICAgICBib29sIHN1Y2Nlc3MgPSByZWFkLmNvbXBsZXRp b25IYW5kbGVyKFdURjo6bW92ZShlbnRyeSkpOwogICAgICAgICAgICAgICAgIGlmICghc3VjY2Vz cykKLSAgICAgICAgICAgICAgICAgICAgcmVtb3ZlRW50cnkocmVhZC5rZXkpOworICAgICAgICAg ICAgICAgICAgICByZW1vdmUocmVhZC5rZXkpOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAg ICBBU1NFUlQobV9hY3RpdmVSZWFkT3BlcmF0aW9ucy5jb250YWlucygmcmVhZCkpOwpAQCAtNTIw LDcgKzUyMSw3IEBAIHZvaWQgU3RvcmFnZTo6ZGlzcGF0Y2hIZWFkZXJXcml0ZU9wZXJhdGkKICAg ICAgICAgICAgIExPRyhOZXR3b3JrQ2FjaGVTdG9yYWdlLCAiKE5ldHdvcmtQcm9jZXNzKSB1cGRh dGUgY29tcGxldGUgZXJyb3I9JWQiLCBlcnJvcik7CiAKICAgICAgICAgICAgIGlmIChlcnJvcikK LSAgICAgICAgICAgICAgICByZW1vdmVFbnRyeSh3cml0ZS5lbnRyeS5rZXkpOworICAgICAgICAg ICAgICAgIHJlbW92ZSh3cml0ZS5lbnRyeS5rZXkpOwogCiAgICAgICAgICAgICB3cml0ZS5jb21w bGV0aW9uSGFuZGxlcighZXJyb3IsIHsgfSk7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL05ldHdv cmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmgJKHJl dmlzaW9uIDE4MTM0NSkKKysrIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05l dHdvcmtDYWNoZVN0b3JhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtNTksNiArNTksOCBAQCBwdWJs aWM6CiAgICAgdm9pZCBzdG9yZShjb25zdCBFbnRyeSYsIFN0b3JlQ29tcGxldGlvbkhhbmRsZXIm Jik7CiAgICAgdm9pZCB1cGRhdGUoY29uc3QgRW50cnkmIHVwZGF0ZUVudHJ5LCBjb25zdCBFbnRy eSYgZXhpc3RpbmdFbnRyeSwgU3RvcmVDb21wbGV0aW9uSGFuZGxlciYmKTsKIAorICAgIHZvaWQg cmVtb3ZlKGNvbnN0IEtleSYpOworCiAgICAgLy8gTnVsbCBlbnRyeSBzaWduYWxzIGVuZC4KICAg ICB2b2lkIHRyYXZlcnNlKHN0ZDo6ZnVuY3Rpb248dm9pZCAoY29uc3QgRW50cnkqKT4mJik7CiAK QEAgLTc3LDggKzc5LDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRlbGV0ZU9sZFZlcnNpb25zKCk7 CiAgICAgdm9pZCBzaHJpbmtJZk5lZWRlZCgpOwogCi0gICAgdm9pZCByZW1vdmVFbnRyeShjb25z dCBLZXkmKTsKLQogICAgIHN0cnVjdCBSZWFkT3BlcmF0aW9uIHsKICAgICAgICAgS2V5IGtleTsK ICAgICAgICAgUmV0cmlldmVDb21wbGV0aW9uSGFuZGxlciBjb21wbGV0aW9uSGFuZGxlcjsKQEAg LTk3LDYgKzk3LDcgQEAgcHJpdmF0ZToKIAogICAgIFdvcmtRdWV1ZSYgaW9RdWV1ZSgpIHsgcmV0 dXJuIG1faW9RdWV1ZS5nZXQoKTsgfQogICAgIFdvcmtRdWV1ZSYgYmFja2dyb3VuZElPUXVldWUo KSB7IHJldHVybiBtX2JhY2tncm91bmRJT1F1ZXVlLmdldCgpOyB9CisgICAgV29ya1F1ZXVlJiBk ZWxldGVRdWV1ZSgpIHsgcmV0dXJuIG1fZGVsZXRlUXVldWUuZ2V0KCk7IH0KIAogICAgIGNvbnN0 IFN0cmluZyBtX2Jhc2VEaXJlY3RvcnlQYXRoOwogICAgIGNvbnN0IFN0cmluZyBtX2RpcmVjdG9y eVBhdGg7CkBAIC0xMTYsNiArMTE3LDcgQEAgcHJpdmF0ZToKIAogICAgIFJlZjxXb3JrUXVldWU+ IG1faW9RdWV1ZTsKICAgICBSZWY8V29ya1F1ZXVlPiBtX2JhY2tncm91bmRJT1F1ZXVlOworICAg IFJlZjxXb3JrUXVldWU+IG1fZGVsZXRlUXVldWU7CiB9OwogCiB9Cg==