Modified: trunk/Source/WebKit/ChangeLog (231059 => 231060)
--- trunk/Source/WebKit/ChangeLog 2018-04-26 18:29:25 UTC (rev 231059)
+++ trunk/Source/WebKit/ChangeLog 2018-04-26 18:42:01 UTC (rev 231060)
@@ -1,5 +1,23 @@
2018-04-26 Daniel Bates <[email protected]>
+ Remove WebCore::-qualifier in NetworkLoadChecker.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=185037
+
+ Reviewed by Youenn Fablet.
+
+ It is unncesssary to qualify WebCore types in NetworkLoadChecker.cpp as it has a
+ "using namespace WebCore" directive.
+
+ * NetworkProcess/NetworkLoadChecker.cpp:
+ (WebKit::NetworkLoadChecker::NetworkLoadChecker):
+ (WebKit::NetworkLoadChecker::checkRedirection):
+ (WebKit::NetworkLoadChecker::validateResponse):
+ (WebKit::NetworkLoadChecker::continueCheckingRequest): Removed extra space character and unnecessary
+ parentheses from the right-hand side of the assignment to m_storedCredentialsPolicy.
+ (WebKit::NetworkLoadChecker::processContentExtensionRulesForLoad):
+
+2018-04-26 Daniel Bates <[email protected]>
+
Rename NetworkLoadChecker::returnError() to NetworkLoadChecker::accessControlErrorForValidationHandler()
https://bugs.webkit.org/show_bug.cgi?id=185035
Modified: trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp (231059 => 231060)
--- trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp 2018-04-26 18:29:25 UTC (rev 231059)
+++ trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp 2018-04-26 18:42:01 UTC (rev 231060)
@@ -42,7 +42,7 @@
using namespace WebCore;
-NetworkLoadChecker::NetworkLoadChecker(WebCore::FetchOptions&& options, PAL::SessionID sessionID, WebCore::HTTPHeaderMap&& originalRequestHeaders, URL&& url, RefPtr<SecurityOrigin>&& sourceOrigin, PreflightPolicy preflightPolicy)
+NetworkLoadChecker::NetworkLoadChecker(FetchOptions&& options, PAL::SessionID sessionID, HTTPHeaderMap&& originalRequestHeaders, URL&& url, RefPtr<SecurityOrigin>&& sourceOrigin, PreflightPolicy preflightPolicy)
: m_options(WTFMove(options))
, m_sessionID(sessionID)
, m_originalRequestHeaders(WTFMove(originalRequestHeaders))
@@ -87,7 +87,7 @@
request.setHTTPHeaderField(HTTPHeaderName::DNT, m_dntHeaderValue);
}
-void NetworkLoadChecker::checkRedirection(WebCore::ResourceResponse& redirectResponse, ResourceRequest&& request, ValidationHandler&& handler)
+void NetworkLoadChecker::checkRedirection(ResourceResponse& redirectResponse, ResourceRequest&& request, ValidationHandler&& handler)
{
ASSERT(!isChecking());
@@ -135,7 +135,7 @@
ASSERT(m_options.mode == FetchOptions::Mode::Cors);
String errorMessage;
- if (!WebCore::passesAccessControlCheck(response, m_storedCredentialsPolicy, *m_origin, errorMessage))
+ if (!passesAccessControlCheck(response, m_storedCredentialsPolicy, *m_origin, errorMessage))
return ResourceError { String { }, 0, m_url, WTFMove(errorMessage), ResourceError::Type::AccessControl };
response.setTainting(ResourceResponse::Tainting::Cors);
@@ -180,7 +180,7 @@
}
if (m_options.credentials == FetchOptions::Credentials::SameOrigin)
- m_storedCredentialsPolicy = (m_isSameOriginRequest && m_origin->canRequest(request.url())) ? StoredCredentialsPolicy::Use : StoredCredentialsPolicy::DoNotUse;
+ m_storedCredentialsPolicy = m_isSameOriginRequest && m_origin->canRequest(request.url()) ? StoredCredentialsPolicy::Use : StoredCredentialsPolicy::DoNotUse;
if (doesNotNeedCORSCheck(request.url())) {
handler(WTFMove(request));
@@ -308,7 +308,7 @@
}
#if ENABLE(CONTENT_EXTENSIONS)
-void NetworkLoadChecker::processContentExtensionRulesForLoad(ResourceRequest&& request, CompletionHandler<void(WebCore::ResourceRequest&&, const ContentExtensions::BlockedStatus&)>&& callback)
+void NetworkLoadChecker::processContentExtensionRulesForLoad(ResourceRequest&& request, CompletionHandler<void(ResourceRequest&&, const ContentExtensions::BlockedStatus&)>&& callback)
{
if (!m_userContentControllerIdentifier) {
ContentExtensions::BlockedStatus status;
