64431 2011-07-12 21:48:49 -0700 Some ApplicationCache Origin Cleanup 2011-07-13 14:42:34 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck webkit-unassigned ap joepeck oldest_to_newest 436239 0 joepeck 2011-07-12 21:48:49 -0700 - m_loadedSize is inaccurate and can just be replaced by ApplicationCache::estimatedSizeInStorage - m_availableSpaceInQuota can get out dated, and should just be recalculated at the start of downloads 436246 1 100628 joepeck 2011-07-12 22:02:12 -0700 Created attachment 100628 [PATCH] Some Cleanup Don't let the patch confuse you. I just changed the "if quota < m_loadedSize" check to use estimatedSizeInStorage and moved it down a few lines below the addResource call. 436668 2 joepeck 2011-07-13 14:42:34 -0700 Landed in r90947 <http://trac.webkit.org/changeset/90947>. 100628 2011-07-12 22:02:12 -0700 2011-07-12 23:09:22 -0700 [PATCH] Some Cleanup cleanup.patch text/plain 5573 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3MWE0ZTU3Li43OWZjMDJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTEtMDctMTIgIEpvc2VwaCBQZWNvcmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KKwor ICAgICAgICBTb21lIEFwcGxpY2F0aW9uQ2FjaGUgT3JpZ2luIENsZWFudXAKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0NDMxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgLSBtX2xvYWRlZFNpemUgaXMgaW5h Y2N1cmF0ZS4gVGhpcyBqdXN0IHJlcGxhY2VzIGl0IHdpdGgKKyAgICAgICAgY2FsbHMgdG8gQXBw bGljYXRpb25DYWNoZTo6ZXN0aW1hdGVkU2l6ZUluU3RvcmFnZS4KKworICAgICAgICAtIG1fYXZh aWxhYmxlU3BhY2VJblF1b3RhIGNhbiBnZXQgb3V0IG9mIGRhdGUsIHNvIHdlIGp1c3QKKyAgICAg ICAgcmVjYWxjdWxhdGUgaXQgYXQgdGhlIHN0YXJ0IG9mIGFwcGNhY2hlIGRvd25sb2Fkcy4KKwor ICAgICAgICAqIGxvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAuaDoKKyAgICAg ICAgKiBsb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdyb3VwLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6QXBwbGljYXRpb25DYWNoZUdyb3VwKToK KyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6ZGlkUmVjZWl2ZURhdGEp OgorICAgICAgICBSZW1vdmUgcmVmZXJlbmNlcyB0byBtX2xvYWRlZFNpemUuCisKKyAgICAgICAg KFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6ZGlkRmluaXNoTG9hZGluZyk6CisgICAg ICAgIFJlcGxhY2UgbV9sb2FkZWRTaXplIHdpdGggZXN0aW1hdGVkU2l6ZUluU3RvcmFnZSBhZnRl ciB3ZQorICAgICAgICBhZGQgdGhlIG5ldyBjYWNoZWQgcmVzb3VyY2UgdG8gdGhlIGNhY2hlLiBU aGUgY2FsY3VsYXRpb24KKyAgICAgICAgYWxyZWFkeSBoYXBwZW5lZCBzbyB0aGlzIGNoZWNrIGlz IGZhc3QuCisKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6ZGlkRmlu aXNoTG9hZGluZ01hbmlmZXN0KToKKyAgICAgICAgV2hlbiB3ZSBzdGFydCB0aGUgRG93bmxvYWRp bmcgcGhhc2UsIHJlY2FsY3VsYXRlIHRoZSBxdW90YQorICAgICAgICBzbyB0aGF0IHdlIGhhdmUg YW4gdXAgdG8gZGF0ZSBxdW90YSB2YWx1ZSBzbyB0aGF0IHdlIGNhbgorICAgICAgICBicmVhayBl YXJseSBpZiBuZWVkZWQuCisKIDIwMTEtMDctMTIgIEp1bGllbiBDaGFmZnJhaXggIDxqY2hhZmZy YWl4QHdlYmtpdC5vcmc+CiAKICAgICAgICAgTWFrZSBSZW5kZXJPYmplY3Q6OmNvbnRhaW5pbmdC bG9jayB2aXJ0dWFsIGZvciBiZXR0ZXIgc3BlZWQgYW5kIGNsYXJpdHkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAuY3BwIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91cC5jcHAK aW5kZXggNTYyMzU2Mi4uOTJkOTU4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91cC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91cC5jcHAKQEAgLTcwLDcgKzcwLDYg QEAgQXBwbGljYXRpb25DYWNoZUdyb3VwOjpBcHBsaWNhdGlvbkNhY2hlR3JvdXAoY29uc3QgS1VS TCYgbWFuaWZlc3RVUkwsIGJvb2wgaXNDb3AKICAgICAsIG1fY29tcGxldGlvblR5cGUoTm9uZSkK ICAgICAsIG1faXNDb3B5KGlzQ29weSkKICAgICAsIG1fY2FsbGVkUmVhY2hlZE1heEFwcENhY2hl U2l6ZShmYWxzZSkKLSAgICAsIG1fbG9hZGVkU2l6ZSgwKQogICAgICwgbV9hdmFpbGFibGVTcGFj ZUluUXVvdGEoQXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OnVua25vd25RdW90YSgpKQogICAgICwg bV9vcmlnaW5RdW90YUV4Y2VlZGVkUHJldmlvdXNseShmYWxzZSkKIHsKQEAgLTU4Myw4ICs1ODIs NiBAQCB2b2lkIEFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6ZGlkUmVjZWl2ZURhdGEoUmVzb3VyY2VI YW5kbGUqIGhhbmRsZSwgY29uc3QgY2hhciogZAogICAgIAogICAgIEFTU0VSVChtX2N1cnJlbnRS ZXNvdXJjZSk7CiAgICAgbV9jdXJyZW50UmVzb3VyY2UtPmRhdGEoKS0+YXBwZW5kKGRhdGEsIGxl bmd0aCk7Ci0KLSAgICBtX2xvYWRlZFNpemUgKz0gbGVuZ3RoOwogfQogCiB2b2lkIEFwcGxpY2F0 aW9uQ2FjaGVHcm91cDo6ZGlkRmluaXNoTG9hZGluZyhSZXNvdXJjZUhhbmRsZSogaGFuZGxlLCBk b3VibGUgZmluaXNoVGltZSkKQEAgLTU5OCwzNCArNTk1LDI3IEBAIHZvaWQgQXBwbGljYXRpb25D YWNoZUdyb3VwOjpkaWRGaW5pc2hMb2FkaW5nKFJlc291cmNlSGFuZGxlKiBoYW5kbGUsIGRvdWJs ZSBmaW5pCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICAvLyBBZnRlciBmaW5pc2hpbmcg dGhlIGxvYWRpbmcgb2YgYW55IHJlc291cmNlLCB3ZSBjaGVjayBpZiBpdCB3aWxsCi0gICAgLy8g Zml0IGluIG91ciBsYXN0IGtub3duIHF1b3RhIGxpbWl0LgotICAgIC8vIEZJWE1FOiBUaGUgcXVv dGEgY291bGQgYmUgY2hhbmdlZCBieSBhbm90aGVyIGFwcGNhY2hlIGluIHRoZSBzYW1lIG9yaWdp bi4KLSAgICBpZiAobV9hdmFpbGFibGVTcGFjZUluUXVvdGEgPT0gQXBwbGljYXRpb25DYWNoZVN0 b3JhZ2U6OnVua25vd25RdW90YSgpKQotICAgICAgICByZWNhbGN1bGF0ZUF2YWlsYWJsZVNwYWNl SW5RdW90YSgpOworICAgIEFTU0VSVChtX2N1cnJlbnRIYW5kbGUgPT0gaGFuZGxlKTsKKyAgICBB U1NFUlQobV9wZW5kaW5nRW50cmllcy5jb250YWlucyhoYW5kbGUtPmZpcnN0UmVxdWVzdCgpLnVy bCgpKSk7CisgICAgCisgICAgbV9wZW5kaW5nRW50cmllcy5yZW1vdmUoaGFuZGxlLT5maXJzdFJl cXVlc3QoKS51cmwoKSk7CisgICAgCisgICAgQVNTRVJUKG1fY2FjaGVCZWluZ1VwZGF0ZWQpOwor CisgICAgbV9jYWNoZUJlaW5nVXBkYXRlZC0+YWRkUmVzb3VyY2UobV9jdXJyZW50UmVzb3VyY2Uu cmVsZWFzZSgpKTsKKyAgICBtX2N1cnJlbnRIYW5kbGUgPSAwOwogCiAgICAgLy8gV2hpbGUgZG93 bmxvYWRpbmcgY2hlY2sgdG8gc2VlIGlmIHdlIGhhdmUgZXhjZWVkZWQgdGhlIGF2YWlsYWJsZSBx dW90YS4KICAgICAvLyBXZSBjYW4gc3RvcCBpbW1lZGlhdGVseSBpZiB3ZSBoYXZlIGFscmVhZHkg cHJldmlvdXNseSBmYWlsZWQKICAgICAvLyBkdWUgdG8gYW4gZWFybGllciBxdW90YSByZXN0cmlj dGlvbi4gVGhlIGNsaWVudCB3YXMgYWxyZWFkeSBub3RpZmllZAogICAgIC8vIG9mIHRoZSBxdW90 YSBiZWluZyByZWFjaGVkIGFuZCBkZWNpZGVkIG5vdCB0byBpbmNyZWFzZSBpdCB0aGVuLgogICAg IC8vIEZJWE1FOiBTaG91bGQgd2UgYnJlYWsgZWFybGllciBhbmQgcHJldmVudCByZWRvd25sb2Fk aW5nIG9uIGxhdGVyIHBhZ2UgbG9hZHM/Ci0gICAgLy8gV2UgY291bGQgdGhlbiBhbHNvIGdldCBy aWQgb2YgbV9sb2FkZWRTaXplLgotICAgIGlmIChtX29yaWdpblF1b3RhRXhjZWVkZWRQcmV2aW91 c2x5ICYmIG1fYXZhaWxhYmxlU3BhY2VJblF1b3RhIDwgbV9sb2FkZWRTaXplKSB7CisgICAgaWYg KG1fb3JpZ2luUXVvdGFFeGNlZWRlZFByZXZpb3VzbHkgJiYgbV9hdmFpbGFibGVTcGFjZUluUXVv dGEgPCBtX2NhY2hlQmVpbmdVcGRhdGVkLT5lc3RpbWF0ZWRTaXplSW5TdG9yYWdlKCkpIHsKICAg ICAgICAgbV9jdXJyZW50UmVzb3VyY2UgPSAwOwogICAgICAgICBtX2ZyYW1lLT5kb21XaW5kb3co KS0+Y29uc29sZSgpLT5hZGRNZXNzYWdlKE90aGVyTWVzc2FnZVNvdXJjZSwgTG9nTWVzc2FnZVR5 cGUsIEVycm9yTWVzc2FnZUxldmVsLCAiQXBwbGljYXRpb24gQ2FjaGUgdXBkYXRlIGZhaWxlZCwg YmVjYXVzZSBzaXplIHF1b3RhIHdhcyBleGNlZWRlZC4iLCAwLCBTdHJpbmcoKSk7CiAgICAgICAg IGNhY2hlVXBkYXRlRmFpbGVkKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0KLSAgICBBU1NF UlQobV9jdXJyZW50SGFuZGxlID09IGhhbmRsZSk7Ci0gICAgQVNTRVJUKG1fcGVuZGluZ0VudHJp ZXMuY29udGFpbnMoaGFuZGxlLT5maXJzdFJlcXVlc3QoKS51cmwoKSkpOwotICAgIAotICAgIG1f cGVuZGluZ0VudHJpZXMucmVtb3ZlKGhhbmRsZS0+Zmlyc3RSZXF1ZXN0KCkudXJsKCkpOwotICAg IAotICAgIEFTU0VSVChtX2NhY2hlQmVpbmdVcGRhdGVkKTsKLQotICAgIG1fY2FjaGVCZWluZ1Vw ZGF0ZWQtPmFkZFJlc291cmNlKG1fY3VycmVudFJlc291cmNlLnJlbGVhc2UoKSk7Ci0gICAgbV9j dXJyZW50SGFuZGxlID0gMDsKICAgICAKICAgICAvLyBMb2FkIHRoZSBuZXh0IHJlc291cmNlLCBp ZiBhbnkuCiAgICAgc3RhcnRMb2FkaW5nRW50cnkoKTsKQEAgLTc4Niw2ICs3NzYsOCBAQCB2b2lk IEFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6ZGlkRmluaXNoTG9hZGluZ01hbmlmZXN0KCkKICAgICBt X3Byb2dyZXNzVG90YWwgPSBtX3BlbmRpbmdFbnRyaWVzLnNpemUoKTsKICAgICBtX3Byb2dyZXNz RG9uZSA9IDA7CiAKKyAgICByZWNhbGN1bGF0ZUF2YWlsYWJsZVNwYWNlSW5RdW90YSgpOworCiAg ICAgc3RhcnRMb2FkaW5nRW50cnkoKTsKIH0KIApAQCAtOTgzLDcgKzk3NSw2IEBAIHZvaWQgQXBw bGljYXRpb25DYWNoZUdyb3VwOjpjaGVja0lmTG9hZElzQ29tcGxldGUoKQogICAgIG1fY29tcGxl dGlvblR5cGUgPSBOb25lOwogICAgIHNldFVwZGF0ZVN0YXR1cyhJZGxlKTsKICAgICBtX2ZyYW1l ID0gMDsKLSAgICBtX2xvYWRlZFNpemUgPSAwOwogICAgIG1fYXZhaWxhYmxlU3BhY2VJblF1b3Rh ID0gQXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OnVua25vd25RdW90YSgpOwogICAgIG1fY2FsbGVk UmVhY2hlZE1heEFwcENhY2hlU2l6ZSA9IGZhbHNlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91cC5oIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91cC5oCmluZGV4IDZiMjI0 NzUuLmI4ZWVhYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9B cHBsaWNhdGlvbkNhY2hlR3JvdXAuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2Fj aGUvQXBwbGljYXRpb25DYWNoZUdyb3VwLmgKQEAgLTE5OSw3ICsxOTksNiBAQCBwcml2YXRlOgog ICAgIFJlZlB0cjxBcHBsaWNhdGlvbkNhY2hlUmVzb3VyY2U+IG1fbWFuaWZlc3RSZXNvdXJjZTsK ICAgICBSZWZQdHI8UmVzb3VyY2VIYW5kbGU+IG1fbWFuaWZlc3RIYW5kbGU7CiAKLSAgICBpbnQ2 NF90IG1fbG9hZGVkU2l6ZTsKICAgICBpbnQ2NF90IG1fYXZhaWxhYmxlU3BhY2VJblF1b3RhOwog ICAgIGJvb2wgbV9vcmlnaW5RdW90YUV4Y2VlZGVkUHJldmlvdXNseTsKIAo=