50078 2010-11-25 06:59:44 -0800 Simplify CachedResource error handling code by getting rid of the m_httpStatusCodeErrorOccurred boolean 2010-11-26 05:08:50 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned ap oldest_to_newest 313747 0 koivisto 2010-11-25 06:59:44 -0800 Simplify CachedResource error handling code by getting rid of the m_httpStatusCodeErrorOccurred boolean. 313791 1 74883 koivisto 2010-11-25 08:57:59 -0800 Created attachment 74883 patch 313970 2 koivisto 2010-11-26 05:08:50 -0800 http://trac.webkit.org/changeset/72743 74883 2010-11-25 08:57:59 -0800 2010-11-25 10:10:16 -0800 patch cached-resource-http-error-2.patch text/plain 6252 koivisto SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MjcyOSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMTEtMjUgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDA3OAorICAgICAgICBTaW1w bGlmeSBDYWNoZWRSZXNvdXJjZSBlcnJvciBoYW5kbGluZyBjb2RlIGJ5IGdldHRpbmcgcmlkIG9m IHRoZSBtX2h0dHBTdGF0dXNDb2RlRXJyb3JPY2N1cnJlZCBib29sZWFuLgorCisgICAgICAgICog bG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZElt YWdlOjpDYWNoZWRJbWFnZSk6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmg6 CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRJbWFnZTo6c2hvdWxkSWdub3JlSFRUUFN0YXR1c0Nv ZGVFcnJvcnMpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5oOgorICAg ICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2U6OnNob3VsZElnbm9yZUhUVFBTdGF0dXNDb2Rl RXJyb3JzKToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlOjpodHRwU3RhdHVzQ29k ZUVycm9yT2NjdXJyZWQpOgorICAgICAgICAqIGxvYWRlci9sb2FkZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TG9hZGVyOjpkaWRSZWNlaXZlRGF0YSk6CisKIDIwMTAtMTEtMjUgIEplcmVteSBP cmxvdyAgPGpvcmxvd0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU3RldmUg QmxvY2suCkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTEltYWdlTG9hZGVyLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL2h0bWwvSFRNTEltYWdlTG9hZGVyLmNwcAkocmV2aXNpb24gNzI3MjQpCisr KyBXZWJDb3JlL2h0bWwvSFRNTEltYWdlTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDgs NyArNDgsNyBAQCBIVE1MSW1hZ2VMb2FkZXI6On5IVE1MSW1hZ2VMb2FkZXIoKQogdm9pZCBIVE1M SW1hZ2VMb2FkZXI6OmRpc3BhdGNoTG9hZEV2ZW50KCkKIHsKICAgICBib29sIGVycm9yT2NjdXJy ZWQgPSBpbWFnZSgpLT5lcnJvck9jY3VycmVkKCk7Ci0gICAgaWYgKCFlcnJvck9jY3VycmVkICYm IGltYWdlKCktPmh0dHBTdGF0dXNDb2RlRXJyb3JPY2N1cnJlZCgpKQorICAgIGlmICghZXJyb3JP Y2N1cnJlZCAmJiBpbWFnZSgpLT5yZXNwb25zZSgpLmh0dHBTdGF0dXNDb2RlKCkgPj0gNDAwKQog ICAgICAgICBlcnJvck9jY3VycmVkID0gZWxlbWVudCgpLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6 b2JqZWN0VGFnKTsgLy8gQW4gPG9iamVjdD4gY29uc2lkZXJzIGEgNDA0IHRvIGJlIGFuIGVycm9y IGFuZCBzaG91bGQgZmlyZSBvbmVycm9yLgogICAgIGVsZW1lbnQoKS0+ZGlzcGF0Y2hFdmVudChF dmVudDo6Y3JlYXRlKGVycm9yT2NjdXJyZWQgPyBldmVudE5hbWVzKCkuZXJyb3JFdmVudCA6IGV2 ZW50TmFtZXMoKS5sb2FkRXZlbnQsIGZhbHNlLCBmYWxzZSkpOwogfQpAQCAtNjUsOCArNjUsOSBA QCB2b2lkIEhUTUxJbWFnZUxvYWRlcjo6bm90aWZ5RmluaXNoZWQoQ2FjCiAgICAgRWxlbWVudCog ZWxlbSA9IGVsZW1lbnQoKTsKICAgICBJbWFnZUxvYWRlcjo6bm90aWZ5RmluaXNoZWQoY2FjaGVk SW1hZ2UpOwogCisgICAgYm9vbCBsb2FkRXJyb3IgPSBjYWNoZWRJbWFnZS0+ZXJyb3JPY2N1cnJl ZCgpIHx8IGNhY2hlZEltYWdlLT5yZXNwb25zZSgpLmh0dHBTdGF0dXNDb2RlKCkgPj0gNDAwOwog I2lmIFVTRShKU0MpCi0gICAgaWYgKCFjYWNoZWRJbWFnZS0+ZXJyb3JPY2N1cnJlZCgpICYmICFj YWNoZWRJbWFnZS0+aHR0cFN0YXR1c0NvZGVFcnJvck9jY3VycmVkKCkpIHsKKyAgICBpZiAoIWxv YWRFcnJvcikgewogICAgICAgICBpZiAoIWVsZW0tPmluRG9jdW1lbnQoKSkgewogICAgICAgICAg ICAgSlNDOjpKU0dsb2JhbERhdGEqIGdsb2JhbERhdGEgPSBKU0RPTVdpbmRvd0Jhc2U6OmNvbW1v bkpTR2xvYmFsRGF0YSgpOwogICAgICAgICAgICAgZ2xvYmFsRGF0YS0+aGVhcC5yZXBvcnRFeHRy YU1lbW9yeUNvc3QoY2FjaGVkSW1hZ2UtPmVuY29kZWRTaXplKCkpOwpAQCAtNzQsNyArNzUsNyBA QCB2b2lkIEhUTUxJbWFnZUxvYWRlcjo6bm90aWZ5RmluaXNoZWQoQ2FjCiAgICAgfQogI2VuZGlm CiAKLSAgICBpZiAoKGNhY2hlZEltYWdlLT5lcnJvck9jY3VycmVkKCkgfHwgY2FjaGVkSW1hZ2Ut Pmh0dHBTdGF0dXNDb2RlRXJyb3JPY2N1cnJlZCgpKSAmJiBlbGVtLT5oYXNUYWdOYW1lKEhUTUxO YW1lczo6b2JqZWN0VGFnKSkKKyAgICBpZiAobG9hZEVycm9yICYmIGVsZW0tPmhhc1RhZ05hbWUo SFRNTE5hbWVzOjpvYmplY3RUYWcpKQogICAgICAgICBzdGF0aWNfY2FzdDxIVE1MT2JqZWN0RWxl bWVudCo+KGVsZW0pLT5yZW5kZXJGYWxsYmFja0NvbnRlbnQoKTsKIH0KIApJbmRleDogV2ViQ29y ZS9sb2FkZXIvbG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9sb2FkZXIu Y3BwCShyZXZpc2lvbiA3MjcyNCkKKysrIFdlYkNvcmUvbG9hZGVyL2xvYWRlci5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTMyMyw3ICszMjMsOCBAQCB2b2lkIExvYWRlcjo6ZGlkUmVjZWl2ZURhdGEo U3VicmVzb3VyY2VMCiAgICAgICAgIHJldHVybjsKIAogICAgIGlmIChyZXNvdXJjZS0+cmVzcG9u c2UoKS5odHRwU3RhdHVzQ29kZSgpID49IDQwMCkgewotICAgICAgICByZXNvdXJjZS0+aHR0cFN0 YXR1c0NvZGVFcnJvcigpOworICAgICAgICBpZiAoIXJlc291cmNlLT5zaG91bGRJZ25vcmVIVFRQ U3RhdHVzQ29kZUVycm9ycygpKQorICAgICAgICAgICAgcmVzb3VyY2UtPmVycm9yKENhY2hlZFJl c291cmNlOjpMb2FkRXJyb3IpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0zMzYsNyAr MzM3LDcgQEAgdm9pZCBMb2FkZXI6OmRpZFJlY2VpdmVEYXRhKFN1YnJlc291cmNlTAogICAgIH0g ZWxzZSBpZiAocmVxdWVzdC0+aXNJbmNyZW1lbnRhbCgpKQogICAgICAgICByZXNvdXJjZS0+ZGF0 YShsb2FkZXItPnJlc291cmNlRGF0YSgpLCBmYWxzZSk7CiB9Ci0gICAgCisKIHZvaWQgTG9hZGVy OjpkaWRSZWNlaXZlQ2FjaGVkTWV0YWRhdGEoU3VicmVzb3VyY2VMb2FkZXIqIGxvYWRlciwgY29u c3QgY2hhciogZGF0YSwgaW50IHNpemUpCiB7CiAgICAgUmVxdWVzdCogcmVxdWVzdCA9IG1fcmVx dWVzdHNMb2FkaW5nLmdldChsb2FkZXIpOwpJbmRleDogV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2Fj aGVkSW1hZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZElt YWdlLmNwcAkocmV2aXNpb24gNzI3MjQpCisrKyBXZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJ bWFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU1LDcgKzU1LDYgQEAgQ2FjaGVkSW1hZ2U6OkNh Y2hlZEltYWdlKGNvbnN0IFN0cmluZyYgdQogICAgIDogQ2FjaGVkUmVzb3VyY2UodXJsLCBJbWFn ZVJlc291cmNlKQogICAgICwgbV9pbWFnZSgwKQogICAgICwgbV9kZWNvZGVkRGF0YURlbGV0aW9u VGltZXIodGhpcywgJkNhY2hlZEltYWdlOjpkZWNvZGVkRGF0YURlbGV0aW9uVGltZXJGaXJlZCkK LSAgICAsIG1faHR0cFN0YXR1c0NvZGVFcnJvck9jY3VycmVkKGZhbHNlKQogewogICAgIHNldFN0 YXR1cyhVbmtub3duKTsKIH0KQEAgLTY0LDcgKzYzLDYgQEAgQ2FjaGVkSW1hZ2U6OkNhY2hlZElt YWdlKEltYWdlKiBpbWFnZSkKICAgICA6IENhY2hlZFJlc291cmNlKFN0cmluZygpLCBJbWFnZVJl c291cmNlKQogICAgICwgbV9pbWFnZShpbWFnZSkKICAgICAsIG1fZGVjb2RlZERhdGFEZWxldGlv blRpbWVyKHRoaXMsICZDYWNoZWRJbWFnZTo6ZGVjb2RlZERhdGFEZWxldGlvblRpbWVyRmlyZWQp Ci0gICAgLCBtX2h0dHBTdGF0dXNDb2RlRXJyb3JPY2N1cnJlZChmYWxzZSkKIHsKICAgICBzZXRT dGF0dXMoQ2FjaGVkKTsKICAgICBzZXRMb2FkaW5nKGZhbHNlKTsKQEAgLTMwNyw3ICszMDUsNyBA QCB2b2lkIENhY2hlZEltYWdlOjplcnJvcihDYWNoZWRSZXNvdXJjZTo6CiB7CiAgICAgY2xlYXIo KTsKICAgICBzZXRTdGF0dXMoc3RhdHVzKTsKLSAgICBBU1NFUlQoZXJyb3JPY2N1cnJlZCgpIHx8 IGh0dHBTdGF0dXNDb2RlRXJyb3JPY2N1cnJlZCgpKTsKKyAgICBBU1NFUlQoZXJyb3JPY2N1cnJl ZCgpKTsKICAgICBtX2RhdGEuY2xlYXIoKTsKICAgICBub3RpZnlPYnNlcnZlcnMoKTsKICAgICBz ZXRMb2FkaW5nKGZhbHNlKTsKSW5kZXg6IFdlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuaAkocmV2 aXNpb24gNzI3MjQpCisrKyBXZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC02Nyw4ICs2Nyw4IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZGF0 YShQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gZGF0YSwgYm9vbCBhbGxEYXRhUmVjZWl2ZWQpOwog ICAgIHZpcnR1YWwgdm9pZCBlcnJvcihDYWNoZWRSZXNvdXJjZTo6U3RhdHVzKTsKICAgICAKLSAg ICB2aXJ0dWFsIHZvaWQgaHR0cFN0YXR1c0NvZGVFcnJvcigpIHsgbV9odHRwU3RhdHVzQ29kZUVy cm9yT2NjdXJyZWQgPSB0cnVlOyB9Ci0gICAgYm9vbCBodHRwU3RhdHVzQ29kZUVycm9yT2NjdXJy ZWQoKSBjb25zdCB7IHJldHVybiBtX2h0dHBTdGF0dXNDb2RlRXJyb3JPY2N1cnJlZDsgfQorICAg IC8vIEZvciBjb21wYXRpYmlsaXR5LCBpbWFnZXMga2VlcCBsb2FkaW5nIGV2ZW4gaWYgdGhlcmUg YXJlIEhUVFAgZXJyb3JzLgorICAgIHZpcnR1YWwgYm9vbCBzaG91bGRJZ25vcmVIVFRQU3RhdHVz Q29kZUVycm9ycygpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KIAogICAgIHZvaWQgY2hlY2tOb3Rp ZnkoKTsKICAgICAKQEAgLTk3LDcgKzk3LDYgQEAgcHJpdmF0ZToKIAogICAgIFJlZlB0cjxJbWFn ZT4gbV9pbWFnZTsKICAgICBUaW1lcjxDYWNoZWRJbWFnZT4gbV9kZWNvZGVkRGF0YURlbGV0aW9u VGltZXI7Ci0gICAgYm9vbCBtX2h0dHBTdGF0dXNDb2RlRXJyb3JPY2N1cnJlZDsKIH07CiAKIH0K SW5kZXg6IFdlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuaAkocmV2aXNpb24gNzI3MjQp CisrKyBXZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5oCSh3b3JraW5nIGNvcHkp CkBAIC04NSw3ICs4NSw4IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIFN0cmluZyBlbmNvZGluZygp IGNvbnN0IHsgcmV0dXJuIFN0cmluZygpOyB9CiAgICAgdmlydHVhbCB2b2lkIGRhdGEoUGFzc1Jl ZlB0cjxTaGFyZWRCdWZmZXI+IGRhdGEsIGJvb2wgYWxsRGF0YVJlY2VpdmVkKTsKICAgICB2aXJ0 dWFsIHZvaWQgZXJyb3IoQ2FjaGVkUmVzb3VyY2U6OlN0YXR1cykgeyB9Ci0gICAgdmlydHVhbCB2 b2lkIGh0dHBTdGF0dXNDb2RlRXJyb3IoKSB7IGVycm9yKExvYWRFcnJvcik7IH0gLy8gSW1hZ2Vz IGtlZXAgbG9hZGluZyBpbiBzcGl0ZSBvZiBIVFRQIGVycm9ycyAoZm9yIGxlZ2FjeSBjb21wYXQg d2l0aCA8aW1nPiwgZXRjLikuCisKKyAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkSWdub3JlSFRUUFN0 YXR1c0NvZGVFcnJvcnMoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogCiAgICAgY29uc3QgU3Ry aW5nICZ1cmwoKSBjb25zdCB7IHJldHVybiBtX3VybDsgfQogICAgIFR5cGUgdHlwZSgpIGNvbnN0 IHsgcmV0dXJuIHN0YXRpY19jYXN0PFR5cGU+KG1fdHlwZSk7IH0K