23023 2008-12-29 04:08:47 -0800 Remove incomplete support for opportunistic apcache entries 2008-12-30 10:54:20 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P4 Normal --- 1 ap ap oldest_to_newest 103697 0 ap 2008-12-29 04:08:47 -0800 They weren't ever really supported, but no that they were removed from the spec, we can get rid of them completely. 103699 1 26289 ap 2008-12-29 04:10:55 -0800 Created attachment 26289 proposed patch 103740 2 26289 sam 2008-12-29 15:53:34 -0800 Comment on attachment 26289 proposed patch r=me. > Index: WebCore/loader/appcache/ApplicationCacheResource.h > =================================================================== > --- WebCore/loader/appcache/ApplicationCacheResource.h (revision 39497) > +++ WebCore/loader/appcache/ApplicationCacheResource.h (working copy) > @@ -40,7 +40,7 @@ public: > Explicit = 1 << 2, > Foreign = 1 << 3, > Fallback = 1 << 4, > - Opportunistic = 1 << 5, > + // Bit 5 was used for opportunistic entries, which were removed from the spec. > Dynamic = 1 << 6 You should note in the changelog the reason you can't change Dynamic to use bit-5. 103743 3 levin 2008-12-29 16:09:44 -0800 Typo in ChangeLog: > Remove incomplete support for opportunistic apcache entries s/apcache/appcache/ 103801 4 26289 darin 2008-12-30 10:35:34 -0800 Comment on attachment 26289 proposed patch > - Opportunistic = 1 << 5, > + // Bit 5 was used for opportunistic entries, which were removed from the spec. > Dynamic = 1 << 6 > }; Why keep this comment? Why not renumber Dynamic to use bit 5? 103805 5 ap 2008-12-30 10:52:44 -0800 Committed <http://trac.webkit.org/projects/webkit/changeset/39514>. 103806 6 ap 2008-12-30 10:54:20 -0800 (In reply to comment #4) > Why keep this comment? Why not renumber Dynamic to use bit 5? Maybe I could do that, given that neither fallback nor dynamic entries were stored before - but I'm going to bump schema version soon, which will be a good opportunity to change this. 26289 2008-12-29 04:10:55 -0800 2008-12-29 15:53:34 -0800 proposed patch OpportunisticEntries.txt text/plain 3744 ap SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzOTQ5OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMDgtMTItMjkgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzAyMworICAgICAgICBS ZW1vdmUgaW5jb21wbGV0ZSBzdXBwb3J0IGZvciBvcHBvcnR1bmlzdGljIGFwY2FjaGUgZW50cmll cworCisgICAgICAgIE5vIGNoYW5nZSBpbiBiZWhhdmlvciwgdGh1cyBubyB0ZXN0LgorCisgICAg ICAgICogbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3Vt ZW50TG9hZGVyOjpzY2hlZHVsZUFwcGxpY2F0aW9uQ2FjaGVMb2FkKToKKyAgICAgICAgKiBsb2Fk ZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdyb3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6ZGlkRmluaXNoTG9hZGluZ01hbmlmZXN0KToKKyAgICAg ICAgKiBsb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZVJlc291cmNlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVSZXNvdXJjZTo6ZHVtcFR5cGUpOgorICAgICAg ICAqIGxvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlUmVzb3VyY2UuaDoKKyAgICAgICAg KFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVSZXNvdXJjZTo6KToKKwogMjAwOC0xMi0yOCAgQ2Ft ZXJvbiBad2FyaWNoICA8Y3d6d2FyaWNoQHV3YXRlcmxvby5jYT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBTYW0gV2VpbmlnLgpJbmRleDogV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAkocmV2aXNp b24gMzk0OTcpCisrKyBXZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTg5Myw3ICs4OTMsNiBAQCBib29sIERvY3VtZW50TG9hZGVyOjpzY2hlZHVsZUFw cGxpY2F0aW9uCiAKICAgICBBcHBsaWNhdGlvbkNhY2hlUmVzb3VyY2UqIHJlc291cmNlOwogICAg IGlmICghc2hvdWxkTG9hZFJlc291cmNlRnJvbUFwcGxpY2F0aW9uQ2FjaGUocmVxdWVzdCwgcmVz b3VyY2UpKQotICAgICAgICAvLyBGSVhNRTogSGFuZGxlIG9wcG9ydHVuaXN0aWMgY2FjaGluZyBu YW1lc3BhY2VzCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAKICAgICBtX3BlbmRpbmdTdWJz dGl0dXRlUmVzb3VyY2VzLnNldChsb2FkZXIsIHJlc291cmNlKTsKSW5kZXg6IFdlYkNvcmUvbG9h ZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91cC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdyb3VwLmNwcAkocmV2aXNpb24g Mzk0OTcpCisrKyBXZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NjgsOCArNDY4LDYgQEAgdm9pZCBBcHBsaWNhdGlvbkNh Y2hlR3JvdXA6OmRpZEZpbmlzaExvYQogICAgICAgICByZXR1cm47CiAgICAgfQogICAgICAgICAK LSAgICAvLyBGSVhNRTogQWRkIHRoZSBvcHBvcnR1bmlzdGljIGNhY2hpbmcgbmFtZXNwYWNlcyBh bmQgdGhlaXIgZmFsbGJhY2tzLgotICAgIAogICAgIC8vIFdlIGhhdmUgdGhlIG1hbmlmZXN0LCBu b3cgZG93bmxvYWQgdGhlIHJlc291cmNlcy4KICAgICBtX3N0YXR1cyA9IERvd25sb2FkaW5nOwog ICAgIApAQCAtNDkyLDcgKzQ5MCw3IEBAIHZvaWQgQXBwbGljYXRpb25DYWNoZUdyb3VwOjpkaWRG aW5pc2hMb2EKICAgICAgICAgQXBwbGljYXRpb25DYWNoZTo6UmVzb3VyY2VNYXA6OmNvbnN0X2l0 ZXJhdG9yIGVuZCA9IG1fbmV3ZXN0Q2FjaGUtPmVuZCgpOwogICAgICAgICBmb3IgKEFwcGxpY2F0 aW9uQ2FjaGU6OlJlc291cmNlTWFwOjpjb25zdF9pdGVyYXRvciBpdCA9IG1fbmV3ZXN0Q2FjaGUt PmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgewogICAgICAgICAgICAgdW5zaWduZWQgdHlwZSA9 IGl0LT5zZWNvbmQtPnR5cGUoKTsKLSAgICAgICAgICAgIGlmICh0eXBlICYgKEFwcGxpY2F0aW9u Q2FjaGVSZXNvdXJjZTo6T3Bwb3J0dW5pc3RpYyB8IEFwcGxpY2F0aW9uQ2FjaGVSZXNvdXJjZTo6 SW1wbGljaXQgfCBBcHBsaWNhdGlvbkNhY2hlUmVzb3VyY2U6OkR5bmFtaWMpKQorICAgICAgICAg ICAgaWYgKHR5cGUgJiAoQXBwbGljYXRpb25DYWNoZVJlc291cmNlOjpJbXBsaWNpdCB8IEFwcGxp Y2F0aW9uQ2FjaGVSZXNvdXJjZTo6RHluYW1pYykpCiAgICAgICAgICAgICAgICAgYWRkRW50cnko aXQtPmZpcnN0LCB0eXBlKTsKICAgICAgICAgfQogICAgIH0KSW5kZXg6IFdlYkNvcmUvbG9hZGVy L2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVSZXNvdXJjZS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZVJlc291cmNlLmNwcAkocmV2aXNp b24gMzk0OTcpCisrKyBXZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlUmVz b3VyY2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Nyw4ICs1Nyw2IEBAIHZvaWQgQXBwbGljYXRp b25DYWNoZVJlc291cmNlOjpkdW1wVHlwZSgKICAgICAgICAgcHJpbnRmKCJmb3JlaWduICIpOwog ICAgIGlmICh0eXBlICYgRmFsbGJhY2spCiAgICAgICAgIHByaW50ZigiZmFsbGJhY2sgIik7Ci0g ICAgaWYgKHR5cGUgJiBPcHBvcnR1bmlzdGljKQotICAgICAgICBwcmludGYoIm9wcG9ydHVuaXN0 aWMgIik7CiAgICAgaWYgKHR5cGUgJiBEeW5hbWljKQogICAgICAgICBwcmludGYoImR5bmFtaWMg Iik7CiAgICAgCkluZGV4OiBXZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hl UmVzb3VyY2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNh dGlvbkNhY2hlUmVzb3VyY2UuaAkocmV2aXNpb24gMzk0OTcpCisrKyBXZWJDb3JlL2xvYWRlci9h cHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlUmVzb3VyY2UuaAkod29ya2luZyBjb3B5KQpAQCAtNDAs NyArNDAsNyBAQCBwdWJsaWM6CiAgICAgICAgIEV4cGxpY2l0ID0gMSA8PCAyLAogICAgICAgICBG b3JlaWduID0gMSA8PCAzLAogICAgICAgICBGYWxsYmFjayA9IDEgPDwgNCwKLSAgICAgICAgT3Bw b3J0dW5pc3RpYyA9IDEgPDwgNSwKKyAgICAgICAgLy8gQml0IDUgd2FzIHVzZWQgZm9yIG9wcG9y dHVuaXN0aWMgZW50cmllcywgd2hpY2ggd2VyZSByZW1vdmVkIGZyb20gdGhlIHNwZWMuCiAgICAg ICAgIER5bmFtaWMgPSAxIDw8IDYKICAgICB9OwogICAgICAgICAK