100901 2012-10-31 16:21:23 -0700 Remove some CachedResource::Status's in favor of looking at CachedResource::m_error 2012-10-31 23:20:24 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 japhet japhet abarth webkit.review.bot oldest_to_newest 755711 0 japhet 2012-10-31 16:21:23 -0700 I recently added a ResourceError member to CachedResource as part of the attempt to support main resources in the cache. Because this is now exposed, we can remove some CachedResource::Status values which are essentially workarounds for the fact that CachedResourceClients couldn't previously access the underlying ResourceError. 755714 1 171739 japhet 2012-10-31 16:26:32 -0700 Created attachment 171739 patch 755908 2 171739 abarth 2012-10-31 23:01:03 -0700 Comment on attachment 171739 patch ok 755919 3 171739 webkit.review.bot 2012-10-31 23:20:21 -0700 Comment on attachment 171739 patch Clearing flags on attachment: 171739 Committed r133130: <http://trac.webkit.org/changeset/133130> 755920 4 webkit.review.bot 2012-10-31 23:20:24 -0700 All reviewed patches have been landed. Closing bug. 171739 2012-10-31 16:26:32 -0700 2012-10-31 23:20:21 -0700 patch error.txt text/plain 6380 japhet SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQu Y3BwCShyZXZpc2lvbiAxMzI5NjApCisrKyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yUGFnZUFnZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTUwLDEwICs5NTAsMTAgQEAKICAg ICAgICAgICAgIC5zZXRVcmwoY2FjaGVkUmVzb3VyY2UtPnVybCgpKQogICAgICAgICAgICAgLnNl dFR5cGUoY2FjaGVkUmVzb3VyY2VUeXBlSnNvbigqY2FjaGVkUmVzb3VyY2UpKQogICAgICAgICAg ICAgLnNldE1pbWVUeXBlKGNhY2hlZFJlc291cmNlLT5yZXNwb25zZSgpLm1pbWVUeXBlKCkpOwot ICAgICAgICBpZiAoY2FjaGVkUmVzb3VyY2UtPnN0YXR1cygpID09IENhY2hlZFJlc291cmNlOjpM b2FkRXJyb3IpCisgICAgICAgIGlmIChjYWNoZWRSZXNvdXJjZS0+d2FzQ2FuY2VsZWQoKSkKKyAg ICAgICAgICAgIHJlc291cmNlT2JqZWN0LT5zZXRDYW5jZWxlZCh0cnVlKTsKKyAgICAgICAgZWxz ZSBpZiAoY2FjaGVkUmVzb3VyY2UtPnN0YXR1cygpID09IENhY2hlZFJlc291cmNlOjpMb2FkRXJy b3IpCiAgICAgICAgICAgICByZXNvdXJjZU9iamVjdC0+c2V0RmFpbGVkKHRydWUpOwotICAgICAg ICBpZiAoY2FjaGVkUmVzb3VyY2UtPnN0YXR1cygpID09IENhY2hlZFJlc291cmNlOjpDYW5jZWxl ZCkKLSAgICAgICAgICAgIHJlc291cmNlT2JqZWN0LT5zZXRDYW5jZWxlZCh0cnVlKTsKICAgICAg ICAgc3VicmVzb3VyY2VzLT5hZGRJdGVtKHJlc291cmNlT2JqZWN0KTsKICAgICB9CiAKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcAkocmV2aXNpb24g MTMyOTYwKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjg5LDE2ICsyODksMTMgQEAKICAgICBDYWNoZWRSZXNvdXJjZUhh bmRsZTxDYWNoZWRSZXNvdXJjZT4gcHJvdGVjdFJlc291cmNlKG1fcmVzb3VyY2UpOwogICAgIG1f c3RhdGUgPSBGaW5pc2hpbmc7CiAgICAgbV9yZXNvdXJjZS0+c2V0UmVzb3VyY2VFcnJvcihlcnJv cik7Ci0gICAgaWYgKGVycm9yLmlzVGltZW91dCgpKQotICAgICAgICBtX3Jlc291cmNlLT5lcnJv cihDYWNoZWRSZXNvdXJjZTo6VGltZW91dEVycm9yKTsKLSAgICBlbHNlCi0gICAgICAgIG1fcmVz b3VyY2UtPmVycm9yKENhY2hlZFJlc291cmNlOjpMb2FkRXJyb3IpOworICAgIG1fcmVzb3VyY2Ut PmVycm9yKENhY2hlZFJlc291cmNlOjpMb2FkRXJyb3IpOwogICAgIGlmICghbV9yZXNvdXJjZS0+ aXNQcmVsb2FkZWQoKSkKICAgICAgICAgbWVtb3J5Q2FjaGUoKS0+cmVtb3ZlKG1fcmVzb3VyY2Up OwogICAgIFJlc291cmNlTG9hZGVyOjpkaWRGYWlsKGVycm9yKTsKIH0KIAotdm9pZCBTdWJyZXNv dXJjZUxvYWRlcjo6d2lsbENhbmNlbChjb25zdCBSZXNvdXJjZUVycm9yJikKK3ZvaWQgU3VicmVz b3VyY2VMb2FkZXI6OndpbGxDYW5jZWwoY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3IpCiB7CiAg ICAgaWYgKG1fc3RhdGUgIT0gSW5pdGlhbGl6ZWQpCiAgICAgICAgIHJldHVybjsKQEAgLTMwOSw2 ICszMDYsNyBAQAogICAgIG1fc3RhdGUgPSBGaW5pc2hpbmc7CiAgICAgaWYgKG1fcmVzb3VyY2Ut PnJlc291cmNlVG9SZXZhbGlkYXRlKCkpCiAgICAgICAgIG1lbW9yeUNhY2hlKCktPnJldmFsaWRh dGlvbkZhaWxlZChtX3Jlc291cmNlKTsKKyAgICBtX3Jlc291cmNlLT5zZXRSZXNvdXJjZUVycm9y KGVycm9yKTsKICAgICBtZW1vcnlDYWNoZSgpLT5yZW1vdmUobV9yZXNvdXJjZSk7CiB9CiAKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2Fk ZXIuY3BwCShyZXZpc2lvbiAxMzI5NjApCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1l bnRUaHJlYWRhYmxlTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzA1LDE0ICszMDUsOSBA QAogICAgIEFTU0VSVChtX2NsaWVudCk7CiAgICAgQVNTRVJUX1VOVVNFRChyZXNvdXJjZSwgcmVz b3VyY2UgPT0gbV9yZXNvdXJjZSk7CiAgICAgICAgIAotICAgIGlmIChtX3Jlc291cmNlICYmICht X3Jlc291cmNlLT5lcnJvck9jY3VycmVkKCkgfHwgbV9yZXNvdXJjZS0+d2FzQ2FuY2VsZWQoKSkp IHsKLSAgICAgICAgUmVzb3VyY2VFcnJvciBlcnJvcigiTmV0d29yayBSZXF1ZXN0IEZhaWxlZCIs IDAsIG1fcmVzb3VyY2UtPnVybCgpLCAiUmVzb3VyY2UgZmFpbGVkIHRvIGxvYWQiKTsKLSAgICAg ICAgaWYgKG1fcmVzb3VyY2UtPndhc0NhbmNlbGVkKCkpCi0gICAgICAgICAgICBlcnJvci5zZXRJ c0NhbmNlbGxhdGlvbih0cnVlKTsKLSAgICAgICAgaWYgKG1fcmVzb3VyY2UtPnRpbWVkT3V0KCkp Ci0gICAgICAgICAgICBlcnJvci5zZXRJc1RpbWVvdXQodHJ1ZSk7Ci0gICAgICAgIGRpZEZhaWwo ZXJyb3IpOwotICAgIH0gZWxzZQorICAgIGlmIChtX3Jlc291cmNlICYmIG1fcmVzb3VyY2UtPmVy cm9yT2NjdXJyZWQoKSkKKyAgICAgICAgZGlkRmFpbChtX3Jlc291cmNlLT5yZXNvdXJjZUVycm9y KCkpOworICAgIGVsc2UKICAgICAgICAgZGlkRmluaXNoTG9hZGluZyhtX3Jlc291cmNlLT5pZGVu dGlmaWVyKCksIG1fcmVzb3VyY2UtPmxvYWRGaW5pc2hUaW1lKCkpOwogfQogCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuaAkocmV2aXNpb24gMTMy OTYwKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmgJKHdv cmtpbmcgY29weSkKQEAgLTg5LDkgKzg5LDcgQEAKICAgICAgICAgVW5rbm93biwgICAgICAvLyBs ZXQgY2FjaGUgZGVjaWRlIHdoYXQgdG8gZG8gd2l0aCBpdAogICAgICAgICBQZW5kaW5nLCAgICAg IC8vIG9ubHkgcGFydGlhbGx5IGxvYWRlZAogICAgICAgICBDYWNoZWQsICAgICAgIC8vIHJlZ3Vs YXIgY2FzZQotICAgICAgICBDYW5jZWxlZCwKICAgICAgICAgTG9hZEVycm9yLAotICAgICAgICBU aW1lb3V0RXJyb3IsCiAgICAgICAgIERlY29kZUVycm9yCiAgICAgfTsKIApAQCAtMjExLDEwICsy MDksOSBAQAogICAgIFN0cmluZyBhY2NlcHQoKSBjb25zdCB7IHJldHVybiBtX2FjY2VwdDsgfQog ICAgIHZvaWQgc2V0QWNjZXB0KGNvbnN0IFN0cmluZyYgYWNjZXB0KSB7IG1fYWNjZXB0ID0gYWNj ZXB0OyB9CiAKLSAgICBib29sIHdhc0NhbmNlbGVkKCkgY29uc3QgeyByZXR1cm4gbV9zdGF0dXMg PT0gQ2FuY2VsZWQ7IH0KLSAgICBib29sIGVycm9yT2NjdXJyZWQoKSBjb25zdCB7IHJldHVybiAo bV9zdGF0dXMgPT0gTG9hZEVycm9yIHx8IG1fc3RhdHVzID09IERlY29kZUVycm9yIHx8IG1fc3Rh dHVzID09IFRpbWVvdXRFcnJvcik7IH0KLSAgICBib29sIGxvYWRGYWlsZWRPckNhbmNlbGVkKCkg eyByZXR1cm4gbV9zdGF0dXMgPT0gQ2FuY2VsZWQgfHwgbV9zdGF0dXMgPT0gTG9hZEVycm9yIHx8 IG1fc3RhdHVzID09IFRpbWVvdXRFcnJvcjsgfQotICAgIGJvb2wgdGltZWRPdXQoKSBjb25zdCB7 IHJldHVybiBtX3N0YXR1cyA9PSBUaW1lb3V0RXJyb3I7IH0KKyAgICBib29sIHdhc0NhbmNlbGVk KCkgY29uc3QgeyByZXR1cm4gbV9lcnJvci5pc0NhbmNlbGxhdGlvbigpOyB9CisgICAgYm9vbCBl cnJvck9jY3VycmVkKCkgY29uc3QgeyByZXR1cm4gbV9zdGF0dXMgPT0gTG9hZEVycm9yIHx8IG1f c3RhdHVzID09IERlY29kZUVycm9yOyB9CisgICAgYm9vbCBsb2FkRmFpbGVkT3JDYW5jZWxlZCgp IHsgcmV0dXJuICFtX2Vycm9yLmlzTnVsbCgpOyB9CiAKICAgICBib29sIHNob3VsZFNlbmRSZXNv dXJjZUxvYWRDYWxsYmFja3MoKSBjb25zdCB7IHJldHVybiBtX29wdGlvbnMuc2VuZExvYWRDYWxs YmFja3MgPT0gU2VuZENhbGxiYWNrczsgfQogICAgIApJbmRleDogU291cmNlL1dlYkNvcmUvbG9h ZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwCShyZXZpc2lvbiAxMzI5NjApCisrKyBT b3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC00MzgsOCArNDM4LDkgQEAKICAgICAvLyBjYW5jZWxlZCBsb2Fkcywgd2hpY2ggc2ls ZW50bHkgc2V0IG91ciByZXF1ZXN0IHRvIDAuIEJlIHN1cmUgdG8gbm90aWZ5IG91cgogICAgIC8v IGNsaWVudCBpbiB0aGF0IGNhc2UsIHNvIHdlIGRvbid0IHNlZW0gdG8gY29udGludWUgbG9hZGlu ZyBmb3JldmVyLgogICAgIGlmIChpc0xvYWRpbmcoKSkgeworICAgICAgICBBU1NFUlQoIW1fZXJy b3IuaXNOdWxsKCkpOwogICAgICAgICBzZXRMb2FkaW5nKGZhbHNlKTsKLSAgICAgICAgc2V0U3Rh dHVzKENhbmNlbGVkKTsKKyAgICAgICAgc2V0U3RhdHVzKExvYWRFcnJvcik7CiAgICAgICAgIGNo ZWNrTm90aWZ5KCk7CiAgICAgfQogfQpJbmRleDogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTMzMDkzKQor KysgU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTItMTAtMzEgIE5hdGUgQ2hhcGluICA8amFwaGV0QGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZW1vdmUgc29tZSBDYWNoZWRSZXNvdXJjZTo6U3RhdHVzJ3MgaW4gZmF2b3Igb2YgbG9v a2luZyBhdCBDYWNoZWRSZXNvdXJjZTo6bV9lcnJvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwOTAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCByZWZhY3RvciBvbmx5LgorCisg ICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JQYWdlQWdlbnQ6OmJ1aWxkT2JqZWN0Rm9yRnJhbWVUcmVlKToKKyAgICAg ICAgKiBsb2FkZXIvRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkRvY3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6bm90aWZ5RmluaXNoZWQpOgorICAgICAgICAq IGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6 bG9hZEluU2FtZURvY3VtZW50KToKKyAgICAgICAgKiBsb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U3VicmVzb3VyY2VMb2FkZXI6OmRpZEZhaWwpOgorICAg ICAgICAoV2ViQ29yZTo6U3VicmVzb3VyY2VMb2FkZXI6OndpbGxDYW5jZWwpOgorICAgICAgICAq IGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNo ZWRSZXNvdXJjZTo6c3RvcExvYWRpbmcpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRS ZXNvdXJjZS5oOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2U6Ondhc0NhbmNlbGVk KToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlOjplcnJvck9jY3VycmVkKToKKyAg ICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlOjpsb2FkRmFpbGVkT3JDYW5jZWxlZCk6CisK IDIwMTItMTAtMzEgIFJvZ2VyIEZvbmcgIDxyb2dlcl9mb25nQGFwcGxlLmNvbT4KIAogICAgICAg ICBDaGFuZ2UgUG9wdXBNZW51IHBvc2l0aW9uaW5nIG9uIFdpbmRvd3Mgc3VjaCB0aGF0IGJlaGF2 aW91ciBvbiBtdWx0aXBsZSBtb25pdG9ycyBtYXRjaGVzIFdpbmRvd3Mgc3RhbmRhcmRzLgo=