| Index: Source/core/fetch/ResourceFetcher.cpp
|
| diff --git a/Source/core/fetch/ResourceFetcher.cpp b/Source/core/fetch/ResourceFetcher.cpp
|
| index 49281ce02771e372f832a7985b258d53f4ae0c8f..25270689d7b764e94cd4c7e7a9f3ea3f9738ec46 100644
|
| --- a/Source/core/fetch/ResourceFetcher.cpp
|
| +++ b/Source/core/fetch/ResourceFetcher.cpp
|
| @@ -51,6 +51,7 @@
|
| #include "core/loader/DocumentLoader.h"
|
| #include "core/loader/FrameLoader.h"
|
| #include "core/loader/FrameLoaderClient.h"
|
| +#include "core/loader/MixedContentChecker.h"
|
| #include "core/loader/PingLoader.h"
|
| #include "core/loader/SubstituteData.h"
|
| #include "core/loader/UniqueIdentifier.h"
|
| @@ -564,7 +565,7 @@ bool ResourceFetcher::canRequest(Resource::Type type, const ResourceRequest& res
|
| effectiveFrame = toLocalFrame(frame()->tree().parent());
|
| }
|
|
|
| - return !MixedContentChecker::shouldBlockFetch(effectiveFrame, resourceRequest, url);
|
| + return !MixedContentChecker::shouldBlockFetch(effectiveFrame, resourceRequest.requestContext(), resourceRequest.frameType(), url);
|
| }
|
|
|
| bool ResourceFetcher::canAccessResource(Resource* resource, SecurityOrigin* sourceOrigin, const KURL& url) const
|
|
|