141359 2015-02-07 11:10:06 -0800 Use ResourceLoadPriority type in the NetworkCache code 2015-02-11 11:30:48 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 1 cdumez cdumez koivisto oldest_to_newest 1067541 0 cdumez 2015-02-07 11:10:06 -0800 Use ResourceLoadPriority type in the NetworkCache code and rely on ResourceLoadPriorityHighest value instead of hard-coding a new maximumRetrievePriority constant. This seems a bit more robust. 1067543 1 246211 cdumez 2015-02-07 11:11:59 -0800 Created attachment 246211 Patch 1067560 2 246211 koivisto 2015-02-07 13:32:09 -0800 Comment on attachment 246211 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=246211&action=review > Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h:148 > - void retrieve(const NetworkCacheKey&, unsigned priority, RetrieveCompletionHandler&&); > + void retrieve(const NetworkCacheKey&, WebCore::ResourceLoadPriority, RetrieveCompletionHandler&&); While in principle a good idea I'm trying establish a layering where the storage layer does not know anything about resources or related concepts. The way to do this cleanly would be to have NetworkCacheStorage::setMaximumPriority (or constructor argument) and call it from the NetworkCache. 246211 2015-02-07 11:11:59 -0800 2015-02-07 13:32:46 -0800 Patch bug-141359-20150207111159.patch text/plain 5228 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc5Nzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjQzMmE0NDFmYzUzODk4 OGVmYWEzMDQ4MjNhYmFhYzY3NTcxOTRlMi4uOWI3YjAyOGRhNjFlYjYwYjZkMzdlZmI5MjMwMDE1 MTRjZTFjODNjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1LTAyLTA3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIFJlc291cmNlTG9hZFBy aW9yaXR5IHR5cGUgaW4gdGhlIE5ldHdvcmtDYWNoZSBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDEzNTkKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgUmVzb3VyY2VMb2FkUHJpb3JpdHkgdHlw ZSBpbiB0aGUgTmV0d29ya0NhY2hlIGNvZGUgYW5kIHJlbHkgb24KKyAgICAgICAgUmVzb3VyY2VM b2FkUHJpb3JpdHlIaWdoZXN0IHZhbHVlIGluc3RlYWQgb2YgaGFyZC1jb2RpbmcgYSBuZXcKKyAg ICAgICAgbWF4aW11bVJldHJpZXZlUHJpb3JpdHkgY29uc3RhbnQuIFRoaXMgc2VlbXMgYSBiaXQg bW9yZSByb2J1c3QuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2Fj aGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OnJldHJpZXZlKToKKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmg6CisgICAgICAg ICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZUNvY29hLm1tOgorICAg ICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGVTdG9yYWdlOjpkaXNwYXRjaFBlbmRpbmdSZXRyaWV2 ZU9wZXJhdGlvbnMpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGVTdG9yYWdlOjpyZXRy aWV2ZSk6CisKIDIwMTUtMDItMDYgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAog ICAgICAgICBIYXZlIFNRTGl0ZVN0YXRlbWVudDo6ZGF0YWJhc2UoKSByZXR1cm4gYSByZWZlcmVu Y2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdv cmtDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3Jr Q2FjaGUuY3BwCmluZGV4IDY2YjY0NzliNDk5YWZjMjI5NjRkNWQwMGM4NDBkMTdiYmQ5MTFhNjMu LjZiODUwMTgyNmNjNDZjYWQwNTg3Y2FiOTM3M2I5MDQ1MTY4ZTNiOTggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcApAQCAt MjI3LDcgKzIyNyw3IEBAIHZvaWQgTmV0d29ya0NhY2hlOjpyZXRyaWV2ZShjb25zdCBXZWJDb3Jl OjpSZXNvdXJjZVJlcXVlc3QmIG9yaWdpbmFsUmVxdWVzdCwgc3RkCiAKICAgICBhdXRvIHN0YXJ0 VGltZSA9IHN0ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6Om5vdygpOwogICAgIE5ldHdvcmtDYWNo ZUtleSBzdG9yYWdlS2V5ID0gbWFrZUNhY2hlS2V5KG9yaWdpbmFsUmVxdWVzdCk7Ci0gICAgdW5z aWduZWQgcHJpb3JpdHkgPSBvcmlnaW5hbFJlcXVlc3QucHJpb3JpdHkoKTsKKyAgICBhdXRvIHBy aW9yaXR5ID0gb3JpZ2luYWxSZXF1ZXN0LnByaW9yaXR5KCk7CiAKICAgICBtX3N0b3JhZ2UtPnJl dHJpZXZlKHN0b3JhZ2VLZXksIHByaW9yaXR5LCBbdGhpcywgb3JpZ2luYWxSZXF1ZXN0LCBjb21w bGV0aW9uSGFuZGxlciwgc3RhcnRUaW1lXShzdGQ6OnVuaXF1ZV9wdHI8TmV0d29ya0NhY2hlU3Rv cmFnZTo6RW50cnk+IGVudHJ5KSB7CiAgICAgICAgIGlmICghZW50cnkpIHsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2Uu aCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3Jh Z2UuaAppbmRleCBhOTFjNmViNTU1MmExMzhhODBkMjYyODZjMzI1NGQ4ZmYxYTViNTFmLi42YmU3 YzVkYWI3YjI0NmM0NDE4YjhkZThlNmZjYjA5YzdlYjFhMDUxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmgKKysrIGIv U291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5o CkBAIC0yOSw2ICsyOSw3IEBACiAjaWYgRU5BQkxFKE5FVFdPUktfQ0FDSEUpCiAKICNpbmNsdWRl ICJOZXR3b3JrQ2FjaGVLZXkuaCIKKyNpbmNsdWRlIDxXZWJDb3JlL1Jlc291cmNlTG9hZFByaW9y aXR5Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJjZVJlc3BvbnNlLmg+CiAjaW5jbHVkZSA8 d3RmL0Jsb29tRmlsdGVyLmg+CiAjaW5jbHVkZSA8d3RmL0RlcXVlLmg+CkBAIC0xNDQsNyArMTQ1 LDcgQEAgcHVibGljOgogICAgIH07CiAgICAgLy8gVGhpcyBtYXkgY2FsbCBjb21wbGV0aW9uIGhh bmRsZXIgc3luY2hyb25vdXNseSBvbiBmYWlsdXJlLgogICAgIHR5cGVkZWYgc3RkOjpmdW5jdGlv bjxib29sIChzdGQ6OnVuaXF1ZV9wdHI8RW50cnk+KT4gUmV0cmlldmVDb21wbGV0aW9uSGFuZGxl cjsKLSAgICB2b2lkIHJldHJpZXZlKGNvbnN0IE5ldHdvcmtDYWNoZUtleSYsIHVuc2lnbmVkIHBy aW9yaXR5LCBSZXRyaWV2ZUNvbXBsZXRpb25IYW5kbGVyJiYpOworICAgIHZvaWQgcmV0cmlldmUo Y29uc3QgTmV0d29ya0NhY2hlS2V5JiwgV2ViQ29yZTo6UmVzb3VyY2VMb2FkUHJpb3JpdHksIFJl dHJpZXZlQ29tcGxldGlvbkhhbmRsZXImJik7CiAKICAgICB0eXBlZGVmIHN0ZDo6ZnVuY3Rpb248 dm9pZCAoYm9vbCBzdWNjZXNzLCBjb25zdCBEYXRhJiBtYXBwZWRCb2R5KT4gU3RvcmVDb21wbGV0 aW9uSGFuZGxlcjsKICAgICB2b2lkIHN0b3JlKGNvbnN0IE5ldHdvcmtDYWNoZUtleSYsIGNvbnN0 IEVudHJ5JiwgU3RvcmVDb21wbGV0aW9uSGFuZGxlciYmKTsKQEAgLTE5MSw4ICsxOTIsNyBAQCBw cml2YXRlOgogICAgIHN0ZDo6YXRvbWljPHNpemVfdD4gbV9hcHByb3hpbWF0ZUVudHJ5Q291bnQg eyAwIH07CiAgICAgc3RkOjphdG9taWM8Ym9vbD4gbV9zaHJpbmtJblByb2dyZXNzIHsgZmFsc2Ug fTsKIAotICAgIHN0YXRpYyBjb25zdCBpbnQgbWF4aW11bVJldHJpZXZlUHJpb3JpdHkgPSA0Owot ICAgIERlcXVlPHN0ZDo6dW5pcXVlX3B0cjxjb25zdCBSZXRyaWV2ZU9wZXJhdGlvbj4+IG1fcGVu ZGluZ1JldHJpZXZlT3BlcmF0aW9uc0J5UHJpb3JpdHlbbWF4aW11bVJldHJpZXZlUHJpb3JpdHkg KyAxXTsKKyAgICBEZXF1ZTxzdGQ6OnVuaXF1ZV9wdHI8Y29uc3QgUmV0cmlldmVPcGVyYXRpb24+ PiBtX3BlbmRpbmdSZXRyaWV2ZU9wZXJhdGlvbnNCeVByaW9yaXR5W1dlYkNvcmU6OlJlc291cmNl TG9hZFByaW9yaXR5SGlnaGVzdCArIDFdOwogCiAgICAgSGFzaFNldDxzdGQ6OnVuaXF1ZV9wdHI8 Y29uc3QgUmV0cmlldmVPcGVyYXRpb24+PiBtX2FjdGl2ZVJldHJpZXZlT3BlcmF0aW9uczsKICAg ICBIYXNoU2V0PHN0ZDo6dW5pcXVlX3B0cjxjb25zdCBTdG9yZU9wZXJhdGlvbj4+IG1fYWN0aXZl U3RvcmVPcGVyYXRpb25zOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nl c3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZUNvY29hLm1tIGIvU291cmNlL1dlYktpdDIvTmV0 d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZUNvY29hLm1tCmluZGV4IDZmNzIw OTg0NmIzMjdmMjlkNDEzODJlYWI4NTZhY2M1NjI0ODdjOWUuLjhhMTBlNDAzZWJjYmY4MGVjMDBm MTc0M2U2OWMyNTQ3OTlkNzEyYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQ cm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2VDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlQ29jb2EubW0KQEAg LTM5OCw3ICszOTgsNyBAQCB2b2lkIE5ldHdvcmtDYWNoZVN0b3JhZ2U6OmRpc3BhdGNoUGVuZGlu Z1JldHJpZXZlT3BlcmF0aW9ucygpCiAKICAgICBjb25zdCBpbnQgbWF4aW11bUFjdGl2ZVJldHJp ZXZlT3BlcmF0aW9uQ291bnQgPSA1OwogCi0gICAgZm9yIChpbnQgcHJpb3JpdHkgPSBtYXhpbXVt UmV0cmlldmVQcmlvcml0eTsgcHJpb3JpdHkgPj0gMDsgLS1wcmlvcml0eSkgeworICAgIGZvciAo aW50IHByaW9yaXR5ID0gV2ViQ29yZTo6UmVzb3VyY2VMb2FkUHJpb3JpdHlIaWdoZXN0OyBwcmlv cml0eSA+PSBXZWJDb3JlOjpSZXNvdXJjZUxvYWRQcmlvcml0eUxvd2VzdDsgLS1wcmlvcml0eSkg ewogICAgICAgICBpZiAobV9hY3RpdmVSZXRyaWV2ZU9wZXJhdGlvbnMuc2l6ZSgpID4gbWF4aW11 bUFjdGl2ZVJldHJpZXZlT3BlcmF0aW9uQ291bnQpIHsKICAgICAgICAgICAgIExPRyhOZXR3b3Jr Q2FjaGVTdG9yYWdlLCAiKE5ldHdvcmtQcm9jZXNzKSBsaW1pdGluZyBwYXJhbGxlbCByZXRyaWV2 ZXMiKTsKICAgICAgICAgICAgIHJldHVybjsKQEAgLTQyNSwxMCArNDI1LDkgQEAgdGVtcGxhdGUg PGNsYXNzIFQ+IGJvb2wgcmV0cmlldmVBY3RpdmUoY29uc3QgVCYgb3BlcmF0aW9ucywgY29uc3Qg TmV0d29ya0NhY2hlS2UKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXZvaWQgTmV0d29ya0NhY2hl U3RvcmFnZTo6cmV0cmlldmUoY29uc3QgTmV0d29ya0NhY2hlS2V5JiBrZXksIHVuc2lnbmVkIHBy aW9yaXR5LCBSZXRyaWV2ZUNvbXBsZXRpb25IYW5kbGVyJiYgY29tcGxldGlvbkhhbmRsZXIpCit2 b2lkIE5ldHdvcmtDYWNoZVN0b3JhZ2U6OnJldHJpZXZlKGNvbnN0IE5ldHdvcmtDYWNoZUtleSYg a2V5LCBXZWJDb3JlOjpSZXNvdXJjZUxvYWRQcmlvcml0eSBwcmlvcml0eSwgUmV0cmlldmVDb21w bGV0aW9uSGFuZGxlciYmIGNvbXBsZXRpb25IYW5kbGVyKQogewogICAgIEFTU0VSVChSdW5Mb29w Ojppc01haW4oKSk7Ci0gICAgQVNTRVJUKHByaW9yaXR5IDw9IG1heGltdW1SZXRyaWV2ZVByaW9y aXR5KTsKIAogICAgIGlmICghbV9jb250ZW50c0ZpbHRlci5tYXlDb250YWluKGtleS5oYXNoKCkp KSB7CiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKG51bGxwdHIpOwo=