70113 2011-10-14 09:51:47 -0700 CachedResourceClient types should be ASSERTed, rather than checked 2011-10-14 12:31:10 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 japhet japhet abarth ap koivisto webkit.review.bot oldest_to_newest 484026 0 japhet 2011-10-14 09:51:47 -0700 If there are CachedResourceClient type mismatches in CachedResourceClientWalker or the CachedResource subclasses, it's an error on our part, so we should assert. See https://bugs.webkit.org/show_bug.cgi?id=69877 for the initial discussion. 484030 1 111024 japhet 2011-10-14 09:53:58 -0700 Created attachment 111024 patch 484182 2 111024 webkit.review.bot 2011-10-14 12:31:05 -0700 Comment on attachment 111024 patch Clearing flags on attachment: 111024 Committed r97491: <http://trac.webkit.org/changeset/97491> 484183 3 webkit.review.bot 2011-10-14 12:31:10 -0700 All reviewed patches have been landed. Closing bug. 111024 2011-10-14 09:53:58 -0700 2011-10-14 12:31:05 -0700 patch crc.txt text/plain 4373 japhet SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk3NDczKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMTAtMTQgIE5hdGUgQ2hh cGluICA8amFwaGV0QGNocm9taXVtLm9yZz4KKworICAgICAgICBDaGVjayBDYWNoZWRSZXNvdXJj ZUNsaWVudCB0eXBlcyB3aXRoIEFTU0VSVHMgcmF0aGVyCisgICAgICAgIHRoYW4gaWYgc3RhdGVt ZW50cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcw MTEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8g bmV3IHRlc3RzLCBubyBmdW5jdGlvbmFsaXR5IGNoYW5nZS4KKworICAgICAgICAqIGxvYWRlci9j YWNoZS9DYWNoZWRDU1NTdHlsZVNoZWV0LmNwcDoKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2Fj aGVkRm9udC5jcHA6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcDoKKyAg ICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VDbGllbnRXYWxrZXIuaDoKKyAgICAg ICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkWFNMU3R5bGVTaGVldC5jcHA6CisKIDIwMTEtMTAtMTMg IEFya28gU2FoYSAgPGFya29AbW90b3JvbGEuY29tPgogCiAgICAgICAgIE1pY3JvZGF0YTogQmFz aWMgaW1wbGVtZW50YXRpb24gb2YgZG9jdW1lbnQuZ2V0SXRlbXMoKSBtZXRob2QuCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkRm9udC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEZvbnQuY3BwCShyZXZpc2lvbiA5NzQ3 MSkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRGb250LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNzksNyArNzksOCBAQAogCiB2b2lkIENhY2hlZEZvbnQ6OmRpZEFkZENsaWVu dChDYWNoZWRSZXNvdXJjZUNsaWVudCogYykKIHsKLSAgICBpZiAoIWlzTG9hZGluZygpICYmIGMt PnJlc291cmNlQ2xpZW50VHlwZSgpID09IENhY2hlZEZvbnRDbGllbnQ6OmV4cGVjdGVkVHlwZSgp KQorICAgIEFTU0VSVChjLT5yZXNvdXJjZUNsaWVudFR5cGUoKSA9PSBDYWNoZWRGb250Q2xpZW50 OjpleHBlY3RlZFR5cGUoKSk7CisgICAgaWYgKCFpc0xvYWRpbmcoKSkKICAgICAgICAgc3RhdGlj X2Nhc3Q8Q2FjaGVkRm9udENsaWVudCo+KGMpLT5mb250TG9hZGVkKHRoaXMpOwogfQogCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkWFNMU3R5bGVTaGVldC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFhTTFN0eWxlU2hl ZXQuY3BwCShyZXZpc2lvbiA5NzQ3MSkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9D YWNoZWRYU0xTdHlsZVNoZWV0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDgsNyArNDgsOCBAQAog CiB2b2lkIENhY2hlZFhTTFN0eWxlU2hlZXQ6OmRpZEFkZENsaWVudChDYWNoZWRSZXNvdXJjZUNs aWVudCogYykKIHsgIAotICAgIGlmICghaXNMb2FkaW5nKCkgJiYgYy0+cmVzb3VyY2VDbGllbnRU eXBlKCkgPT0gQ2FjaGVkU3R5bGVTaGVldENsaWVudDo6ZXhwZWN0ZWRUeXBlKCkpCisgICAgQVNT RVJUKGMtPnJlc291cmNlQ2xpZW50VHlwZSgpID09IENhY2hlZFN0eWxlU2hlZXRDbGllbnQ6OmV4 cGVjdGVkVHlwZSgpKTsKKyAgICBpZiAoIWlzTG9hZGluZygpKQogICAgICAgICBzdGF0aWNfY2Fz dDxDYWNoZWRTdHlsZVNoZWV0Q2xpZW50Kj4oYyktPnNldFhTTFN0eWxlU2hlZXQobV9yZXNvdXJj ZVJlcXVlc3QudXJsKCksIG1fcmVzcG9uc2UudXJsKCksIG1fc2hlZXQpOwogfQogCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5jcHAJKHJldmlzaW9uIDk3 NDcxKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcAkod29y a2luZyBjb3B5KQpAQCAtOTgsOCArOTgsOSBAQAogICAgICAgICBjcmVhdGVJbWFnZSgpOwogICAg ICAgICBtX2ltYWdlLT5zZXREYXRhKG1fZGF0YSwgdHJ1ZSk7CiAgICAgfQotCi0gICAgaWYgKG1f aW1hZ2UgJiYgIW1faW1hZ2UtPmlzTnVsbCgpICYmIGMtPnJlc291cmNlQ2xpZW50VHlwZSgpID09 IENhY2hlZEltYWdlQ2xpZW50OjpleHBlY3RlZFR5cGUoKSkKKyAgICAKKyAgICBBU1NFUlQoYy0+ cmVzb3VyY2VDbGllbnRUeXBlKCkgPT0gQ2FjaGVkSW1hZ2VDbGllbnQ6OmV4cGVjdGVkVHlwZSgp KTsKKyAgICBpZiAobV9pbWFnZSAmJiAhbV9pbWFnZS0+aXNOdWxsKCkpCiAgICAgICAgIHN0YXRp Y19jYXN0PENhY2hlZEltYWdlQ2xpZW50Kj4oYyktPmltYWdlQ2hhbmdlZCh0aGlzKTsKIAogICAg IENhY2hlZFJlc291cmNlOjpkaWRBZGRDbGllbnQoYyk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9s b2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VDbGllbnRXYWxrZXIuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VDbGllbnRXYWxrZXIuaAko cmV2aXNpb24gOTc0NzEpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVz b3VyY2VDbGllbnRXYWxrZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNTAsOCArNTAsMTAgQEAKICAg ICAgICAgc2l6ZV90IHNpemUgPSBtX2NsaWVudFZlY3Rvci5zaXplKCk7CiAgICAgICAgIHdoaWxl IChtX2luZGV4IDwgc2l6ZSkgewogICAgICAgICAgICAgQ2FjaGVkUmVzb3VyY2VDbGllbnQqIG5l eHQgPSBtX2NsaWVudFZlY3RvclttX2luZGV4KytdOwotICAgICAgICAgICAgaWYgKG1fY2xpZW50 U2V0LmNvbnRhaW5zKG5leHQpICYmIChUOjpleHBlY3RlZFR5cGUoKSA9PSBDYWNoZWRSZXNvdXJj ZUNsaWVudDo6ZXhwZWN0ZWRUeXBlKCkgfHwgbmV4dC0+cmVzb3VyY2VDbGllbnRUeXBlKCkgPT0g VDo6ZXhwZWN0ZWRUeXBlKCkpKQorICAgICAgICAgICAgaWYgKG1fY2xpZW50U2V0LmNvbnRhaW5z KG5leHQpKSB7CisgICAgICAgICAgICAgICAgQVNTRVJUKFQ6OmV4cGVjdGVkVHlwZSgpID09IENh Y2hlZFJlc291cmNlQ2xpZW50OjpleHBlY3RlZFR5cGUoKSB8fCBuZXh0LT5yZXNvdXJjZUNsaWVu dFR5cGUoKSA9PSBUOjpleHBlY3RlZFR5cGUoKSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuIHN0 YXRpY19jYXN0PFQqPihuZXh0KTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgICAK ICAgICAgICAgcmV0dXJuIDA7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2Fj aGVkQ1NTU3R5bGVTaGVldC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVy L2NhY2hlL0NhY2hlZENTU1N0eWxlU2hlZXQuY3BwCShyZXZpc2lvbiA5NzQ3MSkKKysrIFNvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRDU1NTdHlsZVNoZWV0LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNTIsNyArNTIsOCBAQAogCiB2b2lkIENhY2hlZENTU1N0eWxlU2hlZXQ6OmRpZEFk ZENsaWVudChDYWNoZWRSZXNvdXJjZUNsaWVudCogYykKIHsKLSAgICBpZiAoIWlzTG9hZGluZygp ICYmIGMtPnJlc291cmNlQ2xpZW50VHlwZSgpID09IENhY2hlZFN0eWxlU2hlZXRDbGllbnQ6OmV4 cGVjdGVkVHlwZSgpKQorICAgIEFTU0VSVChjLT5yZXNvdXJjZUNsaWVudFR5cGUoKSA9PSBDYWNo ZWRTdHlsZVNoZWV0Q2xpZW50OjpleHBlY3RlZFR5cGUoKSk7CisgICAgaWYgKCFpc0xvYWRpbmco KSkKICAgICAgICAgc3RhdGljX2Nhc3Q8Q2FjaGVkU3R5bGVTaGVldENsaWVudCo+KGMpLT5zZXRD U1NTdHlsZVNoZWV0KG1fcmVzb3VyY2VSZXF1ZXN0LnVybCgpLCBtX3Jlc3BvbnNlLnVybCgpLCBt X2RlY29kZXItPmVuY29kaW5nKCkubmFtZSgpLCB0aGlzKTsKIH0KIAo=