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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1983913002: Test to see if we can bring in document data from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: WebLocalFrameImpl::loadData Created 4 years, 7 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 | « content/renderer/render_frame_impl.h ('k') | third_party/WebKit/Source/core/loader/EmptyClients.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 79bdb6c8e4208d92625cf513e9fa736178563dc3..ce3b619f60921f838253344f120592691949e1bd 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2925,10 +2925,13 @@ void RenderFrameImpl::willSubmitForm(const blink::WebFormElement& form) {
}
void RenderFrameImpl::didCreateDataSource(blink::WebLocalFrame* frame,
- blink::WebDataSource* datasource) {
+ blink::WebDataSource* datasource,
+ int initiator) {
DCHECK(!frame_ || frame_ == frame);
bool content_initiated = !pending_navigation_params_.get();
+ if (initiator != 0)
+ DCHECK_EQ(content_initiated, initiator == 1);
// Make sure any previous redirect URLs end up in our new data source.
if (pending_navigation_params_.get()) {
« no previous file with comments | « content/renderer/render_frame_impl.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