196809 2019-04-10 22:35:31 -0700 WKNavigationResponse._downloadAttribute should be nil when no download attribute is present 2019-04-11 08:51:13 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen beidson commit-queue darin david_quesada webkit-bug-importer oldest_to_newest 1526312 0 achristensen 2019-04-10 22:35:31 -0700 WKNavigationResponse._downloadAttribute should be nil when no download attribute is present 1526314 1 367205 achristensen 2019-04-10 22:37:14 -0700 Created attachment 367205 Patch 1526318 2 david_quesada 2019-04-10 22:54:21 -0700 *** Bug 196806 has been marked as a duplicate of this bug. *** 1526322 3 367205 commit-queue 2019-04-10 23:16:06 -0700 Comment on attachment 367205 Patch Clearing flags on attachment: 367205 Committed r244184: <https://trac.webkit.org/changeset/244184> 1526323 4 commit-queue 2019-04-10 23:16:08 -0700 All reviewed patches have been landed. Closing bug. 1526324 5 webkit-bug-importer 2019-04-10 23:17:19 -0700 <rdar://problem/49803597> 1526379 6 367205 darin 2019-04-11 08:50:40 -0700 Comment on attachment 367205 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=367205&action=review > Source/WebKit/UIProcess/API/Cocoa/WKNavigationResponse.mm:84 > - return _navigationResponse->downloadAttribute(); > + const String& attribute = _navigationResponse->downloadAttribute(); > + return attribute.isNull() ? nil : (NSString *)attribute; The function nsStringNilIfEmpty from WTFString.h was designed for uses like this one. I admit it does not have a beautiful name, but this is exactly what it’s for. 1526380 7 367205 darin 2019-04-11 08:51:13 -0700 Comment on attachment 367205 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=367205&action=review >> Source/WebKit/UIProcess/API/Cocoa/WKNavigationResponse.mm:84 >> + return attribute.isNull() ? nil : (NSString *)attribute; > > The function nsStringNilIfEmpty from WTFString.h was designed for uses like this one. I admit it does not have a beautiful name, but this is exactly what it’s for. Oops, no, this is "nil if null", which is not the same thing. Sorry. 367205 2019-04-10 22:37:14 -0700 2019-04-10 23:16:06 -0700 Patch bug-196809-20190410223713.patch text/plain 6062 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDQxODEpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE5LTA0LTEwICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV0tOYXZpZ2F0aW9u UmVzcG9uc2UuX2Rvd25sb2FkQXR0cmlidXRlIHNob3VsZCBiZSBuaWwgd2hlbiBubyBkb3dubG9h ZCBhdHRyaWJ1dGUgaXMgcHJlc2VudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTk2ODA5CisgICAgICAgIDxyZGFyOi8vNDk4MDA3NjI+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L0NvY29hL1dLTmF2aWdhdGlvblJlc3BvbnNlLm1tOgorICAgICAgICAoLVtXS05hdmlnYXRpb25S ZXNwb25zZSBfZG93bmxvYWRBdHRyaWJ1dGVdKToKKwogMjAxOS0wNC0xMCAgRGV2aW4gUm91c3Nv ICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjogc2F2ZSBzaGVl dCBzaG91bGQgYmUgYW5jaG9yZWQgdW5kZXJuZWF0aCB0aGUgdGFiIGJhciB3aGVuIGRldGFjaGVk CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uUmVz cG9uc2UubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L1dLTmF2aWdhdGlvblJlc3BvbnNlLm1tCShyZXZpc2lvbiAyNDQxODEpCisrKyBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uUmVzcG9uc2UubW0JKHdvcmtpbmcg Y29weSkKQEAgLTgwLDcgKzgwLDggQEAgLSAoTlNVUkxSZXF1ZXN0ICopX3JlcXVlc3QKIAogLSAo TlNTdHJpbmcgKilfZG93bmxvYWRBdHRyaWJ1dGUKIHsKLSAgICByZXR1cm4gX25hdmlnYXRpb25S ZXNwb25zZS0+ZG93bmxvYWRBdHRyaWJ1dGUoKTsKKyAgICBjb25zdCBTdHJpbmcmIGF0dHJpYnV0 ZSA9IF9uYXZpZ2F0aW9uUmVzcG9uc2UtPmRvd25sb2FkQXR0cmlidXRlKCk7CisgICAgcmV0dXJu IGF0dHJpYnV0ZS5pc051bGwoKSA/IG5pbCA6IChOU1N0cmluZyAqKWF0dHJpYnV0ZTsKIH0KIAog QGVuZApJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxv ZwkocmV2aXNpb24gMjQ0MTgxKQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMTktMDQtMTAgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5z ZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBXS05hdmlnYXRpb25SZXNwb25zZS5fZG93bmxvYWRB dHRyaWJ1dGUgc2hvdWxkIGJlIG5pbCB3aGVuIG5vIGRvd25sb2FkIGF0dHJpYnV0ZSBpcyBwcmVz ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTY4 MDkKKyAgICAgICAgPHJkYXI6Ly80OTgwMDc2Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev V0tOYXZpZ2F0aW9uUmVzcG9uc2UubW06CisgICAgICAgIChURVNUKToKKwogMjAxOS0wNC0xMCAg RnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBbV2lu XSBVc2UgYSBidW5kbGVkIHZzd2hlcmUuZXhlIGluc3RlYWQgb2YgZG93bmxvYWRpbmcgYnkgdXBk YXRlLXZzd2hlcmUucHkKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvV0tOYXZpZ2F0aW9uUmVzcG9uc2UubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS05hdmlnYXRpb25SZXNwb25zZS5tbQkocmV2aXNpb24g MjQ0MTgxKQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS05hdmln YXRpb25SZXNwb25zZS5tbQkod29ya2luZyBjb3B5KQpAQCAtMjEyLDM2ICsyMTIsNDMgQEAgc3Rh dGljIHZvaWQgd3JpdGVSZXNwb25zZShpbnQgc29ja2V0LCBOUwogCiBURVNUKFdlYktpdCwgV0tO YXZpZ2F0aW9uUmVzcG9uc2VEb3dubG9hZEF0dHJpYnV0ZSkKIHsKLSAgICBUZXN0V2ViS2l0QVBJ OjpUQ1BTZXJ2ZXIgc2VydmVyKFtdKGludCBzb2NrZXQpIHsKLSAgICAgICAgcmVhZFJlcXVlc3Qo c29ja2V0KTsKLSAgICAgICAgTlNTdHJpbmcgKmJvZHkgPSBAIjxhIGlkPSdsaW5rJyBocmVmPScv ZnJvbUhyZWYudHh0JyBkb3dubG9hZD0nZnJvbURvd25sb2FkQXR0cmlidXRlLnR4dCc+Q2xpY2sg TWUhPC9hPiI7Ci0gICAgICAgIHVuc2lnbmVkIGJvZHlMZW5ndGggPSBib2R5Lmxlbmd0aDsKLSAg ICAgICAgd3JpdGVSZXNwb25zZShzb2NrZXQsIFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0Ogot ICAgICAgICAgICAgQCJIVFRQLzEuMSAyMDAgT0tcclxuIgotICAgICAgICAgICAgIkNvbnRlbnQt TGVuZ3RoOiAlZFxyXG5cclxuIgotICAgICAgICAgICAgIiVAIiwKLSAgICAgICAgICAgIGJvZHlM ZW5ndGgsCi0gICAgICAgICAgICBib2R5Ci0gICAgICAgIF0pOwotICAgICAgICByZWFkUmVxdWVz dChzb2NrZXQpOwotICAgICAgICB3cml0ZVJlc3BvbnNlKHNvY2tldCwKLSAgICAgICAgICAgIEAi SFRUUC8xLjEgMjAwIE9LXHJcbiIKLSAgICAgICAgICAgICJDb250ZW50LUxlbmd0aDogNlxyXG4i Ci0gICAgICAgICAgICAiQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudDsgZmlsZW5hbWU9 ZnJvbUhlYWRlci50eHQ7XHJcblxyXG4iCi0gICAgICAgICAgICAiSGVsbG8hIgotICAgICAgICAp OwotICAgIH0pOwotICAgIGF1dG8gZGVsZWdhdGUgPSBhZG9wdE5TKFtOYXZpZ2F0aW9uUmVzcG9u c2VUZXN0RGVsZWdhdGUgbmV3XSk7Ci0gICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbV0tXZWJW aWV3IG5ld10pOwotICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpkZWxlZ2F0ZS5n ZXQoKV07CisgICAgYXV0byBnZXREb3dubG9hZFJlc3BvbnNlID0gW10gKFJldGFpblB0cjxOU1N0 cmluZz4gYm9keSkgLT4gUmV0YWluUHRyPFdLTmF2aWdhdGlvblJlc3BvbnNlPiB7CisgICAgICAg IFRlc3RXZWJLaXRBUEk6OlRDUFNlcnZlciBzZXJ2ZXIoW2JvZHldKGludCBzb2NrZXQpIHsKKyAg ICAgICAgICAgIHJlYWRSZXF1ZXN0KHNvY2tldCk7CisgICAgICAgICAgICB1bnNpZ25lZCBib2R5 TGVuZ3RoID0gW2JvZHkgbGVuZ3RoXTsKKyAgICAgICAgICAgIHdyaXRlUmVzcG9uc2Uoc29ja2V0 LCBbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDoKKyAgICAgICAgICAgICAgICBAIkhUVFAvMS4x IDIwMCBPS1xyXG4iCisgICAgICAgICAgICAgICAgIkNvbnRlbnQtTGVuZ3RoOiAlZFxyXG5cclxu IgorICAgICAgICAgICAgICAgICIlQCIsCisgICAgICAgICAgICAgICAgYm9keUxlbmd0aCwKKyAg ICAgICAgICAgICAgICBib2R5LmdldCgpCisgICAgICAgICAgICBdKTsKKyAgICAgICAgICAgIHJl YWRSZXF1ZXN0KHNvY2tldCk7CisgICAgICAgICAgICB3cml0ZVJlc3BvbnNlKHNvY2tldCwKKyAg ICAgICAgICAgICAgICBAIkhUVFAvMS4xIDIwMCBPS1xyXG4iCisgICAgICAgICAgICAgICAgIkNv bnRlbnQtTGVuZ3RoOiA2XHJcbiIKKyAgICAgICAgICAgICAgICAiQ29udGVudC1EaXNwb3NpdGlv bjogYXR0YWNobWVudDsgZmlsZW5hbWU9ZnJvbUhlYWRlci50eHQ7XHJcblxyXG4iCisgICAgICAg ICAgICAgICAgIkhlbGxvISIKKyAgICAgICAgICAgICk7CisgICAgICAgIH0pOworICAgICAgICBh dXRvIGRlbGVnYXRlID0gYWRvcHROUyhbTmF2aWdhdGlvblJlc3BvbnNlVGVzdERlbGVnYXRlIG5l d10pOworICAgICAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtXS1dlYlZpZXcgbmV3XSk7Cisg ICAgICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CiAK LSAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltO U1VSTCBVUkxXaXRoU3RyaW5nOltOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiaHR0cDovLzEy Ny4wLjAuMTolZC8iLCBzZXJ2ZXIucG9ydCgpXV1dXTsKLSAgICBbZGVsZWdhdGUgd2FpdEZvck5h dmlnYXRpb25GaW5pc2hlZENhbGxiYWNrXTsKKyAgICAgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6 W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpbTlNTdHJp bmcgc3RyaW5nV2l0aEZvcm1hdDpAImh0dHA6Ly8xMjcuMC4wLjE6JWQvIiwgc2VydmVyLnBvcnQo KV1dXV07CisgICAgICAgIFtkZWxlZ2F0ZSB3YWl0Rm9yTmF2aWdhdGlvbkZpbmlzaGVkQ2FsbGJh Y2tdOwogCi0gICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAiZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoJ2xpbmsnKS5jbGljaygpOyIgY29tcGxldGlvbkhhbmRsZXI6bmlsXTsKLSAgICBb ZGVsZWdhdGUgd2FpdEZvck5hdmlnYXRpb25SZXNwb25zZUNhbGxiYWNrXTsKKyAgICAgICAgW3dl YlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAiZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2xpbmsn KS5jbGljaygpOyIgY29tcGxldGlvbkhhbmRsZXI6bmlsXTsKKyAgICAgICAgW2RlbGVnYXRlIHdh aXRGb3JOYXZpZ2F0aW9uUmVzcG9uc2VDYWxsYmFja107CisgICAgICAgIEVYUEVDVF9TVFJFUShb ZGVsZWdhdGUgbmF2aWdhdGlvblJlc3BvbnNlXS5yZXNwb25zZS5zdWdnZXN0ZWRGaWxlbmFtZS5V VEY4U3RyaW5nLCAiZnJvbUhlYWRlci50eHQiKTsKKyAgICAgICAgcmV0dXJuIFtkZWxlZ2F0ZSBu YXZpZ2F0aW9uUmVzcG9uc2VdOworICAgIH07CisgICAgYXV0byBzaG91bGRCZUZyb21Eb3dubG9h ZEF0dHJpYnV0ZSA9IGdldERvd25sb2FkUmVzcG9uc2UoQCI8YSBpZD0nbGluaycgaHJlZj0nL2Zy b21IcmVmLnR4dCcgZG93bmxvYWQ9J2Zyb21Eb3dubG9hZEF0dHJpYnV0ZS50eHQnPkNsaWNrIE1l ITwvYT4iKTsKKyAgICBhdXRvIHNob3VsZEJlTnVsbCA9IGdldERvd25sb2FkUmVzcG9uc2UoQCI8 YSBpZD0nbGluaycgaHJlZj0nL2Zyb21IcmVmLnR4dCc+Q2xpY2sgTWUhPC9hPiIpOworICAgIGF1 dG8gc2hvdWxkQmVFbXB0eSA9IGdldERvd25sb2FkUmVzcG9uc2UoQCI8YSBpZD0nbGluaycgaHJl Zj0nL2Zyb21IcmVmLnR4dCcgZG93bmxvYWQ9Jyc+Q2xpY2sgTWUhPC9hPiIpOwogICAgIAotICAg IFdLTmF2aWdhdGlvblJlc3BvbnNlICpyZXNwb25zZSA9IFtkZWxlZ2F0ZSBuYXZpZ2F0aW9uUmVz cG9uc2VdOwotICAgIEVYUEVDVF9TVFJFUShyZXNwb25zZS5yZXNwb25zZS5zdWdnZXN0ZWRGaWxl bmFtZS5VVEY4U3RyaW5nLCAiZnJvbUhlYWRlci50eHQiKTsKLSAgICBFWFBFQ1RfU1RSRVEocmVz cG9uc2UuX2Rvd25sb2FkQXR0cmlidXRlLlVURjhTdHJpbmcsICJmcm9tRG93bmxvYWRBdHRyaWJ1 dGUudHh0Iik7CisgICAgRVhQRUNUX1NUUkVRKFtzaG91bGRCZUZyb21Eb3dubG9hZEF0dHJpYnV0 ZSBfZG93bmxvYWRBdHRyaWJ1dGVdLlVURjhTdHJpbmcsICJmcm9tRG93bmxvYWRBdHRyaWJ1dGUu dHh0Iik7CisgICAgRVhQRUNUX1NUUkVRKFtzaG91bGRCZUVtcHR5IF9kb3dubG9hZEF0dHJpYnV0 ZV0uVVRGOFN0cmluZywgIiIpOworICAgIEVYUEVDVF9OT1RfTlVMTChbc2hvdWxkQmVFbXB0eSBf ZG93bmxvYWRBdHRyaWJ1dGVdKTsKKyAgICBFWFBFQ1RfTlVMTChbc2hvdWxkQmVOdWxsIF9kb3du bG9hZEF0dHJpYnV0ZV0pOwogfQo=