214717 2020-07-23 17:52:47 -0700 Remove dead code in ResourceHandleCFNet.cpp 2020-07-23 19:29:20 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen darin webkit-bug-importer oldest_to_newest 1674499 0 achristensen 2020-07-23 17:52:47 -0700 Remove dead code in ResourceHandleCFNet.cpp 1674501 1 405106 achristensen 2020-07-23 17:53:45 -0700 Created attachment 405106 Patch 1674523 2 ews-feeder 2020-07-23 19:28:08 -0700 Committed r264808: <https://trac.webkit.org/changeset/264808> All reviewed patches have been landed. Closing bug and clearing flags on attachment 405106. 1674524 3 webkit-bug-importer 2020-07-23 19:29:20 -0700 <rdar://problem/66027479> 405106 2020-07-23 17:53:45 -0700 2020-07-23 19:28:09 -0700 Patch bug-214717-20200723175344.patch text/plain 5784 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2NDgwNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDIwLTA3LTIzICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVtb3ZlIGRl YWQgY29kZSBpbiBSZXNvdXJjZUhhbmRsZUNGTmV0LmNwcAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0NzE3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVzb3VyY2VIYW5kbGVDRk5ldC5jcHAgaXMgbm90 IGNvbXBpbGVkIG9uIENvY29hIHBsYXRmb3JtcyBhbnkgbW9yZS4KKyAgICAgICAgUmVtb3ZlIENv Y29hLXNwZWNpZmljIGNvZGUgaW4gdGhhdCBmaWxlLCB3aGljaCB3YXMgdXNlZCBvbiBpT1MgYmVm b3JlIGFkb3B0aW5nIE5TVVJMU2Vzc2lvbi4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsv Y2YvUmVzb3VyY2VIYW5kbGVDRk5ldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhh bmRsZTo6Y3JlYXRlQ0ZVUkxDb25uZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNl SGFuZGxlOjpzdGFydCk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6dHJ5SGFu ZGxlUGFzc3dvcmRCYXNlZEF1dGhlbnRpY2F0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291 cmNlSGFuZGxlOjpyZWNlaXZlZENyZWRlbnRpYWwpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3Vy Y2VIYW5kbGU6OnNjaGVkdWxlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNl SGFuZGxlOjp1bnNjaGVkdWxlKTogRGVsZXRlZC4KKwogMjAyMC0wNy0yMyAgSmFtZXMgRGFycGlu aWFuICA8amRhcnBpbmlhbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW1dlYkdMMl0gUXVlcnkg T2JqZWN0cwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJj ZUhhbmRsZUNGTmV0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL2NmL1Jlc291cmNlSGFuZGxlQ0ZOZXQuY3BwCShyZXZpc2lvbiAyNjQ4MDYpCisrKyBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlSGFuZGxlQ0ZOZXQuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yMTIsMTIgKzIxMiw2IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6 OmNyZWF0ZUNGVVJMQ29ubmVjdGkKICAgICAgICAgQ0ZEaWN0aW9uYXJ5U2V0VmFsdWUoc3RyZWFt UHJvcGVydGllcywgQ0ZTVFIoIl9rQ0ZVUkxDb25uZWN0aW9uU2Vzc2lvbklEIiksIENGU1RSKCJX ZWJLaXRQcml2YXRlU2Vzc2lvbiIpKTsKICAgICB9CiAKLSNpZiBQTEFURk9STShDT0NPQSkKLSAg ICBSZXRhaW5QdHI8Q0ZEYXRhUmVmPiBzb3VyY2VBcHBsaWNhdGlvbkF1ZGl0RGF0YSA9IGQtPm1f Y29udGV4dC0+c291cmNlQXBwbGljYXRpb25BdWRpdERhdGEoKTsKLSAgICBpZiAoc291cmNlQXBw bGljYXRpb25BdWRpdERhdGEpCi0gICAgICAgIENGRGljdGlvbmFyeVNldFZhbHVlKHN0cmVhbVBy b3BlcnRpZXMsIENGU1RSKCJrQ0ZTdHJlYW1Qcm9wZXJ0eVNvdXJjZUFwcGxpY2F0aW9uIiksIHNv dXJjZUFwcGxpY2F0aW9uQXVkaXREYXRhLmdldCgpKTsKLSNlbmRpZgotCiAgICAgc3RhdGljIGNv bnN0IENGU3RyaW5nUmVmIGtDRlVSTENvbm5lY3Rpb25Tb2NrZXRTdHJlYW1Qcm9wZXJ0aWVzID0g Q0ZTVFIoImtDRlVSTENvbm5lY3Rpb25Tb2NrZXRTdHJlYW1Qcm9wZXJ0aWVzIik7CiAgICAgUmV0 YWluUHRyPENGTXV0YWJsZURpY3Rpb25hcnlSZWY+IHByb3BlcnRpZXNEaWN0aW9uYXJ5OwogICAg IGlmIChjbGllbnRQcm9wZXJ0aWVzKQpAQCAtMjYzLDEwICsyNTcsNiBAQCBib29sIFJlc291cmNl SGFuZGxlOjpzdGFydCgpCiAKICAgICBib29sIHNob3VsZFVzZUNyZWRlbnRpYWxTdG9yYWdlID0g IWNsaWVudCgpIHx8IGNsaWVudCgpLT5zaG91bGRVc2VDcmVkZW50aWFsU3RvcmFnZSh0aGlzKTsK IAotI2lmIFBMQVRGT1JNKENPQ09BKSAmJiAhSEFWRShUSU1JTkdEQVRBT1BUSU9OUykKLSAgICBz ZXRDb2xsZWN0c1RpbWluZ0RhdGEoKTsKLSNlbmRpZgotCiAgICAgY3JlYXRlQ0ZVUkxDb25uZWN0 aW9uKHNob3VsZFVzZUNyZWRlbnRpYWxTdG9yYWdlLCBkLT5tX3Nob3VsZENvbnRlbnRTbmlmZiwg ZC0+bV9zaG91bGRDb250ZW50RW5jb2RpbmdTbmlmZiwgbnVsbHB0ciwgY2xpZW50KCktPmNvbm5l Y3Rpb25Qcm9wZXJ0aWVzKHRoaXMpLmdldCgpKTsKICAgICByZWYoKTsKIApAQCAtMzcxLDExICsz NjEsNyBAQCBib29sIFJlc291cmNlSGFuZGxlOjp0cnlIYW5kbGVQYXNzd29yZEJhCiAKICAgICBp ZiAoIWQtPm1fdXNlci5pc051bGwoKSAmJiAhZC0+bV9wYXNzd29yZC5pc051bGwoKSkgewogICAg ICAgICBhdXRvIGNmQ3JlZGVudGlhbCA9IGFkb3B0Q0YoQ0ZVUkxDcmVkZW50aWFsQ3JlYXRlKGtD RkFsbG9jYXRvckRlZmF1bHQsIGQtPm1fdXNlci5jcmVhdGVDRlN0cmluZygpLmdldCgpLCBkLT5t X3Bhc3N3b3JkLmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCksIDAsIGtDRlVSTENyZWRlbnRpYWxQZXJz aXN0ZW5jZU5vbmUpKTsKLSNpZiBQTEFURk9STShDT0NPQSkKLSAgICAgICAgQ3JlZGVudGlhbCBj cmVkZW50aWFsID0gQ3JlZGVudGlhbChjZkNyZWRlbnRpYWwuZ2V0KCkpOwotI2Vsc2UKICAgICAg ICAgQ3JlZGVudGlhbCBjcmVkZW50aWFsID0gY29yZShjZkNyZWRlbnRpYWwuZ2V0KCkpOwotI2Vu ZGlmCiAgICAgICAgIAogICAgICAgICBVUkwgdXJsVG9TdG9yZTsKICAgICAgICAgaWYgKGNoYWxs ZW5nZS5mYWlsdXJlUmVzcG9uc2UoKS5odHRwU3RhdHVzQ29kZSgpID09IDQwMSkKQEAgLTQwNSwx MiArMzkxLDggQEAgYm9vbCBSZXNvdXJjZUhhbmRsZTo6dHJ5SGFuZGxlUGFzc3dvcmRCYQogICAg ICAgICAgICAgICAgICAgICAvLyBTdG9yZSB0aGUgY3JlZGVudGlhbCBiYWNrLCBwb3NzaWJseSBh ZGRpbmcgaXQgYXMgYSBkZWZhdWx0IGZvciB0aGlzIGRpcmVjdG9yeS4KICAgICAgICAgICAgICAg ICAgICAgZC0+bV9jb250ZXh0LT5zdG9yYWdlU2Vzc2lvbigpLT5jcmVkZW50aWFsU3RvcmFnZSgp LnNldChwYXJ0aXRpb24sIGNyZWRlbnRpYWwsIGNoYWxsZW5nZS5wcm90ZWN0aW9uU3BhY2UoKSwg Y2hhbGxlbmdlLmZhaWx1cmVSZXNwb25zZSgpLnVybCgpKTsKICAgICAgICAgICAgICAgICB9Ci0j aWYgUExBVEZPUk0oQ09DT0EpCi0gICAgICAgICAgICAgICAgQ0ZVUkxDb25uZWN0aW9uVXNlQ3Jl ZGVudGlhbChkLT5tX2Nvbm5lY3Rpb24uZ2V0KCksIGNyZWRlbnRpYWwuY2ZDcmVkZW50aWFsKCks IGNoYWxsZW5nZS5jZlVSTEF1dGhDaGFsbGVuZ2VSZWYoKSk7Ci0jZWxzZQogICAgICAgICAgICAg ICAgIFJldGFpblB0cjxDRlVSTENyZWRlbnRpYWxSZWY+IGNmQ3JlZGVudGlhbCA9IGFkb3B0Q0Yo Y3JlYXRlQ0YoY3JlZGVudGlhbCkpOwogICAgICAgICAgICAgICAgIENGVVJMQ29ubmVjdGlvblVz ZUNyZWRlbnRpYWwoZC0+bV9jb25uZWN0aW9uLmdldCgpLCBjZkNyZWRlbnRpYWwuZ2V0KCksIGNo YWxsZW5nZS5jZlVSTEF1dGhDaGFsbGVuZ2VSZWYoKSk7Ci0jZW5kaWYKICAgICAgICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpAQCAtNDU2LDIwICs0Mzgs MTIgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZTo6cmVjZWl2ZWRDcmVkZW50aWFsKAogICAgICAgICBk LT5tX2NvbnRleHQtPnN0b3JhZ2VTZXNzaW9uKCktPmNyZWRlbnRpYWxTdG9yYWdlKCkuc2V0KGZp cnN0UmVxdWVzdCgpLmNhY2hlUGFydGl0aW9uKCksIHdlYkNyZWRlbnRpYWwsIGNoYWxsZW5nZS5w cm90ZWN0aW9uU3BhY2UoKSwgdXJsVG9TdG9yZSk7CiAKICAgICAgICAgaWYgKGQtPm1fY29ubmVj dGlvbikgewotI2lmIFBMQVRGT1JNKENPQ09BKQotICAgICAgICAgICAgQ0ZVUkxDb25uZWN0aW9u VXNlQ3JlZGVudGlhbChkLT5tX2Nvbm5lY3Rpb24uZ2V0KCksIHdlYkNyZWRlbnRpYWwuY2ZDcmVk ZW50aWFsKCksIGNoYWxsZW5nZS5jZlVSTEF1dGhDaGFsbGVuZ2VSZWYoKSk7Ci0jZWxzZQogICAg ICAgICAgICAgUmV0YWluUHRyPENGVVJMQ3JlZGVudGlhbFJlZj4gY2ZDcmVkZW50aWFsID0gYWRv cHRDRihjcmVhdGVDRih3ZWJDcmVkZW50aWFsKSk7CiAgICAgICAgICAgICBDRlVSTENvbm5lY3Rp b25Vc2VDcmVkZW50aWFsKGQtPm1fY29ubmVjdGlvbi5nZXQoKSwgY2ZDcmVkZW50aWFsLmdldCgp LCBjaGFsbGVuZ2UuY2ZVUkxBdXRoQ2hhbGxlbmdlUmVmKCkpOwotI2VuZGlmCiAgICAgICAgIH0K ICAgICB9IGVsc2UgaWYgKGQtPm1fY29ubmVjdGlvbikgewotI2lmIFBMQVRGT1JNKENPQ09BKQot ICAgICAgICBDRlVSTENvbm5lY3Rpb25Vc2VDcmVkZW50aWFsKGQtPm1fY29ubmVjdGlvbi5nZXQo KSwgY3JlZGVudGlhbC5jZkNyZWRlbnRpYWwoKSwgY2hhbGxlbmdlLmNmVVJMQXV0aENoYWxsZW5n ZVJlZigpKTsKLSNlbHNlCiAgICAgICAgIFJldGFpblB0cjxDRlVSTENyZWRlbnRpYWxSZWY+IGNm Q3JlZGVudGlhbCA9IGFkb3B0Q0YoY3JlYXRlQ0YoY3JlZGVudGlhbCkpOwogICAgICAgICBDRlVS TENvbm5lY3Rpb25Vc2VDcmVkZW50aWFsKGQtPm1fY29ubmVjdGlvbi5nZXQoKSwgY2ZDcmVkZW50 aWFsLmdldCgpLCBjaGFsbGVuZ2UuY2ZVUkxBdXRoQ2hhbGxlbmdlUmVmKCkpOwotI2VuZGlmCiAg ICAgfQogCiAgICAgY2xlYXJBdXRoZW50aWNhdGlvbigpOwpAQCAtNjM3LDMwICs2MTEsNiBAQCB2 b2lkIFJlc291cmNlSGFuZGxlOjpwbGF0Zm9ybVNldERlZmVyc0xvCiAgICAgICAgIENGVVJMQ29u bmVjdGlvblJlc3VtZShkLT5tX2Nvbm5lY3Rpb24uZ2V0KCkpOwogfQogCi0jaWYgUExBVEZPUk0o Q09DT0EpCi12b2lkIFJlc291cmNlSGFuZGxlOjpzY2hlZHVsZShTY2hlZHVsZVBhaXImIHBhaXIp Ci17Ci0gICAgQ0ZSdW5Mb29wUmVmIHJ1bkxvb3AgPSBwYWlyLnJ1bkxvb3AoKTsKLSAgICBpZiAo IXJ1bkxvb3ApCi0gICAgICAgIHJldHVybjsKLQotICAgIENGVVJMQ29ubmVjdGlvblNjaGVkdWxl V2l0aFJ1bkxvb3AoZC0+bV9jb25uZWN0aW9uLmdldCgpLCBydW5Mb29wLCBwYWlyLm1vZGUoKSk7 Ci0gICAgaWYgKGQtPm1fc3RhcnRXaGVuU2NoZWR1bGVkKSB7Ci0gICAgICAgIENGVVJMQ29ubmVj dGlvblN0YXJ0KGQtPm1fY29ubmVjdGlvbi5nZXQoKSk7Ci0gICAgICAgIGQtPm1fc3RhcnRXaGVu U2NoZWR1bGVkID0gZmFsc2U7Ci0gICAgfQotfQotCi12b2lkIFJlc291cmNlSGFuZGxlOjp1bnNj aGVkdWxlKFNjaGVkdWxlUGFpciYgcGFpcikKLXsKLSAgICBDRlJ1bkxvb3BSZWYgcnVuTG9vcCA9 IHBhaXIucnVuTG9vcCgpOwotICAgIGlmICghcnVuTG9vcCkKLSAgICAgICAgcmV0dXJuOwotCi0g ICAgQ0ZVUkxDb25uZWN0aW9uVW5zY2hlZHVsZUZyb21SdW5Mb29wKGQtPm1fY29ubmVjdGlvbi5n ZXQoKSwgcnVuTG9vcCwgcGFpci5tb2RlKCkpOwotfQotI2VuZGlmCi0KIGNvbnN0IFJlc291cmNl UmVxdWVzdCYgUmVzb3VyY2VIYW5kbGU6OmN1cnJlbnRSZXF1ZXN0KCkgY29uc3QKIHsKICAgICBy ZXR1cm4gZC0+bV9jdXJyZW50UmVxdWVzdDsK