61666 2011-05-27 14:18:38 -0700 Simplify flow of CachedResourceRequest creation 2011-05-30 00:46:01 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 japhet japhet abarth ap commit-queue koivisto oldest_to_newest 411660 0 japhet 2011-05-27 14:18:38 -0700 The creation of a CachedResourceRequest seems really circular. CachedResourceLoader calls CachedResource::load(), which then calls back to CachedResourceLoader::load(), which finally calls CachedResourceRequest::load(). I'm going to upload a patch and let others decide whether it's actually prettier than what we have now. 411661 1 95215 japhet 2011-05-27 14:23:04 -0700 Created attachment 95215 patch 411668 2 95215 abarth 2011-05-27 14:34:43 -0700 Comment on attachment 95215 patch View in context: https://bugs.webkit.org/attachment.cgi?id=95215&action=review > Source/WebCore/loader/cache/CachedFont.cpp:-100 > - dl->load(this, false); We shouldn't call CachedResourceLoader "dl". That's an echo of the horrible "DocLoader" name. 412138 3 95215 koivisto 2011-05-30 00:18:10 -0700 Comment on attachment 95215 patch it's better, r=me 412149 4 95215 commit-queue 2011-05-30 00:45:55 -0700 Comment on attachment 95215 patch Clearing flags on attachment: 95215 Committed r87679: <http://trac.webkit.org/changeset/87679> 412150 5 commit-queue 2011-05-30 00:46:01 -0700 All reviewed patches have been landed. Closing bug. 95215 2011-05-27 14:23:04 -0700 2011-05-30 00:45:55 -0700 patch cr.txt text/plain 5679 japhet SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3NTY4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDUtMjUgIE5hdGUgQ2hh cGluICA8amFwaGV0QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBSZWZhY3RvciB0aGUgQ2FjaGVkUmVzb3VyY2VMb2FkZXIgLT4g Q2FjaGVkUmVzb3VyY2UgLT4gQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0CisgICAgICAgIGZsb3cgc28g aXQncyBhIGxpdHRsZSBsZXNzIGNpcmN1bGFyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE2NjYKKworICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNo ZWRGb250LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZEZvbnQ6OmJlZ2luTG9hZElmTmVl ZGVkKToKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2U6OmxvYWQpOgorICAgICAgICAqIGxvYWRlci9jYWNo ZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNv dXJjZUxvYWRlcjo6cmVxdWVzdEltYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291 cmNlTG9hZGVyOjpzZXRBdXRvTG9hZEltYWdlcyk6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRS ZXNvdXJjZUxvYWRlcjo6bG9hZFN0YXJ0ZWQpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNo ZWRSZXNvdXJjZUxvYWRlci5oOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJj ZVJlcXVlc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VSZXF1ZXN0Ojps b2FkKToKKwogMjAxMS0wNS0yNyAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9s b2FkZXIvY2FjaGUvQ2FjaGVkRm9udC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv bG9hZGVyL2NhY2hlL0NhY2hlZEZvbnQuY3BwCShyZXZpc2lvbiA4NzU2OCkKKysrIFNvdXJjZS9X ZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRGb250LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTcs NyArOTcsNyBAQAogewogICAgIGlmICghbV9sb2FkSW5pdGlhdGVkKSB7CiAgICAgICAgIG1fbG9h ZEluaXRpYXRlZCA9IHRydWU7Ci0gICAgICAgIGRsLT5sb2FkKHRoaXMsIGZhbHNlKTsKKyAgICAg ICAgQ2FjaGVkUmVzb3VyY2U6OmxvYWQoZGwpOwogICAgIH0KIH0KIApJbmRleDogU291cmNlL1dl YkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCShy ZXZpc2lvbiA4NzU2OCkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNv dXJjZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzOSwxMCArMTM5LDggQEAKICAgICAg ICAgfQogICAgIH0KICAgICBDYWNoZWRJbWFnZSogcmVzb3VyY2UgPSBzdGF0aWNfY2FzdDxDYWNo ZWRJbWFnZSo+KHJlcXVlc3RSZXNvdXJjZShDYWNoZWRSZXNvdXJjZTo6SW1hZ2VSZXNvdXJjZSwg cmVxdWVzdCwgU3RyaW5nKCkpKTsKLSAgICBpZiAoYXV0b0xvYWRJbWFnZXMoKSAmJiByZXNvdXJj ZSAmJiByZXNvdXJjZS0+c3RpbGxOZWVkc0xvYWQoKSkgewotICAgICAgICByZXNvdXJjZS0+c2V0 TG9hZGluZyh0cnVlKTsKLSAgICAgICAgbG9hZChyZXNvdXJjZSwgdHJ1ZSk7Ci0gICAgfQorICAg IGlmIChhdXRvTG9hZEltYWdlcygpICYmIHJlc291cmNlICYmIHJlc291cmNlLT5zdGlsbE5lZWRz TG9hZCgpKQorICAgICAgICByZXNvdXJjZS0+bG9hZCh0aGlzKTsKICAgICByZXR1cm4gcmVzb3Vy Y2U7CiB9CiAKQEAgLTUzNiw3ICs1MzQsNyBAQAogICAgICAgICAgICAgQ2FjaGVkSW1hZ2UqIGlt YWdlID0gY29uc3RfY2FzdDxDYWNoZWRJbWFnZSo+KHN0YXRpY19jYXN0PGNvbnN0IENhY2hlZElt YWdlKj4ocmVzb3VyY2UpKTsKIAogICAgICAgICAgICAgaWYgKGltYWdlLT5zdGlsbE5lZWRzTG9h ZCgpKQotICAgICAgICAgICAgICAgIGxvYWQoaW1hZ2UsIHRydWUpOworICAgICAgICAgICAgICAg IGltYWdlLT5sb2FkKHRoaXMpOwogICAgICAgICB9CiAgICAgfQogfQpAQCAtNTU2LDEzICs1NTQs MTEgQEAKICAgICBtX2RvY3VtZW50UmVzb3VyY2VzLnJlbW92ZShyZXNvdXJjZS0+dXJsKCkpOwog fQogCi12b2lkIENhY2hlZFJlc291cmNlTG9hZGVyOjpsb2FkKENhY2hlZFJlc291cmNlKiByZXNv dXJjZSwgYm9vbCBpbmNyZW1lbnRhbCwgU2VjdXJpdHlDaGVja1BvbGljeSBzZWN1cml0eUNoZWNr LCBib29sIHNlbmRSZXNvdXJjZUxvYWRDYWxsYmFja3MpCit2b2lkIENhY2hlZFJlc291cmNlTG9h ZGVyOjpsb2FkU3RhcnRlZChDYWNoZWRSZXNvdXJjZSogcmVzb3VyY2UsIFBhc3NSZWZQdHI8Q2Fj aGVkUmVzb3VyY2VSZXF1ZXN0PiByZXF1ZXN0KQogeworICAgIEFTU0VSVChyZXF1ZXN0KTsKICAg ICBpbmNyZW1lbnRSZXF1ZXN0Q291bnQocmVzb3VyY2UpOwotCi0gICAgUmVmUHRyPENhY2hlZFJl c291cmNlUmVxdWVzdD4gcmVxdWVzdCA9IENhY2hlZFJlc291cmNlUmVxdWVzdDo6bG9hZCh0aGlz LCByZXNvdXJjZSwgaW5jcmVtZW50YWwsIHNlY3VyaXR5Q2hlY2ssIHNlbmRSZXNvdXJjZUxvYWRD YWxsYmFja3MpOwotICAgIGlmIChyZXF1ZXN0KQotICAgICAgICBtX3JlcXVlc3RzLmFkZChyZXF1 ZXN0KTsKKyAgICBtX3JlcXVlc3RzLmFkZChyZXF1ZXN0KTsKIH0KIAogdm9pZCBDYWNoZWRSZXNv dXJjZUxvYWRlcjo6bG9hZERvbmUoQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0KiByZXF1ZXN0KQpJbmRl eDogU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9h ZGVyLmgJKHJldmlzaW9uIDg3NTY4KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0Nh Y2hlZFJlc291cmNlTG9hZGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTkyLDcgKzkyLDcgQEAKIAog ICAgIHZvaWQgcmVtb3ZlQ2FjaGVkUmVzb3VyY2UoQ2FjaGVkUmVzb3VyY2UqKSBjb25zdDsKIAot ICAgIHZvaWQgbG9hZChDYWNoZWRSZXNvdXJjZSosIGJvb2wgaW5jcmVtZW50YWwgPSBmYWxzZSwg U2VjdXJpdHlDaGVja1BvbGljeSA9IERvU2VjdXJpdHlDaGVjaywgYm9vbCBzZW5kUmVzb3VyY2VM b2FkQ2FsbGJhY2tzID0gdHJ1ZSk7CisgICAgdm9pZCBsb2FkU3RhcnRlZChDYWNoZWRSZXNvdXJj ZSosIFBhc3NSZWZQdHI8Q2FjaGVkUmVzb3VyY2VSZXF1ZXN0Pik7CiAgICAgdm9pZCBsb2FkRmlu aXNoaW5nKCkgeyBtX2xvYWRGaW5pc2hpbmcgPSB0cnVlOyB9CiAgICAgdm9pZCBsb2FkRG9uZShD YWNoZWRSZXNvdXJjZVJlcXVlc3QqKTsKICAgICB2b2lkIGNhbmNlbFJlcXVlc3RzKCk7CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5jcHAJKHJl dmlzaW9uIDg3NTY4KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291 cmNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM1LDggKzEzNSwxMCBAQAogdm9pZCBDYWNoZWRS ZXNvdXJjZTo6bG9hZChDYWNoZWRSZXNvdXJjZUxvYWRlciogY2FjaGVkUmVzb3VyY2VMb2FkZXIs IGJvb2wgaW5jcmVtZW50YWwsIFNlY3VyaXR5Q2hlY2tQb2xpY3kgc2VjdXJpdHlDaGVjaywgYm9v bCBzZW5kUmVzb3VyY2VMb2FkQ2FsbGJhY2tzKQogewogICAgIG1fc2VuZFJlc291cmNlTG9hZENh bGxiYWNrcyA9IHNlbmRSZXNvdXJjZUxvYWRDYWxsYmFja3M7Ci0gICAgY2FjaGVkUmVzb3VyY2VM b2FkZXItPmxvYWQodGhpcywgaW5jcmVtZW50YWwsIHNlY3VyaXR5Q2hlY2ssIHNlbmRSZXNvdXJj ZUxvYWRDYWxsYmFja3MpOwogICAgIG1fbG9hZGluZyA9IHRydWU7CisgICAgUmVmUHRyPENhY2hl ZFJlc291cmNlUmVxdWVzdD4gcmVxdWVzdCA9IENhY2hlZFJlc291cmNlUmVxdWVzdDo6bG9hZChj YWNoZWRSZXNvdXJjZUxvYWRlciwgdGhpcywgaW5jcmVtZW50YWwsIHNlY3VyaXR5Q2hlY2ssIHNl bmRSZXNvdXJjZUxvYWRDYWxsYmFja3MpOworICAgIGlmIChyZXF1ZXN0KQorICAgICAgICBjYWNo ZWRSZXNvdXJjZUxvYWRlci0+bG9hZFN0YXJ0ZWQodGhpcywgcmVxdWVzdCk7CiB9CiAKIHZvaWQg Q2FjaGVkUmVzb3VyY2U6OmNoZWNrTm90aWZ5KCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRl ci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3QuY3BwCShyZXZpc2lvbiA4 NzU2OCkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVl c3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjcsMTIgKzEyNyw5IEBACiAgICAgaWYgKCFsb2Fk ZXIgfHwgbG9hZGVyLT5yZWFjaGVkVGVybWluYWxTdGF0ZSgpKSB7CiAgICAgICAgIC8vIEZJWE1F OiBXaGF0IGlmIHJlc291cmNlcyBpbiBvdGhlciBmcmFtZXMgd2VyZSB3YWl0aW5nIGZvciB0aGlz IHJldmFsaWRhdGlvbj8KICAgICAgICAgTE9HKFJlc291cmNlTG9hZGluZywgIkNhbm5vdCBzdGFy dCBsb2FkaW5nICclcyciLCByZXNvdXJjZS0+dXJsKCkuc3RyaW5nKCkubGF0aW4xKCkuZGF0YSgp KTsKLSAgICAgICAgY2FjaGVkUmVzb3VyY2VMb2FkZXItPmRlY3JlbWVudFJlcXVlc3RDb3VudChy ZXNvdXJjZSk7Ci0gICAgICAgIGNhY2hlZFJlc291cmNlTG9hZGVyLT5sb2FkRmluaXNoaW5nKCk7 CiAgICAgICAgIGlmIChyZXNvdXJjZS0+cmVzb3VyY2VUb1JldmFsaWRhdGUoKSkgCiAgICAgICAg ICAgICBtZW1vcnlDYWNoZSgpLT5yZXZhbGlkYXRpb25GYWlsZWQocmVzb3VyY2UpOyAKICAgICAg ICAgcmVzb3VyY2UtPmVycm9yKENhY2hlZFJlc291cmNlOjpMb2FkRXJyb3IpOwotICAgICAgICBj YWNoZWRSZXNvdXJjZUxvYWRlci0+bG9hZERvbmUoMCk7CiAgICAgICAgIHJldHVybiAwOwogICAg IH0KICAgICByZXF1ZXN0LT5tX2xvYWRlciA9IGxvYWRlcjsK