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

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

Issue 995783002: Gracefully handle mixed content checking on detached resource fetches. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « Source/core/css/CSSImageValue.cpp ('k') | Source/core/html/parser/XSSAuditor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/fetch/ResourceFetcher.cpp
diff --git a/Source/core/fetch/ResourceFetcher.cpp b/Source/core/fetch/ResourceFetcher.cpp
index 37f63a6dd2d41157f68890e2b6394782c8837076..6485c257faa9b7c06476175bcb60eb3a12d7081c 100644
--- a/Source/core/fetch/ResourceFetcher.cpp
+++ b/Source/core/fetch/ResourceFetcher.cpp
@@ -56,6 +56,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/appcache/ApplicationCacheHost.h"
#include "core/timing/DOMWindowPerformance.h"
@@ -546,7 +547,8 @@ bool ResourceFetcher::canRequest(Resource::Type type, const ResourceRequest& res
// Measure the number of legacy URL schemes ('ftp://') and the number of embedded-credential
// ('http://user:password@...') resources embedded as subresources. in the hopes that we can
// block them at some point in the future.
- if (resourceRequest.frameType() != WebURLRequest::FrameTypeTopLevel) {
+ if (frame() && resourceRequest.frameType() != WebURLRequest::FrameTypeTopLevel) {
+ ASSERT(frame()->document());
if (SchemeRegistry::shouldTreatURLSchemeAsLegacy(url.protocol()) && !SchemeRegistry::shouldTreatURLSchemeAsLegacy(frame()->document()->securityOrigin()->protocol()))
UseCounter::count(frame()->document(), UseCounter::LegacyProtocolEmbeddedAsSubresource);
if (!url.user().isEmpty() || !url.pass().isEmpty())
@@ -560,10 +562,12 @@ bool ResourceFetcher::canRequest(Resource::Type type, const ResourceRequest& res
// If we're loading the main resource of a subframe, ensure that we check
// against the parent of the active frame, rather than the frame itself.
LocalFrame* effectiveFrame = frame();
- if (resourceRequest.frameType() == WebURLRequest::FrameTypeNested) {
+ if (effectiveFrame && resourceRequest.frameType() == WebURLRequest::FrameTypeNested) {
// FIXME: Deal with RemoteFrames.
- if (frame()->tree().parent()->isLocalFrame())
- effectiveFrame = toLocalFrame(frame()->tree().parent());
+ Frame* parentFrame = effectiveFrame->tree().parent();
+ ASSERT(parentFrame);
+ if (parentFrame->isLocalFrame())
+ effectiveFrame = toLocalFrame(parentFrame);
}
MixedContentChecker::ReportingStatus mixedContentReporting = forPreload ?
@@ -936,7 +940,7 @@ void ResourceFetcher::storeResourceTimingInitiatorInformation(Resource* resource
if (resource->type() == Resource::MainResource) {
// <iframe>s should report the initial navigation requested by the parent document, but not subsequent navigations.
// FIXME: Resource timing is broken when the parent is a remote frame.
- if (frame()->deprecatedLocalOwner() && !frame()->deprecatedLocalOwner()->loadedNonEmptyDocument()) {
+ if (frame() && frame()->deprecatedLocalOwner() && !frame()->deprecatedLocalOwner()->loadedNonEmptyDocument()) {
info->setInitiatorType(frame()->deprecatedLocalOwner()->localName());
m_resourceTimingInfoMap.add(resource, info);
frame()->deprecatedLocalOwner()->didLoadNonEmptyDocument();
« no previous file with comments | « Source/core/css/CSSImageValue.cpp ('k') | Source/core/html/parser/XSSAuditor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698