Bug 183303 – Share common WebError implementation

• Component: WebKit2
• Status: RESOLVED FIXED

[Don Olmstead]

We wrote out an implementation of WebErrorsWin.cpp but its the same as GTK.

[Don Olmstead]

Created attachment 334932 [details]
Patch

[Don Olmstead]

Comment on attachment 334932 [details]
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.

[Michael Catanzaro]

Good!

[WebKit Commit Bot]

Comment on attachment 334932 [details]
Patch

Clearing flags on attachment: 334932

Committed r229193: <https://trac.webkit.org/changeset/229193>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/38086224>