83962 2012-04-13 17:12:02 -0700 Remove calls to CRASH() from ResourceLoader.cpp 2012-04-13 17:35:58 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jberlin jberlin ap japhet jberlin webkit.review.bot oldest_to_newest 602528 0 jberlin 2012-04-13 17:12:02 -0700 They were added in r91316 to aid debugging for the issue fixed in r105556 and r106130. <rdar://problem/10100114> 602530 1 137183 jberlin 2012-04-13 17:14:28 -0700 Created attachment 137183 Patch 602546 2 137183 jberlin 2012-04-13 17:35:47 -0700 Comment on attachment 137183 Patch Committed in http://trac.webkit.org/changeset/114188 137183 2012-04-13 17:14:28 -0700 2012-04-13 17:35:47 -0700 Patch 0001-Remove-the-calls-to-CRASH-from-ResourceLoader.cpp.patch text/plain 6546 jberlin RnJvbSBkOTZhNGUyYWYwMmMzMWQ1YWZjYWYyZWVmZDZjMzA0MjFiMzQwNmI2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKZXNzaWUgQmVybGluIDxqYmVybGluQHdlYmtpdC5vcmc+CkRh dGU6IEZyaSwgMTMgQXByIDIwMTIgMTY6NTc6MDkgLTA3MDAKU3ViamVjdDogW1BBVENIXSBSZW1v dmUgdGhlIGNhbGxzIHRvIENSQVNIKCkgZnJvbSBSZXNvdXJjZUxvYWRlci5jcHAuCiBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODM5NjIKClJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgoKVGhleSB3ZXJlIGFkZGVkIGluIHI5MTMxNiB0byBhaWQgZGVidWdnaW5nIGZv ciB0aGUgaXNzdWUgZml4ZWQgaW4gcjEwNTU1NiBhbmQgcjEwNjEzMC4KCiogbG9hZGVyL1Jlc291 cmNlTG9hZGVyLmNwcDoKKFdlYkNvcmU6OlJlc291cmNlTG9hZGVyOjp3aWxsU2VuZFJlcXVlc3Qp OgooV2ViQ29yZTo6UmVzb3VyY2VMb2FkZXI6OmRpZFNlbmREYXRhKToKKFdlYkNvcmU6OlJlc291 cmNlTG9hZGVyOjpkaWRSZWNlaXZlUmVzcG9uc2UpOgooV2ViQ29yZTo6UmVzb3VyY2VMb2FkZXI6 OmRpZFJlY2VpdmVEYXRhKToKKFdlYkNvcmU6OlJlc291cmNlTG9hZGVyOjpkaWRGaW5pc2hMb2Fk aW5nKToKKFdlYkNvcmU6OlJlc291cmNlTG9hZGVyOjpkaWRGYWlsKToKKFdlYkNvcmU6OlJlc291 cmNlTG9hZGVyOjp3YXNCbG9ja2VkKToKKFdlYkNvcmU6OlJlc291cmNlTG9hZGVyOjpjYW5ub3RT aG93VVJMKToKKFdlYkNvcmU6OlJlc291cmNlTG9hZGVyOjpzaG91bGRVc2VDcmVkZW50aWFsU3Rv cmFnZSk6CihXZWJDb3JlOjpSZXNvdXJjZUxvYWRlcjo6d2lsbENhY2hlUmVzcG9uc2UpOgotLS0K IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgfCAgIDIxICsrKysrKysr KysrKysrKwogU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcCB8ICAgNDEg LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDIxIGluc2Vy dGlvbnMoKyksIDQxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3MmU4ODdiLi5lNGZmNmE2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTItMDQtMTMgIEplc3NpZSBCZXJsaW4g IDxqYmVybGluQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgdGhlIGNhbGxzIHRvIENSQVNI KCkgZnJvbSBSZXNvdXJjZUxvYWRlci5jcHAuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD04Mzk2MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoZXkgd2VyZSBhZGRlZCBpbiByOTEzMTYgdG8gYWlkIGRlYnVn Z2luZyBmb3IgdGhlIGlzc3VlIGZpeGVkIGluIHIxMDU1NTYgYW5kIHIxMDYxMzAuCisKKyAgICAg ICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3Vy Y2VMb2FkZXI6OndpbGxTZW5kUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxv YWRlcjo6ZGlkU2VuZERhdGEpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkZXI6OmRp ZFJlY2VpdmVSZXNwb25zZSk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlcjo6ZGlk UmVjZWl2ZURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkZXI6OmRpZEZpbmlz aExvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkZXI6OmRpZEZhaWwpOgor ICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkZXI6Ondhc0Jsb2NrZWQpOgorICAgICAgICAo V2ViQ29yZTo6UmVzb3VyY2VMb2FkZXI6OmNhbm5vdFNob3dVUkwpOgorICAgICAgICAoV2ViQ29y ZTo6UmVzb3VyY2VMb2FkZXI6OnNob3VsZFVzZUNyZWRlbnRpYWxTdG9yYWdlKToKKyAgICAgICAg KFdlYkNvcmU6OlJlc291cmNlTG9hZGVyOjp3aWxsQ2FjaGVSZXNwb25zZSk6CisKIDIwMTItMDQt MTIgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgUHJlcHJv Y2Vzc2luZyB0ZXh0IGZpbGVzIHdpdGggbW9kZXJuIGNsYW5nIHRyZWF0cyBkb3VibGUgc2xhc2hl cyBpbiBjb21tZW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNl TG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5jcHAKaW5k ZXggZDhmZTdkYS4uZDI2ZjIzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jl c291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2Fk ZXIuY3BwCkBAIC0yMTYsMTAgKzIxNiw2IEBAIHZvaWQgUmVzb3VyY2VMb2FkZXI6OmNsZWFyUmVz b3VyY2VEYXRhKCkKIAogdm9pZCBSZXNvdXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0KFJlc291 cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVkaXJlY3RSZXNw b25zZSkKIHsKLSAgICBpZiAoIWZhc3RNYWxsb2NTaXplKGRvY3VtZW50TG9hZGVyKCktPmFwcGxp Y2F0aW9uQ2FjaGVIb3N0KCkpKQotICAgICAgICBDUkFTSCgpOwotICAgIGlmICghZmFzdE1hbGxv Y1NpemUoZG9jdW1lbnRMb2FkZXIoKS0+ZnJhbWUoKSkpCi0gICAgICAgIENSQVNIKCk7CiAgICAg Ly8gUHJvdGVjdCB0aGlzIGluIHRoaXMgZGVsZWdhdGUgbWV0aG9kIHNpbmNlIHRoZSBhZGRpdGlv bmFsIHByb2Nlc3NpbmcgY2FuIGRvCiAgICAgLy8gYW55dGhpbmcgaW5jbHVkaW5nIHBvc3NpYmx5 IGRlcmVmaW5nIHRoaXM7IG9uZSBleGFtcGxlIG9mIHRoaXMgaXMgUmFkYXIgMzI2NjIxNi4KICAg ICBSZWZQdHI8UmVzb3VyY2VMb2FkZXI+IHByb3RlY3Rvcih0aGlzKTsKQEAgLTI0MiwxOCArMjM4 LDEwIEBAIHZvaWQgUmVzb3VyY2VMb2FkZXI6OndpbGxTZW5kUmVxdWVzdChSZXNvdXJjZVJlcXVl c3QmIHJlcXVlc3QsIGNvbnN0IFJlc291cmNlUmVzCiAKIHZvaWQgUmVzb3VyY2VMb2FkZXI6OmRp ZFNlbmREYXRhKHVuc2lnbmVkIGxvbmcgbG9uZywgdW5zaWduZWQgbG9uZyBsb25nKQogewotICAg IGlmICghZmFzdE1hbGxvY1NpemUoZG9jdW1lbnRMb2FkZXIoKS0+YXBwbGljYXRpb25DYWNoZUhv c3QoKSkpCi0gICAgICAgIENSQVNIKCk7Ci0gICAgaWYgKCFmYXN0TWFsbG9jU2l6ZShkb2N1bWVu dExvYWRlcigpLT5mcmFtZSgpKSkKLSAgICAgICAgQ1JBU0goKTsKIH0KIAogdm9pZCBSZXNvdXJj ZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHIpCiB7 Ci0gICAgaWYgKCFmYXN0TWFsbG9jU2l6ZShkb2N1bWVudExvYWRlcigpLT5hcHBsaWNhdGlvbkNh Y2hlSG9zdCgpKSkKLSAgICAgICAgQ1JBU0goKTsKLSAgICBpZiAoIWZhc3RNYWxsb2NTaXplKGRv Y3VtZW50TG9hZGVyKCktPmZyYW1lKCkpKQotICAgICAgICBDUkFTSCgpOwogICAgIEFTU0VSVCgh bV9yZWFjaGVkVGVybWluYWxTdGF0ZSk7CiAKICAgICAvLyBQcm90ZWN0IHRoaXMgaW4gdGhpcyBk ZWxlZ2F0ZSBtZXRob2Qgc2luY2UgdGhlIGFkZGl0aW9uYWwgcHJvY2Vzc2luZyBjYW4gZG8KQEAg LTI3MSwxMCArMjU5LDYgQEAgdm9pZCBSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNl KGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHIpCiAKIHZvaWQgUmVzb3VyY2VMb2FkZXI6OmRpZFJl Y2VpdmVEYXRhKGNvbnN0IGNoYXIqIGRhdGEsIGludCBsZW5ndGgsIGxvbmcgbG9uZyBlbmNvZGVk RGF0YUxlbmd0aCwgYm9vbCBhbGxBdE9uY2UpCiB7Ci0gICAgaWYgKCFtX2NhbmNlbGxlZCAmJiAh ZmFzdE1hbGxvY1NpemUoZG9jdW1lbnRMb2FkZXIoKS0+YXBwbGljYXRpb25DYWNoZUhvc3QoKSkp Ci0gICAgICAgIENSQVNIKCk7Ci0gICAgaWYgKCFtX2NhbmNlbGxlZCAmJiAhZmFzdE1hbGxvY1Np emUoZG9jdW1lbnRMb2FkZXIoKS0+ZnJhbWUoKSkpCi0gICAgICAgIENSQVNIKCk7CiAgICAgLy8g VGhlIGZvbGxvd2luZyBhc3NlcnRpb25zIGFyZSBub3QgcXVpdGUgdmFsaWQgaGVyZSwgc2luY2Ug YSBzdWJjbGFzcwogICAgIC8vIG1pZ2h0IG92ZXJyaWRlIGRpZFJlY2VpdmVEYXRhIGluIGEgd2F5 IHRoYXQgaW52YWxpZGF0ZXMgdGhlbS4gVGhpcwogICAgIC8vIGhhcHBlbnMgd2l0aCB0aGUgc3Rl cHMgbGlzdGVkIGluIDMyNjYyMTYKQEAgLTQ0NSwxOSArNDI5LDExIEBAIHZvaWQgUmVzb3VyY2VM b2FkZXI6OmRpZFJlY2VpdmVEYXRhKFJlc291cmNlSGFuZGxlKiwgY29uc3QgY2hhciogZGF0YSwg aW50IGxlbmd0CiAKIHZvaWQgUmVzb3VyY2VMb2FkZXI6OmRpZEZpbmlzaExvYWRpbmcoUmVzb3Vy Y2VIYW5kbGUqLCBkb3VibGUgZmluaXNoVGltZSkKIHsKLSAgICBpZiAoIWZhc3RNYWxsb2NTaXpl KGRvY3VtZW50TG9hZGVyKCktPmFwcGxpY2F0aW9uQ2FjaGVIb3N0KCkpKQotICAgICAgICBDUkFT SCgpOwotICAgIGlmICghZmFzdE1hbGxvY1NpemUoZG9jdW1lbnRMb2FkZXIoKS0+ZnJhbWUoKSkp Ci0gICAgICAgIENSQVNIKCk7CiAgICAgZGlkRmluaXNoTG9hZGluZyhmaW5pc2hUaW1lKTsKIH0K IAogdm9pZCBSZXNvdXJjZUxvYWRlcjo6ZGlkRmFpbChSZXNvdXJjZUhhbmRsZSosIGNvbnN0IFJl c291cmNlRXJyb3ImIGVycm9yKQogewotICAgIGlmICghZmFzdE1hbGxvY1NpemUoZG9jdW1lbnRM b2FkZXIoKS0+YXBwbGljYXRpb25DYWNoZUhvc3QoKSkpCi0gICAgICAgIENSQVNIKCk7Ci0gICAg aWYgKCFmYXN0TWFsbG9jU2l6ZShkb2N1bWVudExvYWRlcigpLT5mcmFtZSgpKSkKLSAgICAgICAg Q1JBU0goKTsKICAgICBpZiAoZG9jdW1lbnRMb2FkZXIoKS0+YXBwbGljYXRpb25DYWNoZUhvc3Qo KS0+bWF5YmVMb2FkRmFsbGJhY2tGb3JFcnJvcih0aGlzLCBlcnJvcikpCiAgICAgICAgIHJldHVy bjsKICAgICBkaWRGYWlsKGVycm9yKTsKQEAgLTQ2NSwyOSArNDQxLDE2IEBAIHZvaWQgUmVzb3Vy Y2VMb2FkZXI6OmRpZEZhaWwoUmVzb3VyY2VIYW5kbGUqLCBjb25zdCBSZXNvdXJjZUVycm9yJiBl cnJvcikKIAogdm9pZCBSZXNvdXJjZUxvYWRlcjo6d2FzQmxvY2tlZChSZXNvdXJjZUhhbmRsZSop CiB7Ci0gICAgaWYgKCFmYXN0TWFsbG9jU2l6ZShkb2N1bWVudExvYWRlcigpLT5hcHBsaWNhdGlv bkNhY2hlSG9zdCgpKSkKLSAgICAgICAgQ1JBU0goKTsKLSAgICBpZiAoIWZhc3RNYWxsb2NTaXpl KGRvY3VtZW50TG9hZGVyKCktPmZyYW1lKCkpKQotICAgICAgICBDUkFTSCgpOwogICAgIGRpZEZh aWwoYmxvY2tlZEVycm9yKCkpOwogfQogCiB2b2lkIFJlc291cmNlTG9hZGVyOjpjYW5ub3RTaG93 VVJMKFJlc291cmNlSGFuZGxlKikKIHsKLSAgICBpZiAoIWZhc3RNYWxsb2NTaXplKGRvY3VtZW50 TG9hZGVyKCktPmFwcGxpY2F0aW9uQ2FjaGVIb3N0KCkpKQotICAgICAgICBDUkFTSCgpOwotICAg IGlmICghZmFzdE1hbGxvY1NpemUoZG9jdW1lbnRMb2FkZXIoKS0+ZnJhbWUoKSkpCi0gICAgICAg IENSQVNIKCk7CiAgICAgZGlkRmFpbChjYW5ub3RTaG93VVJMRXJyb3IoKSk7CiB9CiAKIGJvb2wg UmVzb3VyY2VMb2FkZXI6OnNob3VsZFVzZUNyZWRlbnRpYWxTdG9yYWdlKCkKIHsKLSAgICBpZiAo IWZhc3RNYWxsb2NTaXplKGRvY3VtZW50TG9hZGVyKCktPmFwcGxpY2F0aW9uQ2FjaGVIb3N0KCkp KQotICAgICAgICBDUkFTSCgpOwotICAgIGlmICghZmFzdE1hbGxvY1NpemUoZG9jdW1lbnRMb2Fk ZXIoKS0+ZnJhbWUoKSkpCi0gICAgICAgIENSQVNIKCk7Ci0KICAgICBpZiAobV9vcHRpb25zLmFs bG93Q3JlZGVudGlhbHMgPT0gRG9Ob3RBbGxvd1N0b3JlZENyZWRlbnRpYWxzKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgCkBAIC01NDEsMTAgKzUwNCw2IEBAIHZvaWQgUmVzb3VyY2VMb2Fk ZXI6OnJlY2VpdmVkQ2FuY2VsbGF0aW9uKGNvbnN0IEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJikK IAogdm9pZCBSZXNvdXJjZUxvYWRlcjo6d2lsbENhY2hlUmVzcG9uc2UoUmVzb3VyY2VIYW5kbGUq LCBDYWNoZVN0b3JhZ2VQb2xpY3kmIHBvbGljeSkKIHsKLSAgICBpZiAoIWZhc3RNYWxsb2NTaXpl KGRvY3VtZW50TG9hZGVyKCktPmFwcGxpY2F0aW9uQ2FjaGVIb3N0KCkpKQotICAgICAgICBDUkFT SCgpOwotICAgIGlmICghZmFzdE1hbGxvY1NpemUoZG9jdW1lbnRMb2FkZXIoKS0+ZnJhbWUoKSkp Ci0gICAgICAgIENSQVNIKCk7CiAgICAgLy8gPHJkYXI6Ly9wcm9ibGVtLzcyNDk1NTM+IC0gVGhl cmUgYXJlIHJlcG9ydHMgb2YgY3Jhc2hlcyB3aXRoIHRoaXMgbWV0aG9kIGJlaW5nIGNhbGxlZAog ICAgIC8vIHdpdGggYSBudWxsIG1fZnJhbWUtPnNldHRpbmdzKCksIHdoaWNoIGNhbiBvbmx5IGhh cHBlbiBpZiB0aGUgZnJhbWUgZG9lc24ndCBoYXZlIGEgcGFnZS4KICAgICAvLyBTYWRseSB3ZSBo YXZlIG5vIHJlcHJvZHVjaWJsZSBjYXNlcyBvZiB0aGlzLgotLSAKMS43LjUuNAoK