Bug 185035 – Rename NetworkLoadChecker::returnError() to NetworkLoadChecker::accessControlErrorForValidationHandler()

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Daniel Bates]

The name NetworkLoadChecker::returnError() is disingenuous as this function can either return a ResourceRequest object or an Error object. We should come up with more accurate name for this function.

[Daniel Bates]

Created attachment 338893 [details]
Patch

[Daniel Bates]

Comment on attachment 338893 [details]
Patch

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

> Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp:193
>          String message = makeString("Unsafe attempt to load URL ", request.url().stringCenterEllipsizedToLength(), " from origin ", m_origin->toString(), ". Domains, protocols and ports must match.\n");

Will rename message to error before landing.

[youenn fablet]

Comment on attachment 338893 [details]
Patch

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

> Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp:147
> +NetworkLoadChecker::RequestOrError NetworkLoadChecker::createRequestOrError(String&& error)

createRequestOrError seems a bit odd.
How about createValidationError?

[Daniel Bates]

(In reply to youenn fablet from comment #3)
> Comment on attachment 338893 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=338893&action=review
> 
> > Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp:147
> > +NetworkLoadChecker::RequestOrError NetworkLoadChecker::createRequestOrError(String&& error)
> 
> createRequestOrError seems a bit odd.
> How about createValidationError?

From our IRC conversation, will rename to accessControlErrorForValidationHandler.

[Daniel Bates]

(In reply to Daniel Bates from comment #2)
> Comment on attachment 338893 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=338893&action=review
> 
> > Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp:193
> >          String message = makeString("Unsafe attempt to load URL ", request.url().stringCenterEllipsizedToLength(), " from origin ", m_origin->toString(), ". Domains, protocols and ports must match.\n");
> 
> Will rename message to error before landing.

Actually will keep as-is and rename argument to accessControlErrorForValidationHandler() to message to describe that its argument represents the error message for the access control error. Will change other locals named "error" to "message" when passed to accessControlErrorForValidationHandler().

[Daniel Bates]

Committed r231059: <https://trac.webkit.org/changeset/231059>

[Radar WebKit Bug Importer]

<rdar://problem/39764569>