summaryrefslogtreecommitdiffstats
path: root/content/renderer
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-12 13:35:13 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-12 13:35:13 +0000
commitd37c33e7b1b74a2030b2967412e17e26ae45d4e2 (patch)
tree57345e108da83f897ac0645227131827ca8e9a94 /content/renderer
parent32d5c972c673034657655def22e5a35b97f3561b (diff)
downloadchromium_src-d37c33e7b1b74a2030b2967412e17e26ae45d4e2.zip
chromium_src-d37c33e7b1b74a2030b2967412e17e26ae45d4e2.tar.gz
chromium_src-d37c33e7b1b74a2030b2967412e17e26ae45d4e2.tar.bz2
When starting a provisional load include the parent frame ID in the IPC and pass it down the th WCObservers
This is the first half of the change, the second half will send the parent frame id with the webNavigation events See RenderViewImpl::willSendRequest when it creates the RequestExtraData for a place where we already send the parent frame id (this is for the webRequest API that looks at network requests instead of navigation events) BUG=128927 TEST=FrameNavigationState.* Review URL: https://chromiumcodereview.appspot.com/11090068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161570 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
-rw-r--r--content/renderer/render_view_impl.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index e7d3d594..906076e 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -3236,8 +3236,9 @@ void RenderViewImpl::didStartProvisionalLoad(WebFrame* frame) {
RenderViewObserver, observers_, DidStartProvisionalLoad(frame));
Send(new ViewHostMsg_DidStartProvisionalLoadForFrame(
- routing_id_, frame->identifier(), is_top_most, GetOpenerUrl(),
- ds->request().url()));
+ routing_id_, frame->identifier(),
+ frame->parent() ? frame->parent()->identifier() : -1,
+ is_top_most, GetOpenerUrl(), ds->request().url()));
}
void RenderViewImpl::didReceiveServerRedirectForProvisionalLoad(