211250 2020-04-30 13:11:32 -0700 Inline reportBlockedPortFailed and reportAuthenticationChallengeBlocked 2020-04-30 23:51:14 -0700 1 1 1 Unclassified WebKit New Bugs Safari Technology Preview Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rbuis rbuis achristensen cdumez ews-watchlist japhet mkwst webkit-bug-importer oldest_to_newest 1647517 0 rbuis 2020-04-30 13:11:32 -0700 These two static methods have only one caller each, so we can just inline them at the call site since there is nothing tying them to FrameLoader. 1647520 1 398085 rbuis 2020-04-30 13:13:03 -0700 Created attachment 398085 Patch 1647553 2 398085 rbuis 2020-04-30 14:25:32 -0700 Comment on attachment 398085 Patch Note that other solutions are possible as well, like making these private methods in the caller classes, or finding a different place as free functions, I just do not see the relation to FrameLoader. 1647779 3 ews-feeder 2020-04-30 23:50:59 -0700 Committed r260985: <https://trac.webkit.org/changeset/260985> All reviewed patches have been landed. Closing bug and clearing flags on attachment 398085. 1647780 4 webkit-bug-importer 2020-04-30 23:51:14 -0700 <rdar://problem/62707204> 398085 2020-04-30 13:13:03 -0700 2020-04-30 23:50:59 -0700 Patch bug-211250-20200430221302.patch text/plain 5192 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwODkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGM0NGJkNGY4NGRmZmY0 YjY5MjQ1NzY4OWZhMzE3ZjcyMDBjYzM4Yy4uOTQ5NTFlMjdiN2Q4NWE5NDU5ZDYwZTg2NzZjNGFj NGVhYTMwNjdkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA0LTMwICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgSW5saW5lIHJlcG9ydEJsb2NrZWRQ b3J0RmFpbGVkIGFuZCByZXBvcnRBdXRoZW50aWNhdGlvbkNoYWxsZW5nZUJsb2NrZWQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMTI1MAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXNlIHR3byBzdGF0 aWMgbWV0aG9kcyBoYXZlIG9ubHkgb25lIGNhbGxlciBlYWNoLCBzbyB3ZSBjYW4ganVzdAorICAg ICAgICBpbmxpbmUgdGhlbSBhdCB0aGUgY2FsbCBzaXRlIHNpbmNlIHRoZXJlIGlzIG5vdGhpbmcg dHlpbmcgdGhlbSB0byBGcmFtZUxvYWRlci4KKworICAgICAgICAqIGxvYWRlci9Eb2N1bWVudExv YWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExvYWRlcjo6d2lsbFNlbmRSZXF1 ZXN0KToKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RnJhbWVMb2FkZXI6OnJlcG9ydEJsb2NrZWRQb3J0RmFpbGVkKTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpyZXBvcnRBdXRoZW50aWNhdGlvbkNoYWxsZW5nZUJs b2NrZWQpOiBEZWxldGVkLgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5oOgorICAgICAg ICAqIGxvYWRlci9SZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJj ZUxvYWRlcjo6ZGlkQmxvY2tBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSk6CisKIDIwMjAtMDQtMjkg IFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBNYWtlIFBvbGljeUNoZWNr ZXIgYW4gaW5uZXIgY2xhc3Mgb2YgRnJhbWVMb2FkZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9j dW1lbnRMb2FkZXIuY3BwCmluZGV4IDI0ZmFiYjQxYzg5YWM5YzRlMWEyZTA4ZmU2MmM0ZjFlZmM4 MmE3ZWYuLjUwZDczNjBkNjA4MDE1MmQyNDViMzI5MmI0NzkzNGY1OGQ4NjFjZTMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcApAQCAtNjEwLDcgKzYxMCw4IEBAIHZv aWQgRG9jdW1lbnRMb2FkZXI6OndpbGxTZW5kUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmJiBuZXdS ZXF1ZXN0LCBjb25zdCBSZXNvdXJjCiAgICAgICAgIH0KICAgICAgICAgaWYgKCFwb3J0QWxsb3dl ZChuZXdSZXF1ZXN0LnVybCgpKSkgewogICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dF RCgid2lsbFNlbmRSZXF1ZXN0OiBjYW5jZWxpbmcgLSBwb3J0IG5vdCBhbGxvd2VkIik7Ci0gICAg ICAgICAgICBGcmFtZUxvYWRlcjo6cmVwb3J0QmxvY2tlZFBvcnRGYWlsZWQobV9mcmFtZSwgbmV3 UmVxdWVzdC51cmwoKS5zdHJpbmcoKSk7CisgICAgICAgICAgICBpZiAobV9mcmFtZSkKKyAgICAg ICAgICAgICAgICBtX2ZyYW1lLT5kb2N1bWVudCgpLT5hZGRDb25zb2xlTWVzc2FnZShNZXNzYWdl U291cmNlOjpTZWN1cml0eSwgTWVzc2FnZUxldmVsOjpFcnJvciwgIk5vdCBhbGxvd2VkIHRvIHVz ZSByZXN0cmljdGVkIG5ldHdvcmsgcG9ydDogIiArIG5ld1JlcXVlc3QudXJsKCkuc3RyaW5nKCkp OwogICAgICAgICAgICAgY2FuY2VsTWFpblJlc291cmNlTG9hZChmcmFtZUxvYWRlcigpLT5ibG9j a2VkRXJyb3IobmV3UmVxdWVzdCkpOwogICAgICAgICAgICAgcmV0dXJuIGNvbXBsZXRpb25IYW5k bGVyKFdURk1vdmUobmV3UmVxdWVzdCkpOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZGVyLmNwcAppbmRleCAzZTY1YTgwZmQ0ZTUzM2Y5ZjM1ZDcwMGQyZWNiNmViNGYyMDE5 NDVmLi4yMWVlZjNmOGU3ZDgxMGFmZGFkN2MwNTJiYzgzOTcxMzAwZGZlODU0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTE2NjgsMjMgKzE2NjgsNiBAQCB2b2lkIEZy YW1lTG9hZGVyOjpyZXBvcnRMb2NhbExvYWRGYWlsZWQoRnJhbWUqIGZyYW1lLCBjb25zdCBTdHJp bmcmIHVybCkKICAgICBmcmFtZS0+ZG9jdW1lbnQoKS0+YWRkQ29uc29sZU1lc3NhZ2UoTWVzc2Fn ZVNvdXJjZTo6U2VjdXJpdHksIE1lc3NhZ2VMZXZlbDo6RXJyb3IsICJOb3QgYWxsb3dlZCB0byBs b2FkIGxvY2FsIHJlc291cmNlOiAiICsgdXJsKTsKIH0KIAotdm9pZCBGcmFtZUxvYWRlcjo6cmVw b3J0QmxvY2tlZFBvcnRGYWlsZWQoRnJhbWUqIGZyYW1lLCBjb25zdCBTdHJpbmcmIHVybCkKLXsK LSAgICBBU1NFUlQoIXVybC5pc0VtcHR5KCkpOwotICAgIGlmICghZnJhbWUpCi0gICAgICAgIHJl dHVybjsKLSAgICAKLSAgICBmcmFtZS0+ZG9jdW1lbnQoKS0+YWRkQ29uc29sZU1lc3NhZ2UoTWVz c2FnZVNvdXJjZTo6U2VjdXJpdHksIE1lc3NhZ2VMZXZlbDo6RXJyb3IsICJOb3QgYWxsb3dlZCB0 byB1c2UgcmVzdHJpY3RlZCBuZXR3b3JrIHBvcnQ6ICIgKyB1cmwpOwotfQotCi12b2lkIEZyYW1l TG9hZGVyOjpyZXBvcnRBdXRoZW50aWNhdGlvbkNoYWxsZW5nZUJsb2NrZWQoRnJhbWUqIGZyYW1l LCBjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiByZWFzb24pCi17Ci0gICAgaWYgKCFmcmFt ZSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgZnJhbWUtPmRvY3VtZW50KCktPmFkZENvbnNvbGVN ZXNzYWdlKE1lc3NhZ2VTb3VyY2U6OlNlY3VyaXR5LCBNZXNzYWdlTGV2ZWw6OkVycm9yLCBtYWtl U3RyaW5nKCJCbG9ja2VkICIsIHVybC5zdHJpbmdDZW50ZXJFbGxpcHNpemVkVG9MZW5ndGgoKSwg IiBmcm9tIGFza2luZyBmb3IgY3JlZGVudGlhbHMgYmVjYXVzZSAiLCByZWFzb24sICcuJykpOwot fQotCiBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIEZyYW1lTG9hZGVyOjppbml0aWFsUmVxdWVzdCgp IGNvbnN0CiB7CiAgICAgcmV0dXJuIGFjdGl2ZURvY3VtZW50TG9hZGVyKCktPm9yaWdpbmFsUmVx dWVzdCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAppbmRleCBjN2RkYWU0MTdhNmJh MzI5MDg5ZTE1YjhlNDZhYjMwNGE5MjNlZWI4Li5lMTg3NTQ4MjA1MmY0ZGU4YmRjNTFhNTM2ZWI3 YjBiNTRjN2U2MGEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2Fk ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaApAQCAtMTQzLDgg KzE0Myw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHJldHJ5QWZ0ZXJGYWlsZWRDYWNoZU9ubHlNYWlu UmVzb3VyY2VMb2FkKCk7CiAKICAgICBzdGF0aWMgdm9pZCByZXBvcnRMb2NhbExvYWRGYWlsZWQo RnJhbWUqLCBjb25zdCBTdHJpbmcmIHVybCk7Ci0gICAgc3RhdGljIHZvaWQgcmVwb3J0QmxvY2tl ZFBvcnRGYWlsZWQoRnJhbWUqLCBjb25zdCBTdHJpbmcmIHVybCk7Ci0gICAgc3RhdGljIHZvaWQg cmVwb3J0QXV0aGVudGljYXRpb25DaGFsbGVuZ2VCbG9ja2VkKEZyYW1lKiwgY29uc3QgVVJMJiwg Y29uc3QgU3RyaW5nJiByZWFzb24pOwogCiAgICAgLy8gRklYTUU6IFRoZXNlIGFyZSBhbGwgZnVu Y3Rpb25zIHdoaWNoIHN0b3AgbG9hZHMuIFdlIGhhdmUgdG9vIG1hbnkuCiAgICAgdm9pZCBzdG9w QWxsTG9hZGVyc0FuZENoZWNrQ29tcGxldGVuZXNzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jl c291cmNlTG9hZGVyLmNwcAppbmRleCAwOTg0NzFkYjMxYjE4MTBkMzI1YmY4ODkyZThjNjMyMmUy NDE1MTUwLi40NDVjZDNmY2VlMmI0NjQ2MjEyZjk2NDU2ODg3NzQyMWRmYjc4MDNmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5jcHAKQEAgLTQ4OSw3ICs0ODksOSBAQCB2 b2lkIFJlc291cmNlTG9hZGVyOjpkaWRCbG9ja0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKCkKICAg ICBpZiAobV9vcHRpb25zLmNsaWVudENyZWRlbnRpYWxQb2xpY3kgPT0gQ2xpZW50Q3JlZGVudGlh bFBvbGljeTo6Q2Fubm90QXNrQ2xpZW50Rm9yQ3JlZGVudGlhbHMpCiAgICAgICAgIHJldHVybjsK ICAgICBBU1NFUlQoIXNob3VsZEFsbG93UmVzb3VyY2VUb0Fza0ZvckNyZWRlbnRpYWxzKCkpOwot ICAgIEZyYW1lTG9hZGVyOjpyZXBvcnRBdXRoZW50aWNhdGlvbkNoYWxsZW5nZUJsb2NrZWQobV9m cmFtZS5nZXQoKSwgbV9yZXF1ZXN0LnVybCgpLCAiaXQgaXMgYSBjcm9zcy1vcmlnaW4gcmVxdWVz dCJfcyk7CisgICAgaWYgKCFtX2ZyYW1lKQorICAgICAgICByZXR1cm47CisgICAgbV9mcmFtZS0+ ZG9jdW1lbnQoKS0+YWRkQ29uc29sZU1lc3NhZ2UoTWVzc2FnZVNvdXJjZTo6U2VjdXJpdHksIE1l c3NhZ2VMZXZlbDo6RXJyb3IsIG1ha2VTdHJpbmcoIkJsb2NrZWQgIiwgbV9yZXF1ZXN0LnVybCgp LnN0cmluZ0NlbnRlckVsbGlwc2l6ZWRUb0xlbmd0aCgpLCAiIGZyb20gYXNraW5nIGZvciBjcmVk ZW50aWFscyBiZWNhdXNlIGl0IGlzIGEgY3Jvc3Mtb3JpZ2luIHJlcXVlc3QuIikpOwogfQogCiB2 b2lkIFJlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlUmVzcG9uc2UoY29uc3QgUmVzb3VyY2VSZXNw b25zZSYgciwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIHBvbGljeUNvbXBsZXRpb25IYW5k bGVyKQo=