143418 2015-04-05 08:48:51 -0700 Rename Cache::setMaximumSize to setCapacity 2015-04-05 11:36:16 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned cdumez commit-queue oldest_to_newest 1082889 0 koivisto 2015-04-05 08:48:51 -0700 Use a less clunky name. 1082890 1 250157 koivisto 2015-04-05 08:51:01 -0700 Created attachment 250157 patch 1082903 2 250157 commit-queue 2015-04-05 11:36:12 -0700 Comment on attachment 250157 patch Clearing flags on attachment: 250157 Committed r182361: <http://trac.webkit.org/changeset/182361> 1082904 3 commit-queue 2015-04-05 11:36:16 -0700 All reviewed patches have been landed. Closing bug. 250157 2015-04-05 08:51:01 -0700 2015-04-05 11:36:12 -0700 patch disk-cache-capacity-rename.patch text/plain 7039 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MjM1OCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE1LTA0LTA1ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgQ2FjaGU6OnNldE1h eGltdW1TaXplIHRvIHNldENhcGFjaXR5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNDM0MTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5jcHA6 CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6Q2FjaGU6OnNldENhcGFjaXR5KToKKyAg ICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpDYWNoZTo6c2V0TWF4aW11bVNpemUpOiBEZWxl dGVkLgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5oOgorICAg ICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuY3BwOgorICAg ICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlN0b3JhZ2U6OnJldHJpZXZlKToKKyAgICAgICAg KFdlYktpdDo6TmV0d29ya0NhY2hlOjpTdG9yYWdlOjpzdG9yZSk6CisgICAgICAgIChXZWJLaXQ6 Ok5ldHdvcmtDYWNoZTo6U3RvcmFnZTo6dXBkYXRlKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29y a0NhY2hlOjpTdG9yYWdlOjpzZXRDYXBhY2l0eSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtD YWNoZTo6U3RvcmFnZTo6c2hyaW5rSWZOZWVkZWQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3Jr Q2FjaGU6OlN0b3JhZ2U6OnNocmluayk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6 U3RvcmFnZTo6c2V0TWF4aW11bVNpemUpOiBEZWxldGVkLgorICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9jb2NvYS9OZXR3b3JrUHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3Jr UHJvY2Vzczo6cGxhdGZvcm1TZXRDYWNoZU1vZGVsKToKKwogMjAxNS0wNC0wNCAgQW50dGkgS29p dmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgTmV0d29yayBjYWNoZSBCbG9vbSBm aWx0ZXIgaXMgdG9vIGJpZwpJbmRleDogU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2Fj aGUvTmV0d29ya0NhY2hlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3Jr UHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwCShyZXZpc2lvbiAxODIzNDIpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC03NiwxMSArNzYsMTEgQEAgYm9vbCBDYWNoZTo6aW5pdGlhbGl6ZShjb25zdCBT dHJpbmcmIGNhYwogICAgIHJldHVybiAhIW1fc3RvcmFnZTsKIH0KIAotdm9pZCBDYWNoZTo6c2V0 TWF4aW11bVNpemUoc2l6ZV90IG1heGltdW1TaXplKQordm9pZCBDYWNoZTo6c2V0Q2FwYWNpdHko c2l6ZV90IG1heGltdW1TaXplKQogewogICAgIGlmICghbV9zdG9yYWdlKQogICAgICAgICByZXR1 cm47Ci0gICAgbV9zdG9yYWdlLT5zZXRNYXhpbXVtU2l6ZShtYXhpbXVtU2l6ZSk7CisgICAgbV9z dG9yYWdlLT5zZXRDYXBhY2l0eShtYXhpbXVtU2l6ZSk7CiB9CiAKIHN0YXRpYyBLZXkgbWFrZUNh Y2hlS2V5KGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKSW5kZXg6IFNv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5o CShyZXZpc2lvbiAxODIzNDIpCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNo ZS9OZXR3b3JrQ2FjaGUuaAkod29ya2luZyBjb3B5KQpAQCAtODcsNyArODcsNyBAQCBjbGFzcyBD YWNoZSB7CiAgICAgZnJpZW5kIGNsYXNzIFdURjo6TmV2ZXJEZXN0cm95ZWQ8Q2FjaGU+OwogcHVi bGljOgogICAgIGJvb2wgaW5pdGlhbGl6ZShjb25zdCBTdHJpbmcmIGNhY2hlUGF0aCwgYm9vbCBl bmFibGVFZmZpY2FjeUxvZ2dpbmcpOwotICAgIHZvaWQgc2V0TWF4aW11bVNpemUoc2l6ZV90KTsK KyAgICB2b2lkIHNldENhcGFjaXR5KHNpemVfdCk7CiAKICAgICBib29sIGlzRW5hYmxlZCgpIGNv bnN0IHsgcmV0dXJuICEhbV9zdG9yYWdlOyB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL05ldHdv cmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuY3Bw CShyZXZpc2lvbiAxODIzNTcpCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNo ZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDE5LDcgKzQxOSw3 IEBAIHZvaWQgU3RvcmFnZTo6cmV0cmlldmUoY29uc3QgS2V5JiBrZXksIHUKICAgICBBU1NFUlQo cHJpb3JpdHkgPD0gbWF4aW11bVJldHJpZXZlUHJpb3JpdHkpOwogICAgIEFTU0VSVCgha2V5Lmlz TnVsbCgpKTsKIAotICAgIGlmICghbV9tYXhpbXVtU2l6ZSkgeworICAgIGlmICghbV9jYXBhY2l0 eSkgewogICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihudWxscHRyKTsKICAgICAgICAgcmV0dXJu OwogICAgIH0KQEAgLTQ0Myw3ICs0NDMsNyBAQCB2b2lkIFN0b3JhZ2U6OnN0b3JlKGNvbnN0IFJl Y29yZCYgcmVjb3JkCiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKICAgICBBU1NFUlQo IXJlY29yZC5rZXkuaXNOdWxsKCkpOwogCi0gICAgaWYgKCFtX21heGltdW1TaXplKSB7CisgICAg aWYgKCFtX2NhcGFjaXR5KSB7CiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKGZhbHNlLCB7IH0p OwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtNDYyLDcgKzQ2Miw3IEBAIHZvaWQgU3RvcmFn ZTo6dXBkYXRlKGNvbnN0IFJlY29yZCYgdXBkYXQKICAgICBBU1NFUlQoIWV4aXN0aW5nUmVjb3Jk LmtleS5pc051bGwoKSk7CiAgICAgQVNTRVJUKGV4aXN0aW5nUmVjb3JkLmtleSA9PSB1cGRhdGVS ZWNvcmQua2V5KTsKIAotICAgIGlmICghbV9tYXhpbXVtU2l6ZSkgeworICAgIGlmICghbV9jYXBh Y2l0eSkgewogICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihmYWxzZSwgeyB9KTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KQEAgLTYwNCwyMCArNjA0LDIwIEBAIHZvaWQgU3RvcmFnZTo6ZGlzcGF0 Y2hIZWFkZXJXcml0ZU9wZXJhdGkKICAgICB9KTsKIH0KIAotdm9pZCBTdG9yYWdlOjpzZXRNYXhp bXVtU2l6ZShzaXplX3Qgc2l6ZSkKK3ZvaWQgU3RvcmFnZTo6c2V0Q2FwYWNpdHkoc2l6ZV90IGNh cGFjaXR5KQogewogICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CiAKICNpZiAhQVNTRVJU X0RJU0FCTEVECiAgICAgY29uc3Qgc2l6ZV90IGFzc3VtZWRBdmVyYWdlUmVjb3JkU2l6ZSA9IDUw IDw8IDIwOwotICAgIHNpemVfdCBtYXhpbXVtUmVjb3JkQ291bnQgPSBzaXplIC8gYXNzdW1lZEF2 ZXJhZ2VSZWNvcmRTaXplOworICAgIHNpemVfdCBtYXhpbXVtUmVjb3JkQ291bnQgPSBjYXBhY2l0 eSAvIGFzc3VtZWRBdmVyYWdlUmVjb3JkU2l6ZTsKICAgICAvLyB+MTAgYml0cyBwZXIgZWxlbWVu dCBhcmUgcmVxdWlyZWQgZm9yIDwxJSBmYWxzZSBwb3NpdGl2ZSByYXRlLgogICAgIHNpemVfdCBl ZmZlY3RpdmVCbG9vbUZpbHRlckNhcGFjaXR5ID0gQ29udGVudHNGaWx0ZXI6OnRhYmxlU2l6ZSAv IDEwOwogICAgIC8vIElmIHRoaXMgZ2V0cyBoaXQgaXQgbWlnaHQgYmUgdGltZSB0byBpbmNyZWFz ZSB0aGUgZmlsdGVyIHNpemUuCiAgICAgQVNTRVJUKG1heGltdW1SZWNvcmRDb3VudCA8IGVmZmVj dGl2ZUJsb29tRmlsdGVyQ2FwYWNpdHkpOwogI2VuZGlmCiAKLSAgICBtX21heGltdW1TaXplID0g c2l6ZTsKKyAgICBtX2NhcGFjaXR5ID0gY2FwYWNpdHk7CiAKICAgICBzaHJpbmtJZk5lZWRlZCgp OwogfQpAQCAtNjc3LDcgKzY3Nyw3IEBAIHZvaWQgU3RvcmFnZTo6c2hyaW5rSWZOZWVkZWQoKQog ewogICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CiAKLSAgICBpZiAobV9hcHByb3hpbWF0 ZVNpemUgPiBtX21heGltdW1TaXplKQorICAgIGlmIChtX2FwcHJveGltYXRlU2l6ZSA+IG1fY2Fw YWNpdHkpCiAgICAgICAgIHNocmluaygpOwogfQogCkBAIC02ODksNyArNjg5LDcgQEAgdm9pZCBT dG9yYWdlOjpzaHJpbmsoKQogICAgICAgICByZXR1cm47CiAgICAgbV9zaHJpbmtJblByb2dyZXNz ID0gdHJ1ZTsKIAotICAgIExPRyhOZXR3b3JrQ2FjaGVTdG9yYWdlLCAiKE5ldHdvcmtQcm9jZXNz KSBzaHJpbmtpbmcgY2FjaGUgYXBwcm94aW1hdGVTaXplPSV6dSwgbV9tYXhpbXVtU2l6ZT0lenUi LCBzdGF0aWNfY2FzdDxzaXplX3Q+KG1fYXBwcm94aW1hdGVTaXplKSwgbV9tYXhpbXVtU2l6ZSk7 CisgICAgTE9HKE5ldHdvcmtDYWNoZVN0b3JhZ2UsICIoTmV0d29ya1Byb2Nlc3MpIHNocmlua2lu ZyBjYWNoZSBhcHByb3hpbWF0ZVNpemU9JXp1IGNhcGFjaXR5PSV6dSIsIHN0YXRpY19jYXN0PHNp emVfdD4obV9hcHByb3hpbWF0ZVNpemUpLCBtX2NhcGFjaXR5KTsKIAogICAgIFN0cmluZ0NhcHR1 cmUgY2FjaGVQYXRoQ2FwdHVyZShtX2RpcmVjdG9yeVBhdGgpOwogICAgIGJhY2tncm91bmRJT1F1 ZXVlKCkuZGlzcGF0Y2goW3RoaXMsIGNhY2hlUGF0aENhcHR1cmVdIHsKSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVT dG9yYWdlLmgJKHJldmlzaW9uIDE4MjM1NykKKysrIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9j ZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtNzQsNyAr NzQsNyBAQCBwdWJsaWM6CiAgICAgLy8gTnVsbCByZWNvcmQgc2lnbmFscyBlbmQuCiAgICAgdm9p ZCB0cmF2ZXJzZShUcmF2ZXJzZUZsYWdzLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKGNvbnN0IFJlY29y ZCosIGNvbnN0IFJlY29yZEluZm8mKT4mJik7CiAKLSAgICB2b2lkIHNldE1heGltdW1TaXplKHNp emVfdCk7CisgICAgdm9pZCBzZXRDYXBhY2l0eShzaXplX3QpOwogICAgIHZvaWQgY2xlYXIoKTsK IAogICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCB2ZXJzaW9uID0gMjsKQEAgLTExNCwxNiArMTE0 LDE2IEBAIHByaXZhdGU6CiAKICAgICBib29sIG1heUNvbnRhaW4oY29uc3QgS2V5JikgY29uc3Q7 CiAKLSAgICAvLyAyXjE4IGJpdCBmaWx0ZXIgY2FuIHN1cHBvcnQgdXAgdG8gMjYwMDAgZW50cmll cyB3aXRoIGZhbHNlIHBvc2l0aXZlIHJhdGUgPCAxJS4KLSAgICB1c2luZyBDb250ZW50c0ZpbHRl ciA9IEJsb29tRmlsdGVyPDE4PjsKICAgICB2b2lkIGFkZFRvQ29udGVudHNGaWx0ZXIoY29uc3Qg S2V5Jik7CiAKICAgICBjb25zdCBTdHJpbmcgbV9iYXNlRGlyZWN0b3J5UGF0aDsKICAgICBjb25z dCBTdHJpbmcgbV9kaXJlY3RvcnlQYXRoOwogCi0gICAgc2l6ZV90IG1fbWF4aW11bVNpemUgeyBz dGQ6Om51bWVyaWNfbGltaXRzPHNpemVfdD46Om1heCgpIH07CisgICAgc2l6ZV90IG1fY2FwYWNp dHkgeyBzdGQ6Om51bWVyaWNfbGltaXRzPHNpemVfdD46Om1heCgpIH07CiAgICAgc2l6ZV90IG1f YXBwcm94aW1hdGVTaXplIHsgMCB9OwogCisgICAgLy8gMl4xOCBiaXQgZmlsdGVyIGNhbiBzdXBw b3J0IHVwIHRvIDI2MDAwIGVudHJpZXMgd2l0aCBmYWxzZSBwb3NpdGl2ZSByYXRlIDwgMSUuCisg ICAgdXNpbmcgQ29udGVudHNGaWx0ZXIgPSBCbG9vbUZpbHRlcjwxOD47CiAgICAgc3RkOjp1bmlx dWVfcHRyPENvbnRlbnRzRmlsdGVyPiBtX2NvbnRlbnRzRmlsdGVyOwogCiAgICAgYm9vbCBtX3N5 bmNocm9uaXphdGlvbkluUHJvZ3Jlc3MgeyBmYWxzZSB9OwpJbmRleDogU291cmNlL1dlYktpdDIv TmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Byb2Nlc3NDb2NvYS5tbQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrUHJvY2Vzc0NvY29h Lm1tCShyZXZpc2lvbiAxODIzNDIpCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9j b2NvYS9OZXR3b3JrUHJvY2Vzc0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xNDMsNyArMTQz LDcgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6cGxhdGZvcm1TZXRDYWNoZU1vZAogI2lmIEVOQUJM RShORVRXT1JLX0NBQ0hFKQogICAgIGF1dG8mIG5ldHdvcmtDYWNoZSA9IE5ldHdvcmtDYWNoZTo6 c2luZ2xldG9uKCk7CiAgICAgaWYgKG5ldHdvcmtDYWNoZS5pc0VuYWJsZWQoKSkgewotICAgICAg ICBuZXR3b3JrQ2FjaGUuc2V0TWF4aW11bVNpemUodXJsQ2FjaGVEaXNrQ2FwYWNpdHkpOworICAg ICAgICBuZXR3b3JrQ2FjaGUuc2V0Q2FwYWNpdHkodXJsQ2FjaGVEaXNrQ2FwYWNpdHkpOwogICAg ICAgICByZXR1cm47CiAgICAgfQogI2VuZGlmCg==