| Index: third_party/WebKit/Source/core/loader/MixedContentChecker.h
|
| diff --git a/third_party/WebKit/Source/core/loader/MixedContentChecker.h b/third_party/WebKit/Source/core/loader/MixedContentChecker.h
|
| index fb1c08f19b71d290c0e609a528372f0b4e62aaa8..fa643a198ab843428831db826557d9d51ae2633d 100644
|
| --- a/third_party/WebKit/Source/core/loader/MixedContentChecker.h
|
| +++ b/third_party/WebKit/Source/core/loader/MixedContentChecker.h
|
| @@ -59,10 +59,10 @@ public:
|
| };
|
|
|
| enum ReportingStatus { SendReport, SuppressReport };
|
| - static bool shouldBlockFetch(LocalFrame*, WebURLRequest::RequestContext, WebURLRequest::FrameType, const KURL&, ReportingStatus = SendReport);
|
| + static bool shouldBlockFetch(LocalFrame*, WebURLRequest::RequestContext, WebURLRequest::FrameType, ResourceRequest::RedirectStatus, const KURL&, ReportingStatus = SendReport);
|
| static bool shouldBlockFetch(LocalFrame* frame, const ResourceRequest& request, const KURL& url, ReportingStatus status = SendReport)
|
| {
|
| - return shouldBlockFetch(frame, request.requestContext(), request.frameType(), url, status);
|
| + return shouldBlockFetch(frame, request.requestContext(), request.frameType(), request.redirectStatus(), url, status);
|
| }
|
|
|
| static bool shouldBlockWebSocket(LocalFrame*, const KURL&, ReportingStatus = SendReport);
|
|
|