Attachment 338893 Details for Bug 185035 – Patch

[patch] Patch

bug-185035-20180426105642.patch (text/plain), 5.32 KB, created by Daniel Bates on 2018-04-26 10:56:42 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Bates

Created: 2018-04-26 10:56:42 PDT

Size: 5.32 KB

patch

obsolete

>Subversion Revision: 231051
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 233516b83c29b9ce3800e5d197c3dd7839360073..694bec91adc215e8248ed250f7fd765734edf421 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-04-26  Daniel Bates  <dabates@apple.com>
>+
>+        Rename NetworkLoadChecker::returnError() as it is disingenuous
>+        https://bugs.webkit.org/show_bug.cgi?id=185035
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The name NetworkLoadChecker::returnError() is disingenuous as this function can either return a
>+        ResourceRequest object or an Error object. Rename this function to createRequestOrError() to
>+        better describe what it returns.
>+
>+        * NetworkProcess/NetworkLoadChecker.cpp:
>+        (WebKit::NetworkLoadChecker::checkRedirection):
>+        (WebKit::NetworkLoadChecker::createRequestOrError):
>+        (WebKit::NetworkLoadChecker::checkRequest):
>+        (WebKit::NetworkLoadChecker::continueCheckingRequest):
>+        (WebKit::NetworkLoadChecker::returnError): Deleted.
>+        * NetworkProcess/NetworkLoadChecker.h:
>+
> 2018-04-26  Per Arne Vollan  <pvollan@apple.com>
> 
>         Disable content filtering in minimal simulator mode
>diff --git a/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp b/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp
>index acd9f6eb18183aebb2ad1e2d0e4acb23a33f96d9..8670600b0112e37fdf332984c607b388629e73c2 100644
>--- a/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp
>@@ -92,7 +92,7 @@ void NetworkLoadChecker::checkRedirection(WebCore::ResourceResponse& redirectRes
>     ASSERT(!isChecking());
> 
>     if (m_options.redirect != FetchOptions::Redirect::Follow) {
>-        handler(returnError(ASCIILiteral("Redirections are not allowed")));
>+        handler(createRequestOrError(ASCIILiteral("Redirections are not allowed")));
>         return;
>     }
> 
>@@ -100,7 +100,7 @@ void NetworkLoadChecker::checkRedirection(WebCore::ResourceResponse& redirectRes
>     // See https://github.com/whatwg/fetch/issues/393
> 
>     if (++m_redirectCount > 20) {
>-        handler(returnError(ASCIILiteral("Load cannot follow more than 20 redirections")));
>+        handler(createRequestOrError(ASCIILiteral("Load cannot follow more than 20 redirections")));
>         return;
>     }
> 
>@@ -144,7 +144,7 @@ ResourceError NetworkLoadChecker::validateResponse(ResourceResponse& response)
>     return { };
> }
> 
>-NetworkLoadChecker::RequestOrError NetworkLoadChecker::returnError(String&& error)
>+NetworkLoadChecker::RequestOrError NetworkLoadChecker::createRequestOrError(String&& error)
> {
>     return makeUnexpected(ResourceError { String { }, 0, m_url, WTFMove(error), ResourceError::Type::AccessControl });
> }
>@@ -154,7 +154,7 @@ void NetworkLoadChecker::checkRequest(ResourceRequest&& request, ValidationHandl
> #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->createRequestOrError(ASCIILiteral("Blocked by content extension")));
>             return;
>         }
>         this->continueCheckingRequest(WTFMove(request), WTFMove(handler));
>@@ -176,7 +176,7 @@ void NetworkLoadChecker::continueCheckingRequest(ResourceRequest&& request, Vali
>         }
>         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)));
>+            handler(createRequestOrError(WTFMove(error)));
>             return;
>         }
>     }
>@@ -191,7 +191,7 @@ void NetworkLoadChecker::continueCheckingRequest(ResourceRequest&& request, Vali
> 
>     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(createRequestOrError(WTFMove(message)));
>         return;
>     }
> 
>diff --git a/Source/WebKit/NetworkProcess/NetworkLoadChecker.h b/Source/WebKit/NetworkProcess/NetworkLoadChecker.h
>index 504338cc4512ce1287e5c9874988f83b62c8da04..761550f73fdd06adf5fef45da93ff5646c048b8a 100644
>--- a/Source/WebKit/NetworkProcess/NetworkLoadChecker.h
>+++ b/Source/WebKit/NetworkProcess/NetworkLoadChecker.h
>@@ -84,7 +84,7 @@ private:
>     void checkCORSRedirectedRequest(WebCore::ResourceRequest&&, ValidationHandler&&);
>     void checkCORSRequestWithPreflight(WebCore::ResourceRequest&&, ValidationHandler&&);
> 
>-    RequestOrError returnError(String&& error);
>+    RequestOrError createRequestOrError(String&& error);
> 
> #if ENABLE(CONTENT_EXTENSIONS)
>     void processContentExtensionRulesForLoad(WebCore::ResourceRequest&&, CompletionHandler<void(WebCore::ResourceRequest&&, const WebCore::ContentExtensions::BlockedStatus&)>&&);

Flags:

youennf: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 185035: 338893