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

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

Issue 2416523002: Expose the initiating origin/URL of a navigation in the Blink public API (Closed)
Patch Set: Use less memory, add tests, etc. Created 4 years, 1 month 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/FrameLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index fde5f299ac1e539ba4f62f6f845d6b91866f77a7..13930700ef71a69b652b4b77befa6799b4810a41 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -221,9 +221,9 @@ void FrameLoader::init() {
initialRequest.setFrameType(m_frame->isMainFrame()
? WebURLRequest::FrameTypeTopLevel
: WebURLRequest::FrameTypeNested);
- m_provisionalDocumentLoader =
- client()->createDocumentLoader(m_frame, initialRequest, SubstituteData(),
- ClientRedirectPolicy::NotClientRedirect);
+ m_provisionalDocumentLoader = client()->createDocumentLoader(
+ m_frame, initialRequest, SubstituteData(),
+ ClientRedirectPolicy::NotClientRedirect, nullptr);
m_provisionalDocumentLoader->startLoadingMainResource();
m_frame->document()->cancelParsing();
m_stateMachine.advanceTo(
@@ -1689,7 +1689,7 @@ void FrameLoader::startLoad(FrameLoadRequest& frameLoadRequest,
frameLoadRequest.substituteData().isValid()
? frameLoadRequest.substituteData()
: defaultSubstituteDataForURL(resourceRequest.url()),
- frameLoadRequest.clientRedirect());
+ frameLoadRequest.clientRedirect(), frameLoadRequest.originDocument());
Mike West 2016/11/23 11:11:20 How will this eventually work in a oopif world?
dcheng 2016/11/23 14:41:44 We'd still have a DocumentLoader in the original r
m_provisionalDocumentLoader->setNavigationType(navigationType);
m_provisionalDocumentLoader->setReplacesCurrentHistoryItem(
type == FrameLoadTypeReplaceCurrentItem);

Powered by Google App Engine
This is Rietveld 408576698