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

Unified Diff: third_party/WebKit/Source/core/loader/DocumentLoader.cpp

Issue 2781723007: Plumb initiator out of Blink. (Closed)
Patch Set: Created 3 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
Index: third_party/WebKit/Source/core/loader/DocumentLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
index f205367fcf98354ba7820789993b38f370f801e5..749898fb171b355bc2d9f8027c7795b225d9b5c6 100644
--- a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
@@ -103,9 +103,11 @@ static bool shouldInheritSecurityOriginFromOwner(const KURL& url) {
DocumentLoader::DocumentLoader(LocalFrame* frame,
const ResourceRequest& req,
const SubstituteData& substituteData,
- ClientRedirectPolicy clientRedirectPolicy)
+ ClientRedirectPolicy clientRedirectPolicy,
+ Document* originDocument)
: m_frame(frame),
m_fetcher(FrameFetchContext::createFetcherFromDocumentLoader(this)),
+ m_originDocument(originDocument),
m_originalRequest(req),
m_substituteData(substituteData),
m_request(req),
@@ -158,6 +160,7 @@ DEFINE_TRACE(DocumentLoader) {
visitor->trace(m_fetcher);
visitor->trace(m_mainResource);
visitor->trace(m_writer);
+ visitor->trace(m_originDocument);
visitor->trace(m_subresourceFilter);
visitor->trace(m_documentLoadTiming);
visitor->trace(m_applicationCacheHost);
@@ -386,9 +389,10 @@ bool DocumentLoader::redirectReceived(
return false;
}
if (frameLoader().shouldContinueForNavigationPolicy(
- m_request, SubstituteData(), this, CheckContentSecurityPolicy,
- m_navigationType, NavigationPolicyCurrentTab, m_loadType,
- isClientRedirect(), nullptr) != NavigationPolicyCurrentTab) {
+ m_originDocument.get(), m_request, SubstituteData(), this,
+ CheckContentSecurityPolicy, m_navigationType,
+ NavigationPolicyCurrentTab, m_loadType, isClientRedirect(),
+ nullptr) != NavigationPolicyCurrentTab) {
m_fetcher->stopFetching();
return false;
}
« no previous file with comments | « third_party/WebKit/Source/core/loader/DocumentLoader.h ('k') | third_party/WebKit/Source/core/loader/EmptyClients.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698