Implement NetworkResourceLoader::receivedCancellation

• Component: WebKit2
• Status: RESOLVED FIXED

[Carlos Garcia Campos]

$ Programs/WebKit2APITests/TestWebKitWebView -p /webkit2/WebKitWebView/authentication-cancel
/webkit2/WebKitWebView/authentication-cancel: OK

$ WEBKIT_USE_NETWORK_PROCESS=1 Programs/WebKit2APITests/TestWebKitWebView -p /webkit2/WebKitWebView/authentication-cancel
/webkit2/WebKitWebView/authentication-cancel: **
ERROR:../../Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp:1331:void testWebViewAuthenticationCancel(AuthenticationTest*, gconstpointer): assertion failed (test->m_loadEvents[1] == LoadTrackingTest::ProvisionalLoadFailed): (3 == 2)

[Carlos Garcia Campos]

The problem is that NetworkResourceLoader doesn't implement ResourceHandleClient::receivedCancellation() and the load finished normally instead of failing with cancel error like the web process does.

[Carlos Garcia Campos]

Created attachment 220104 [details]
Patch

$ WEBKIT_USE_NETWORK_PROCESS=1 Programs/WebKit2APITests/TestAuthentication 
/webkit2/WebKitWebView/authentication-request: OK
/webkit2/WebKitWebView/authentication-cancel: OK
/webkit2/WebKitWebView/authentication-load-cancelled: OK
/webkit2/WebKitWebView/authentication-failure: OK
/webkit2/WebKitWebView/authentication-no-credential: OK
/webkit2/WebKitWebView/authentication-storage: OK
/webkit2/WebKitWebView/authentication-success: OK

[Carlos Garcia Campos]

Created attachment 220153 [details]
Updated patch

Just rebased to apply on current git master

[Brian Holt]

Comment on attachment 220153 [details]
Updated patch

Informal review: looks good to me, hope to see it landed soon.

[Alexey Proskuryakov]

Comment on attachment 220153 [details]
Updated patch

View in context: https://bugs.webkit.org/attachment.cgi?id=220153&action=review

> Source/WebKit2/ChangeLog:3
> +        [GTK] Test /webkit2/WebKitWebView/authentication-cancel fails with network process enabled

This patch is cross-platform, please remove "[GTK]" here and from the bug title.

> Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp:174
> +void NetworkResourceLoader::cancel()

I'm not a fan of this function. It looks like someone tells NetworkResourceLoader to cancel, but this is not what it is - it implements what needs to be done in two places where NetworkResourceLoader decides to cancel the load on its own, based on indirect hints. In other future places where NetworkResourceLoader decides to cancel, it may need to do something else.

I would have just put the code inline, not factoring it out into a cancel() function. But at the very least, the function should be private, not public.

[Carlos Garcia Campos]

Committed r161625: <http://trac.webkit.org/changeset/161625>