Attachment 338899 Details for Bug 185037 – Patch

[patch] Patch

bug-185037-20180426113559.patch (text/plain), 4.27 KB, created by Daniel Bates on 2018-04-26 11:36:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Bates

Created: 2018-04-26 11:36:00 PDT

Size: 4.27 KB

patch

obsolete

>Subversion Revision: 231058
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 60e394e6f075aabb805b060792d738c620c87e52..e5218ab4d858e0b7152d29defa68c669bd5e2cde 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-04-26  Daniel Bates  <dabates@apple.com>
>+
>+        Remove WebCore::-qualifier in NetworkLoadChecker.cpp
>+        https://bugs.webkit.org/show_bug.cgi?id=185037
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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):
>+        (WebKit::NetworkLoadChecker::processContentExtensionRulesForLoad):
>+
> 2018-04-26  Daniel Bates  <dabates@apple.com>
> 
>         Rename NetworkLoadChecker::returnError() to NetworkLoadChecker::accessControlErrorForValidationHandler()
>diff --git a/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp b/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp
>index ff74e889d907df678b978b2bf605d799346a2d27..a7c5eb8bbbda7df1647ecb8d8de3be93b66a3093 100644
>--- a/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp
>@@ -42,7 +42,7 @@ namespace WebKit {
> 
> 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 @@ void NetworkLoadChecker::prepareRedirectedRequest(ResourceRequest& request)
>         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 @@ ResourceError NetworkLoadChecker::validateResponse(ResourceResponse& response)
>     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 @@ void NetworkLoadChecker::continueCheckingRequest(ResourceRequest&& request, Vali
>     }
> 
>     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 @@ ContentSecurityPolicy* NetworkLoadChecker::contentSecurityPolicy() const
> }
> 
> #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;

Flags:

youennf: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 185037: 338899