183303 2018-03-02 14:49:16 -0800 Share common WebError implementation 2018-03-02 16:08:30 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 don.olmstead don.olmstead ap commit-queue darin koivisto mcatanzaro rniwa webkit-bug-importer oldest_to_newest 1403391 0 don.olmstead 2018-03-02 14:49:16 -0800 We wrote out an implementation of WebErrorsWin.cpp but its the same as GTK. 1403394 1 334932 don.olmstead 2018-03-02 14:52:35 -0800 Created attachment 334932 Patch 1403396 2 334932 don.olmstead 2018-03-02 14:56:15 -0800 Comment on attachment 334932 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=334932&action=review Here's one potential approach to this. I don't care that much for PLATFORM checks but I'm not seeing any Generic files within WebKit so I'm not sure about the policy here. > Source/WebKit/Shared/WebErrors.cpp:91 > +#if !PLATFORM(COCOA) > +ResourceError cancelledError(const ResourceRequest& request) > +{ > + return ResourceError(API::Error::webKitNetworkErrorDomain(), API::Error::Network::Cancelled, request.url(), WEB_UI_STRING("Load request cancelled", "Load request cancelled")); > +} > + > +ResourceError fileDoesNotExistError(const ResourceResponse& response) > +{ > + return ResourceError(API::Error::webKitNetworkErrorDomain(), API::Error::Network::FileDoesNotExist, response.url(), WEB_UI_STRING("File does not exist", "The requested file doesn't exist")); > +} > +#endif Cocoa has its own implementation of this > Source/WebKit/Shared/glib/WebErrorsGlib.cpp:-50 > -ResourceError cancelledError(const ResourceRequest& request) > -{ > - return ResourceError(API::Error::webKitNetworkErrorDomain(), API::Error::Network::Cancelled, request.url(), WEB_UI_STRING("Load request cancelled", "Load request cancelled")); > -} > - > -ResourceError fileDoesNotExistError(const ResourceResponse& response) > -{ > - return ResourceError(API::Error::webKitNetworkErrorDomain(), API::Error::Network::FileDoesNotExist, response.url(), WEB_UI_STRING("File does not exist", "The requested file doesn't exist")); > -} > - > -} // namespace WebKit Nothing about this file is really glib specific. 1403399 3 mcatanzaro 2018-03-02 15:03:18 -0800 Good! 1403417 4 334932 commit-queue 2018-03-02 16:07:38 -0800 Comment on attachment 334932 Patch Clearing flags on attachment: 334932 Committed r229193: <https://trac.webkit.org/changeset/229193> 1403418 5 commit-queue 2018-03-02 16:07:39 -0800 All reviewed patches have been landed. Closing bug. 1403419 6 webkit-bug-importer 2018-03-02 16:08:30 -0800 <rdar://problem/38086224> 334932 2018-03-02 14:52:35 -0800 2018-03-02 16:07:38 -0800 Patch bug-183303.diff text/plain 5777 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggY2U2ZDYyNTAxYTAuLmQ3NWEzODU0YjkyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE3IEBACisyMDE4LTAzLTAyICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+ CisKKyAgICAgICAgU2hhcmUgY29tbW9uIFdlYkVycm9yIGltcGxlbWVudGF0aW9uCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODMzMDMKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9XZWJFcnJv cnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpjYW5jZWxsZWRFcnJvcik6CisgICAgICAgIChXZWJL aXQ6OmZpbGVEb2VzTm90RXhpc3RFcnJvcik6CisgICAgICAgICogU2hhcmVkL2dsaWIvV2ViRXJy b3JzR2xpYi5jcHA6IFJlbW92ZWQuCisgICAgICAgICogU291cmNlc0dUSy50eHQ6CisgICAgICAg ICogU291cmNlc1dQRS50eHQ6CisKIDIwMTgtMDMtMDIgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5A YXBwbGUuY29tPgogCiAgICAgICAgIExheW91dFRlc3QgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9zZXJ2aWNlLXdvcmtlcnMvc2VydmljZS13b3JrZXIvZmV0Y2gtZXZlbnQtd2l0aGlu LXN3Lmh0dHBzLmh0bWwgaXMgYSBmbGFreSBmYWlsdXJlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9XZWJFcnJvcnMuY3BwIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViRXJyb3Jz LmNwcAppbmRleCA0MjgzMGM0ZTRhNS4uZTIyZjNiZDUwZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvU2hhcmVkL1dlYkVycm9ycy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2Vi RXJyb3JzLmNwcApAQCAtMSw1ICsxLDcgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTAtMjAx NiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTcg SWdhbGlhIFMuTC4KKyAqIENvcHlyaWdodCAoQykgMjAxOCBTb255IEludGVyYWN0aXZlIEVudGVy dGFpbm1lbnQgSW5jLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVy bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0zMSw5ICsz Myw4IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJjZVJlcXVlc3QuaD4KICNpbmNsdWRlIDxX ZWJDb3JlL1Jlc291cmNlUmVzcG9uc2UuaD4KIAotdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7Ci0K IG5hbWVzcGFjZSBXZWJLaXQgewordXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIFJlc291cmNl RXJyb3IgYmxvY2tlZEVycm9yKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKIHsKQEAg LTc3LDQgKzc4LDE2IEBAIFJlc291cmNlRXJyb3IgaW50ZXJuYWxFcnJvcihjb25zdCBVUkwmIHVy bCkKICAgICByZXR1cm4gUmVzb3VyY2VFcnJvcihBUEk6OkVycm9yOjp3ZWJLaXRFcnJvckRvbWFp bigpLCBBUEk6OkVycm9yOjpHZW5lcmFsOjpJbnRlcm5hbCwgdXJsLCBXRUJfVUlfU1RSSU5HKCJX ZWJLaXQgZW5jb3VudGVyZWQgYW4gaW50ZXJuYWwgZXJyb3IiLCAiV2ViS2l0RXJyb3JJbnRlcm5h bCBkZXNjcmlwdGlvbiIpKTsKIH0KIAorI2lmICFQTEFURk9STShDT0NPQSkKK1Jlc291cmNlRXJy b3IgY2FuY2VsbGVkRXJyb3IoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQoreworICAg IHJldHVybiBSZXNvdXJjZUVycm9yKEFQSTo6RXJyb3I6OndlYktpdE5ldHdvcmtFcnJvckRvbWFp bigpLCBBUEk6OkVycm9yOjpOZXR3b3JrOjpDYW5jZWxsZWQsIHJlcXVlc3QudXJsKCksIFdFQl9V SV9TVFJJTkcoIkxvYWQgcmVxdWVzdCBjYW5jZWxsZWQiLCAiTG9hZCByZXF1ZXN0IGNhbmNlbGxl ZCIpKTsKK30KKworUmVzb3VyY2VFcnJvciBmaWxlRG9lc05vdEV4aXN0RXJyb3IoY29uc3QgUmVz b3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCit7CisgICAgcmV0dXJuIFJlc291cmNlRXJyb3IoQVBJ OjpFcnJvcjo6d2ViS2l0TmV0d29ya0Vycm9yRG9tYWluKCksIEFQSTo6RXJyb3I6Ok5ldHdvcms6 OkZpbGVEb2VzTm90RXhpc3QsIHJlc3BvbnNlLnVybCgpLCBXRUJfVUlfU1RSSU5HKCJGaWxlIGRv ZXMgbm90IGV4aXN0IiwgIlRoZSByZXF1ZXN0ZWQgZmlsZSBkb2Vzbid0IGV4aXN0IikpOworfQor I2VuZGlmCisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9TaGFyZWQvZ2xpYi9XZWJFcnJvcnNHbGliLmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2ds aWIvV2ViRXJyb3JzR2xpYi5jcHAKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDY2OTVm YWQyYTI5Li4wMDAwMDAwMDAwMAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9nbGliL1dlYkVy cm9yc0dsaWIuY3BwCisrKyAvZGV2L251bGwKQEAgLTEsNTAgKzAsMCBAQAotLyoKLSAqIENvcHly aWdodCAoQykgMjAxMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKiBQb3J0aW9u cyBDb3B5cmlnaHQgKGMpIDIwMTAgTW90b3JvbGEgTW9iaWxpdHksIEluYy4gIEFsbCByaWdodHMg cmVzZXJ2ZWQuCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTEgSWdhbGlhIFMuTC4KLSAqCi0gKiBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKLSAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucwotICogYXJlIG1ldDoKLSAqIDEuIFJlZGlzdHJpYnV0aW9ucyBv ZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIu Ci0gKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhl IGFib3ZlIGNvcHlyaWdodAotICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQotICogICAgZG9jdW1lbnRhdGlvbiBh bmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KLSAq Ci0gKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05U UklCVVRPUlMgYGBBUyBJUycnCi0gKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5U SUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKLSAqIFRIRSBJTVBMSUVEIFdBUlJB TlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKLSAq IFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1Ig SVRTIENPTlRSSUJVVE9SUwotICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwg SU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgotICogQ09OU0VRVUVOVElBTCBEQU1B R0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKLSAqIFNV QlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRT OyBPUiBCVVNJTkVTUwotICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5Z IFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KLSAqIENPTlRSQUNULCBTVFJJQ1QgTElB QklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCi0gKiBB UklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJ RiBBRFZJU0VEIE9GCi0gKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCi0gKi8KLQot I2luY2x1ZGUgImNvbmZpZy5oIgotI2luY2x1ZGUgIldlYkVycm9ycy5oIgotCi0jaW5jbHVkZSAi QVBJRXJyb3IuaCIKLSNpbmNsdWRlIDxXZWJDb3JlL0xvY2FsaXplZFN0cmluZ3MuaD4KLSNpbmNs dWRlIDxXZWJDb3JlL1Jlc291cmNlRXJyb3IuaD4KLSNpbmNsdWRlIDxXZWJDb3JlL1Jlc291cmNl UmVxdWVzdC5oPgotI2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VSZXNwb25zZS5oPgotCi1uYW1l c3BhY2UgV2ViS2l0IHsKLXVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwotCi1SZXNvdXJjZUVycm9y IGNhbmNlbGxlZEVycm9yKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKLXsKLSAgICBy ZXR1cm4gUmVzb3VyY2VFcnJvcihBUEk6OkVycm9yOjp3ZWJLaXROZXR3b3JrRXJyb3JEb21haW4o KSwgQVBJOjpFcnJvcjo6TmV0d29yazo6Q2FuY2VsbGVkLCByZXF1ZXN0LnVybCgpLCBXRUJfVUlf U1RSSU5HKCJMb2FkIHJlcXVlc3QgY2FuY2VsbGVkIiwgIkxvYWQgcmVxdWVzdCBjYW5jZWxsZWQi KSk7Ci19Ci0KLVJlc291cmNlRXJyb3IgZmlsZURvZXNOb3RFeGlzdEVycm9yKGNvbnN0IFJlc291 cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQotewotICAgIHJldHVybiBSZXNvdXJjZUVycm9yKEFQSTo6 RXJyb3I6OndlYktpdE5ldHdvcmtFcnJvckRvbWFpbigpLCBBUEk6OkVycm9yOjpOZXR3b3JrOjpG aWxlRG9lc05vdEV4aXN0LCByZXNwb25zZS51cmwoKSwgV0VCX1VJX1NUUklORygiRmlsZSBkb2Vz IG5vdCBleGlzdCIsICJUaGUgcmVxdWVzdGVkIGZpbGUgZG9lc24ndCBleGlzdCIpKTsKLX0KLQot fSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NvdXJjZXNH VEsudHh0IGIvU291cmNlL1dlYktpdC9Tb3VyY2VzR1RLLnR4dAppbmRleCA2NzA1NWJkN2IzYy4u Njc5NzgzZDE1M2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU291cmNlc0dUSy50eHQKKysr IGIvU291cmNlL1dlYktpdC9Tb3VyY2VzR1RLLnR4dApAQCAtNzgsNyArNzgsNiBAQCBTaGFyZWQv UGx1Z2lucy91bml4L1BsdWdpblNlYXJjaFBhdGguY3BwCiBTaGFyZWQvY2Fpcm8vU2hhcmVhYmxl Qml0bWFwQ2Fpcm8uY3BwIEBuby11bmlmeQogCiBTaGFyZWQvZ2xpYi9XZWJDb250ZXh0TWVudUl0 ZW1HbGliLmNwcAotU2hhcmVkL2dsaWIvV2ViRXJyb3JzR2xpYi5jcHAKIAogU2hhcmVkL2d0ay9B cmd1bWVudENvZGVyc0d0ay5jcHAKIFNoYXJlZC9ndGsvTmF0aXZlV2ViS2V5Ym9hcmRFdmVudEd0 ay5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU291cmNlc1dQRS50eHQgYi9Tb3VyY2Uv V2ViS2l0L1NvdXJjZXNXUEUudHh0CmluZGV4IGVlOGQ0YmYwYzIyLi40MTdlZWM2NDQ0OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9Tb3VyY2VzV1BFLnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0 L1NvdXJjZXNXUEUudHh0CkBAIC03Myw3ICs3Myw2IEBAIFNoYXJlZC9QbHVnaW5zL05ldHNjYXBl L3VuaXgvTmV0c2NhcGVQbHVnaW5Nb2R1bGVVbml4LmNwcAogU2hhcmVkL2NhaXJvL1NoYXJlYWJs ZUJpdG1hcENhaXJvLmNwcAogCiBTaGFyZWQvZ2xpYi9XZWJDb250ZXh0TWVudUl0ZW1HbGliLmNw cAotU2hhcmVkL2dsaWIvV2ViRXJyb3JzR2xpYi5jcHAKIAogU2hhcmVkL2xpbnV4L1dlYk1lbW9y eVNhbXBsZXJMaW51eC5jcHAKIAo=