Rename NetworkLoadChecker::returnError() to NetworkLoadChecker::accessControlErrorForValidationHandler()
https://bugs.webkit.org/show_bug.cgi?id=185035
Reviewed by Youenn Fablet.
Substitute NetworkLoadChecker::accessControlErrorForValidationHandler() for NetworkLoadChecker::returnError()
to better describe that it is a convenience function that returns a wrapped ResourceError object,
that represents an access control error, suitable to be passed directly to a validation handler.
* NetworkProcess/NetworkLoadChecker.cpp:
(WebKit::NetworkLoadChecker::checkRedirection): Update as needed for renaming.
(WebKit::NetworkLoadChecker::accessControlErrorForValidationHandler): Use auto -> syntax to avoid the need to
class-qualify the return type. Also renamed parameter from error to message as it represents the message/description
for the access control error.
(WebKit::NetworkLoadChecker::checkRequest): Update as needed for renaming. Also substitute "message" for "error"
to match the argument of accessControlErrorForValidationHandler() with the same name.
(WebKit::NetworkLoadChecker::continueCheckingRequest): Update as needed for renaming.
(WebKit::NetworkLoadChecker::returnError): Deleted; renamed to accessControlErrorForValidationHandler().
* NetworkProcess/NetworkLoadChecker.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@231059 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 6df5699..60e394e 100644
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,25 @@
+2018-04-26 Daniel Bates <dabates@apple.com>
+
+ Rename NetworkLoadChecker::returnError() to NetworkLoadChecker::accessControlErrorForValidationHandler()
+ https://bugs.webkit.org/show_bug.cgi?id=185035
+
+ Reviewed by Youenn Fablet.
+
+ Substitute NetworkLoadChecker::accessControlErrorForValidationHandler() for NetworkLoadChecker::returnError()
+ to better describe that it is a convenience function that returns a wrapped ResourceError object,
+ that represents an access control error, suitable to be passed directly to a validation handler.
+
+ * NetworkProcess/NetworkLoadChecker.cpp:
+ (WebKit::NetworkLoadChecker::checkRedirection): Update as needed for renaming.
+ (WebKit::NetworkLoadChecker::accessControlErrorForValidationHandler): Use auto -> syntax to avoid the need to
+ class-qualify the return type. Also renamed parameter from error to message as it represents the message/description
+ for the access control error.
+ (WebKit::NetworkLoadChecker::checkRequest): Update as needed for renaming. Also substitute "message" for "error"
+ to match the argument of accessControlErrorForValidationHandler() with the same name.
+ (WebKit::NetworkLoadChecker::continueCheckingRequest): Update as needed for renaming.
+ (WebKit::NetworkLoadChecker::returnError): Deleted; renamed to accessControlErrorForValidationHandler().
+ * NetworkProcess/NetworkLoadChecker.h:
+
2018-04-26 Jiewen Tan <jiewen_tan@apple.com>
Remove access to keychain from the WebContent process
diff --git a/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp b/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp
index 46f9aab..ff74e88 100644
--- a/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp
+++ b/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp
@@ -99,7 +99,7 @@
}
if (m_options.redirect != FetchOptions::Redirect::Follow) {
- handler(returnError(ASCIILiteral("Redirections are not allowed")));
+ handler(accessControlErrorForValidationHandler(ASCIILiteral("Redirections are not allowed")));
return;
}
@@ -107,7 +107,7 @@
// See https://github.com/whatwg/fetch/issues/393
if (++m_redirectCount > 20) {
- handler(returnError(ASCIILiteral("Load cannot follow more than 20 redirections")));
+ handler(accessControlErrorForValidationHandler(ASCIILiteral("Load cannot follow more than 20 redirections")));
return;
}
@@ -142,9 +142,9 @@
return { };
}
-NetworkLoadChecker::RequestOrError NetworkLoadChecker::returnError(String&& error)
+auto NetworkLoadChecker::accessControlErrorForValidationHandler(String&& message) -> RequestOrError
{
- return makeUnexpected(ResourceError { String { }, 0, m_url, WTFMove(error), ResourceError::Type::AccessControl });
+ return makeUnexpected(ResourceError { String { }, 0, m_url, WTFMove(message), ResourceError::Type::AccessControl });
}
void NetworkLoadChecker::checkRequest(ResourceRequest&& request, ValidationHandler&& handler)
@@ -152,7 +152,7 @@
#if ENABLE(CONTENT_EXTENSIONS)
processContentExtensionRulesForLoad(WTFMove(request), [this, handler = WTFMove(handler)](auto&& request, auto status) mutable {
if (status.blockedLoad) {
- handler(this->returnError(ASCIILiteral("Blocked by content extension")));
+ handler(this->accessControlErrorForValidationHandler(ASCIILiteral("Blocked by content extension")));
return;
}
this->continueCheckingRequest(WTFMove(request), WTFMove(handler));
@@ -173,8 +173,8 @@
request.setURL(url);
}
if (m_options.destination == FetchOptions::Destination::EmptyString && !contentSecurityPolicy->allowConnectToSource(request.url(), isRedirected() ? ContentSecurityPolicy::RedirectResponseReceived::Yes : ContentSecurityPolicy::RedirectResponseReceived::No)) {
- String error = !isRedirected() ? ASCIILiteral("Blocked by Content Security Policy") : makeString("Blocked ", request.url().string(), " by Content Security Policy");
- handler(returnError(WTFMove(error)));
+ String message = !isRedirected() ? ASCIILiteral("Blocked by Content Security Policy") : makeString("Blocked ", request.url().string(), " by Content Security Policy");
+ handler(accessControlErrorForValidationHandler(WTFMove(message)));
return;
}
}
@@ -189,7 +189,7 @@
if (m_options.mode == FetchOptions::Mode::SameOrigin) {
String message = makeString("Unsafe attempt to load URL ", request.url().stringCenterEllipsizedToLength(), " from origin ", m_origin->toString(), ". Domains, protocols and ports must match.\n");
- handler(returnError(WTFMove(message)));
+ handler(accessControlErrorForValidationHandler(WTFMove(message)));
return;
}
diff --git a/Source/WebKit/NetworkProcess/NetworkLoadChecker.h b/Source/WebKit/NetworkProcess/NetworkLoadChecker.h
index 504338c..654a38f 100644
--- a/Source/WebKit/NetworkProcess/NetworkLoadChecker.h
+++ b/Source/WebKit/NetworkProcess/NetworkLoadChecker.h
@@ -84,7 +84,7 @@
void checkCORSRedirectedRequest(WebCore::ResourceRequest&&, ValidationHandler&&);
void checkCORSRequestWithPreflight(WebCore::ResourceRequest&&, ValidationHandler&&);
- RequestOrError returnError(String&& error);
+ RequestOrError accessControlErrorForValidationHandler(String&&);
#if ENABLE(CONTENT_EXTENSIONS)
void processContentExtensionRulesForLoad(WebCore::ResourceRequest&&, CompletionHandler<void(WebCore::ResourceRequest&&, const WebCore::ContentExtensions::BlockedStatus&)>&&);
