144146 2015-04-24 05:51:58 -0700 Network Cache: Make path functions members 2015-04-24 21:40:30 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned cgarcia commit-queue mcatanzaro oldest_to_newest 1088216 0 koivisto 2015-04-24 05:51:58 -0700 refactor 1088217 1 251547 koivisto 2015-04-24 05:57:37 -0700 Created attachment 251547 patch 1088223 2 251547 commit-queue 2015-04-24 07:40:40 -0700 Comment on attachment 251547 patch Clearing flags on attachment: 251547 Committed r183263: <http://trac.webkit.org/changeset/183263> 251547 2015-04-24 05:57:37 -0700 2015-04-24 07:40:40 -0700 patch disk-cache-key-functions.patch text/plain 6542 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MzI2MikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE1LTA0LTI0ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBOZXR3b3JrIENhY2hlOiBNYWtl IHBhdGggZnVuY3Rpb25zIG1lbWJlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0NDE0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoaXMgc2ltcGxpZmllcyB0aGUgY29kZS4KKworICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuY3BwOgorICAgICAgICAoV2Vi S2l0OjpOZXR3b3JrQ2FjaGU6OlN0b3JhZ2U6OnBhcnRpdGlvblBhdGhGb3JLZXkpOgorICAgICAg ICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlN0b3JhZ2U6OnJlY29yZFBhdGhGb3JLZXkpOgorICAg ICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlN0b3JhZ2U6OmJvZHlQYXRoRm9yS2V5KToKKyAg ICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpTdG9yYWdlOjpzdG9yZUJvZHlBc0Jsb2IpOgor ICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlN0b3JhZ2U6OnJlbW92ZSk6CisgICAgICAg IChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3RvcmFnZTo6ZGlzcGF0Y2hSZWFkT3BlcmF0aW9uKToK KyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpTdG9yYWdlOjpmaW5pc2hSZWFkT3BlcmF0 aW9uKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpTdG9yYWdlOjpkaXNwYXRjaFdy aXRlT3BlcmF0aW9uKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpwYXJ0aXRpb25Q YXRoRm9yS2V5KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpyZWNv cmRQYXRoRm9yS2V5KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpi b2R5UGF0aEZvcktleSk6IERlbGV0ZWQuCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUv TmV0d29ya0NhY2hlU3RvcmFnZS5oOgorCiAyMDE1LTA0LTI0ICBDYXJsb3MgR2FyY2lhIENhbXBv cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBSZW1vdmUgaW5j b3JyZWN0IGFzc2VydCBhZnRlciByMTgzMTg5LgpJbmRleDogU291cmNlL1dlYktpdDIvTmV0d29y a1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5jcHAJ KHJldmlzaW9uIDE4MzI1OSkKKysrIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hl L05ldHdvcmtDYWNoZVN0b3JhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTIsMTAgKzE5Miwx MCBAQCBib29sIFN0b3JhZ2U6Om1heUNvbnRhaW4oY29uc3QgS2V5JiBrZXkpCiAgICAgcmV0dXJu ICFtX3JlY29yZEZpbHRlciB8fCBtX3JlY29yZEZpbHRlci0+bWF5Q29udGFpbihrZXkuaGFzaCgp KTsKIH0KIAotc3RhdGljIFN0cmluZyBwYXJ0aXRpb25QYXRoRm9yS2V5KGNvbnN0IEtleSYga2V5 LCBjb25zdCBTdHJpbmcmIGNhY2hlUGF0aCkKK1N0cmluZyBTdG9yYWdlOjpwYXJ0aXRpb25QYXRo Rm9yS2V5KGNvbnN0IEtleSYga2V5KSBjb25zdAogewogICAgIEFTU0VSVCgha2V5LnBhcnRpdGlv bigpLmlzRW1wdHkoKSk7Ci0gICAgcmV0dXJuIFdlYkNvcmU6OnBhdGhCeUFwcGVuZGluZ0NvbXBv bmVudChjYWNoZVBhdGgsIGtleS5wYXJ0aXRpb24oKSk7CisgICAgcmV0dXJuIFdlYkNvcmU6OnBh dGhCeUFwcGVuZGluZ0NvbXBvbmVudChyZWNvcmRzUGF0aCgpLCBrZXkucGFydGl0aW9uKCkpOwog fQogCiBzdGF0aWMgU3RyaW5nIGZpbGVOYW1lRm9yS2V5KGNvbnN0IEtleSYga2V5KQpAQCAtMjAz LDkgKzIwMyw5IEBAIHN0YXRpYyBTdHJpbmcgZmlsZU5hbWVGb3JLZXkoY29uc3QgS2V5JiAKICAg ICByZXR1cm4ga2V5Lmhhc2hBc1N0cmluZygpOwogfQogCi1zdGF0aWMgU3RyaW5nIHJlY29yZFBh dGhGb3JLZXkoY29uc3QgS2V5JiBrZXksIGNvbnN0IFN0cmluZyYgY2FjaGVQYXRoKQorU3RyaW5n IFN0b3JhZ2U6OnJlY29yZFBhdGhGb3JLZXkoY29uc3QgS2V5JiBrZXkpIGNvbnN0CiB7Ci0gICAg cmV0dXJuIFdlYkNvcmU6OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChwYXJ0aXRpb25QYXRoRm9y S2V5KGtleSwgY2FjaGVQYXRoKSwgZmlsZU5hbWVGb3JLZXkoa2V5KSk7CisgICAgcmV0dXJuIFdl YkNvcmU6OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChwYXJ0aXRpb25QYXRoRm9yS2V5KGtleSks IGZpbGVOYW1lRm9yS2V5KGtleSkpOwogfQogCiBzdGF0aWMgU3RyaW5nIGJvZHlQYXRoRm9yUmVj b3JkUGF0aChjb25zdCBTdHJpbmcmIHJlY29yZFBhdGgpCkBAIC0yMTMsOSArMjEzLDkgQEAgc3Rh dGljIFN0cmluZyBib2R5UGF0aEZvclJlY29yZFBhdGgoY29ucwogICAgIHJldHVybiByZWNvcmRQ YXRoICsgYm9keVBvc3RmaXg7CiB9CiAKLXN0YXRpYyBTdHJpbmcgYm9keVBhdGhGb3JLZXkoY29u c3QgS2V5JiBrZXksIGNvbnN0IFN0cmluZyYgY2FjaGVQYXRoKQorU3RyaW5nIFN0b3JhZ2U6OmJv ZHlQYXRoRm9yS2V5KGNvbnN0IEtleSYga2V5KSBjb25zdAogewotICAgIHJldHVybiBib2R5UGF0 aEZvclJlY29yZFBhdGgocmVjb3JkUGF0aEZvcktleShrZXksIGNhY2hlUGF0aCkpOworICAgIHJl dHVybiBib2R5UGF0aEZvclJlY29yZFBhdGgocmVjb3JkUGF0aEZvcktleShrZXkpKTsKIH0KIAog c3RhdGljIHVuc2lnbmVkIGhhc2hEYXRhKGNvbnN0IERhdGEmIGRhdGEpCkBAIC0zNTMsNyArMzUz LDcgQEAgc3RhdGljIERhdGEgZW5jb2RlUmVjb3JkTWV0YURhdGEoY29uc3QgUgogCiBPcHRpb25h bDxCbG9iU3RvcmFnZTo6QmxvYj4gU3RvcmFnZTo6c3RvcmVCb2R5QXNCbG9iKGNvbnN0IFJlY29y ZCYgcmVjb3JkLCBjb25zdCBNYXBwZWRCb2R5SGFuZGxlciYgbWFwcGVkQm9keUhhbmRsZXIpCiB7 Ci0gICAgYXV0byBib2R5UGF0aCA9IGJvZHlQYXRoRm9yS2V5KHJlY29yZC5rZXksIHJlY29yZHNQ YXRoKCkpOworICAgIGF1dG8gYm9keVBhdGggPSBib2R5UGF0aEZvcktleShyZWNvcmQua2V5KTsK IAogICAgIC8vIFN0b3JlIHRoZSBib2R5LgogICAgIGF1dG8gYmxvYiA9IG1fYmxvYlN0b3JhZ2Uu YWRkKGJvZHlQYXRoLCByZWNvcmQuYm9keSk7CkBAIC00MDQsOSArNDA0LDggQEAgdm9pZCBTdG9y YWdlOjpyZW1vdmUoY29uc3QgS2V5JiBrZXkpCiAgICAgLy8gVGhlIG5leHQgc3luY2hyb25pemF0 aW9uIHdpbGwgdXBkYXRlIGV2ZXJ5dGhpbmcuCiAKICAgICBzZXJpYWxCYWNrZ3JvdW5kSU9RdWV1 ZSgpLmRpc3BhdGNoKFt0aGlzLCBrZXldIHsKLSAgICAgICAgYXV0byByZWNvcmRzUGF0aCA9IHRo aXMtPnJlY29yZHNQYXRoKCk7Ci0gICAgICAgIFdlYkNvcmU6OmRlbGV0ZUZpbGUocmVjb3JkUGF0 aEZvcktleShrZXksIHJlY29yZHNQYXRoKSk7Ci0gICAgICAgIG1fYmxvYlN0b3JhZ2UucmVtb3Zl KGJvZHlQYXRoRm9yS2V5KGtleSwgcmVjb3Jkc1BhdGgpKTsKKyAgICAgICAgV2ViQ29yZTo6ZGVs ZXRlRmlsZShyZWNvcmRQYXRoRm9yS2V5KGtleSkpOworICAgICAgICBtX2Jsb2JTdG9yYWdlLnJl bW92ZShib2R5UGF0aEZvcktleShrZXkpKTsKICAgICB9KTsKIH0KIApAQCAtNDIzLDcgKzQyMiw3 IEBAIHZvaWQgU3RvcmFnZTo6ZGlzcGF0Y2hSZWFkT3BlcmF0aW9uKFJlYWQKICAgICBBU1NFUlQo UnVuTG9vcDo6aXNNYWluKCkpOwogICAgIEFTU0VSVChtX2FjdGl2ZVJlYWRPcGVyYXRpb25zLmNv bnRhaW5zKCZyZWFkT3BlcmF0aW9uKSk7CiAKLSAgICBhdXRvIHJlY29yZFBhdGggPSByZWNvcmRQ YXRoRm9yS2V5KHJlYWRPcGVyYXRpb24ua2V5LCByZWNvcmRzUGF0aCgpKTsKKyAgICBhdXRvIHJl Y29yZFBhdGggPSByZWNvcmRQYXRoRm9yS2V5KHJlYWRPcGVyYXRpb24ua2V5KTsKIAogICAgIFJl ZlB0cjxJT0NoYW5uZWw+IGNoYW5uZWwgPSBJT0NoYW5uZWw6Om9wZW4ocmVjb3JkUGF0aCwgSU9D aGFubmVsOjpUeXBlOjpSZWFkKTsKICAgICBjaGFubmVsLT5yZWFkKDAsIHN0ZDo6bnVtZXJpY19s aW1pdHM8c2l6ZV90Pjo6bWF4KCksICZpb1F1ZXVlKCksIFt0aGlzLCAmcmVhZE9wZXJhdGlvbl0o Y29uc3QgRGF0YSYgZmlsZURhdGEsIGludCBlcnJvcikgewpAQCAtNDQwLDcgKzQzOSw3IEBAIHZv aWQgU3RvcmFnZTo6ZGlzcGF0Y2hSZWFkT3BlcmF0aW9uKFJlYWQKIAogICAgIC8vIFJlYWQgdGhl IGJvZHkgYmxvYiBpbiBwYXJhbGxlbCB3aXRoIHRoZSByZWNvcmQgcmVhZC4KICAgICBpb1F1ZXVl KCkuZGlzcGF0Y2goW3RoaXMsICZyZWFkT3BlcmF0aW9uXSB7Ci0gICAgICAgIGF1dG8gYm9keVBh dGggPSBib2R5UGF0aEZvcktleShyZWFkT3BlcmF0aW9uLmtleSwgdGhpcy0+cmVjb3Jkc1BhdGgo KSk7CisgICAgICAgIGF1dG8gYm9keVBhdGggPSBib2R5UGF0aEZvcktleShyZWFkT3BlcmF0aW9u LmtleSk7CiAgICAgICAgIHJlYWRPcGVyYXRpb24ucmVzdWx0Qm9keUJsb2IgPSBtX2Jsb2JTdG9y YWdlLmdldChib2R5UGF0aCk7CiAgICAgICAgIGZpbmlzaFJlYWRPcGVyYXRpb24ocmVhZE9wZXJh dGlvbik7CiAgICAgfSk7CkBAIC00NjMsNyArNDYyLDcgQEAgdm9pZCBTdG9yYWdlOjpmaW5pc2hS ZWFkT3BlcmF0aW9uKFJlYWRPcAogCiAgICAgICAgIGJvb2wgc3VjY2VzcyA9IHJlYWRPcGVyYXRp b24uY29tcGxldGlvbkhhbmRsZXIoV1RGOjptb3ZlKHJlYWRPcGVyYXRpb24ucmVzdWx0UmVjb3Jk KSk7CiAgICAgICAgIGlmIChzdWNjZXNzKQotICAgICAgICAgICAgdXBkYXRlRmlsZU1vZGlmaWNh dGlvblRpbWUocmVjb3JkUGF0aEZvcktleShyZWFkT3BlcmF0aW9uLmtleSwgcmVjb3Jkc1BhdGgo KSkpOworICAgICAgICAgICAgdXBkYXRlRmlsZU1vZGlmaWNhdGlvblRpbWUocmVjb3JkUGF0aEZv cktleShyZWFkT3BlcmF0aW9uLmtleSkpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICByZW1v dmUocmVhZE9wZXJhdGlvbi5rZXkpOwogICAgICAgICBBU1NFUlQobV9hY3RpdmVSZWFkT3BlcmF0 aW9ucy5jb250YWlucygmcmVhZE9wZXJhdGlvbikpOwpAQCAtNTQ0LDkgKzU0Myw4IEBAIHZvaWQg U3RvcmFnZTo6ZGlzcGF0Y2hXcml0ZU9wZXJhdGlvbihjb24KICAgICBhZGRUb1JlY29yZEZpbHRl cih3cml0ZU9wZXJhdGlvbi5yZWNvcmQua2V5KTsKIAogICAgIGJhY2tncm91bmRJT1F1ZXVlKCku ZGlzcGF0Y2goW3RoaXMsICZ3cml0ZU9wZXJhdGlvbl0gewotICAgICAgICBhdXRvIHJlY29yZHNQ YXRoID0gdGhpcy0+cmVjb3Jkc1BhdGgoKTsKLSAgICAgICAgYXV0byBwYXJ0aXRpb25QYXRoID0g cGFydGl0aW9uUGF0aEZvcktleSh3cml0ZU9wZXJhdGlvbi5yZWNvcmQua2V5LCByZWNvcmRzUGF0 aCk7Ci0gICAgICAgIGF1dG8gcmVjb3JkUGF0aCA9IHJlY29yZFBhdGhGb3JLZXkod3JpdGVPcGVy YXRpb24ucmVjb3JkLmtleSwgcmVjb3Jkc1BhdGgpOworICAgICAgICBhdXRvIHBhcnRpdGlvblBh dGggPSBwYXJ0aXRpb25QYXRoRm9yS2V5KHdyaXRlT3BlcmF0aW9uLnJlY29yZC5rZXkpOworICAg ICAgICBhdXRvIHJlY29yZFBhdGggPSByZWNvcmRQYXRoRm9yS2V5KHdyaXRlT3BlcmF0aW9uLnJl Y29yZC5rZXkpOwogCiAgICAgICAgIFdlYkNvcmU6Om1ha2VBbGxEaXJlY3RvcmllcyhwYXJ0aXRp b25QYXRoKTsKIApJbmRleDogU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0 d29ya0NhY2hlU3RvcmFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQ cm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuaAkocmV2aXNpb24gMTgzMjU5KQorKysg U291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5o CSh3b3JraW5nIGNvcHkpCkBAIC05MCw2ICs5MCwxMCBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAg IFN0b3JhZ2UoY29uc3QgU3RyaW5nJiBkaXJlY3RvcnlQYXRoKTsKIAorICAgIFN0cmluZyBwYXJ0 aXRpb25QYXRoRm9yS2V5KGNvbnN0IEtleSYpIGNvbnN0OworICAgIFN0cmluZyByZWNvcmRQYXRo Rm9yS2V5KGNvbnN0IEtleSYpIGNvbnN0OworICAgIFN0cmluZyBib2R5UGF0aEZvcktleShjb25z dCBLZXkmKSBjb25zdDsKKwogICAgIHZvaWQgc3luY2hyb25pemUoKTsKICAgICB2b2lkIGRlbGV0 ZU9sZFZlcnNpb25zKCk7CiAgICAgdm9pZCBzaHJpbmtJZk5lZWRlZCgpOwo=