Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1020)

Unified Diff: Source/core/fetch/ResourceFetcher.cpp

Issue 566533003: Mixed Content: Make MixedContentChecker completely static. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixing tests. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/fetch/ResourceFetcher.cpp
diff --git a/Source/core/fetch/ResourceFetcher.cpp b/Source/core/fetch/ResourceFetcher.cpp
index 73149d0feafa4792027a8cfae678c90ff5413ecf..47883bbb9b789a4066c9327c0fa2d76204d61f2b 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"
@@ -568,7 +569,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
@@ -1194,6 +1195,7 @@ void ResourceFetcher::requestPreload(Resource::Type type, FetchRequest& request,
request.setCharset(encoding);
request.setForPreload(true);
+ request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestContextPrefetch);
ResourcePtr<Resource> resource;
// Loading images involves several special cases, so use dedicated fetch method instead.

Powered by Google App Engine
This is Rietveld 408576698