When starting a provisional load include the parent frame ID in the IPC and pass it down the th WCO…

chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/web_navigation/frame_navigation_state.h"
 
 #include "base/logging.h"
 #include "chrome/common/url_constants.h"
 
 namespace extensions {
@@ skipping 71 matching lines @@
   }
   // Allow about:blank.
   if (url.spec() == chrome::kAboutBlankURL)
     return true;
   if (allow_extension_scheme_ && url.scheme() == chrome::kExtensionScheme)
     return true;
   return false;
 }
 
 void FrameNavigationState::TrackFrame(FrameID frame_id,
+                                      FrameID parent_frame_id,
                                       const GURL& url,
                                       bool is_main_frame,
                                       bool is_error_page) {
   FrameState& frame_state = frame_state_map_[frame_id];
   frame_state.error_occurred = is_error_page;
   frame_state.url = url;
   frame_state.is_main_frame = is_main_frame;
   frame_state.is_navigating = true;
   frame_state.is_committed = false;
   frame_state.is_server_redirected = false;
+  if (!is_main_frame)
+    frame_state.parent_frame_num = parent_frame_id.frame_num;
+  else
+    frame_state.parent_frame_num = -1;

[Bernhard Bauer, 2012/10/12 08:32:49]

What does |parent_frame_id| look like in this case? Shouldn't it already have a
-1 as |frame_num|?

[jochen (gone - plz use gerrit), 2012/10/12 10:44:48]

it should, but I want to be on the safe side and not store inconsistent data,
just because somebody screwed up the parent frame num somewhere.

[Bernhard Bauer, 2012/10/12 11:22:45]

Right. Could you DCHECK that then?

   frame_ids_.insert(frame_id);
 }
 
 void FrameNavigationState::StopTrackingFramesInRVH(
     content::RenderViewHost* render_view_host,
     FrameID id_to_skip) {
   for (std::set<FrameID>::iterator frame = frame_ids_.begin();
        frame != frame_ids_.end();) {
     if (frame->render_view_host != render_view_host || *frame == id_to_skip) {
       ++frame;
@@ skipping 37 matching lines @@
   FrameIdToStateMap::const_iterator frame_state =
       frame_state_map_.find(frame_id);
   return (frame_state != frame_state_map_.end() &&
           frame_state->second.is_main_frame);
 }
 
 FrameNavigationState::FrameID FrameNavigationState::GetMainFrameID() const {
   return main_frame_id_;
 }
 
+FrameNavigationState::FrameID FrameNavigationState::GetParentFrameID(
+    FrameID frame_id) const {
+  FrameIdToStateMap::const_iterator frame_state =
+      frame_state_map_.find(frame_id);
+  if (frame_state == frame_state_map_.end()) {
+    NOTREACHED();
+    return FrameID();
+  }
+  return FrameID(frame_state->second.parent_frame_num,
+                 frame_id.render_view_host);
+}
+
 void FrameNavigationState::SetErrorOccurredInFrame(FrameID frame_id) {
   DCHECK(frame_state_map_.find(frame_id) != frame_state_map_.end());
   frame_state_map_[frame_id].error_occurred = true;
 }
 
 bool FrameNavigationState::GetErrorOccurredInFrame(FrameID frame_id) const {
   FrameIdToStateMap::const_iterator frame_state =
       frame_state_map_.find(frame_id);
   return (frame_state == frame_state_map_.end() ||
           frame_state->second.error_occurred);
@@ skipping 31 matching lines @@
 }
 
 bool FrameNavigationState::GetIsServerRedirected(FrameID frame_id) const {
   FrameIdToStateMap::const_iterator frame_state =
       frame_state_map_.find(frame_id);
   return (frame_state != frame_state_map_.end() &&
           frame_state->second.is_server_redirected);
 }
 
 }  // namespace extensions