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.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_WEB_NAVIGATION_FRAME_NAVIGATION_STATE_H_
 #define CHROME_BROWSER_EXTENSIONS_API_WEB_NAVIGATION_FRAME_NAVIGATION_STATE_H_
 
 #include <map>
 #include <set>
 
@@ skipping 35 matching lines @@
   const_iterator end() const { return frame_ids_.end(); }
 
   // True if navigation events for the given frame can be sent.
   bool CanSendEvents(FrameID frame_id) const;
 
   // True if in general webNavigation events may be sent for the given URL.
   bool IsValidUrl(const GURL& url) const;
 
   // Starts to track a frame identified by its |frame_id| showing the URL |url|.
   void TrackFrame(FrameID frame_id,
+                  FrameID parent_frame_id,
                   const GURL& url,
                   bool is_main_frame,
                   bool is_error_page);
 
   // Stops tracking all frames but the frame with |id_to_skip| for a given
   // RenderViewHost.
   void StopTrackingFramesInRVH(content::RenderViewHost* render_view_host,
                                FrameID id_to_skip);
 
   // Update the URL associated with a given frame.
   void UpdateFrame(FrameID frame_id, const GURL& url);
 
   // Returns true if |frame_id| is a known frame.
   bool IsValidFrame(FrameID frame_id) const;
 
   // Returns the URL corresponding to a tracked frame given by its |frame_id|.
   GURL GetUrl(FrameID frame_id) const;
 
   // True if the frame given by its |frame_id| is a main frame of its tab.
   // There might be multiple uncomitted main frames.
   bool IsMainFrame(FrameID frame_id) const;
 
   // Returns the frame ID of the last comitted main frame, or -1 if the frame
   // ID is not known.
   FrameID GetMainFrameID() const;
 
+  // Get the parent frame ID (or an invalid ID, if |frame_id| is a main frame).
+  FrameID GetParentFrameID(FrameID frame_id) const;
+
   // Marks a frame as in an error state, i.e. the onErrorOccurred event was
   // fired for this frame, and no further events should be sent for it.
   void SetErrorOccurredInFrame(FrameID frame_id);
 
   // True if the frame is marked as being in an error state.
   bool GetErrorOccurredInFrame(FrameID frame_id) const;
 
   // Marks a frame as having finished its last navigation, i.e. the onCompleted
   // event was fired for this frame.
   void SetNavigationCompleted(FrameID frame_id);
@@ skipping 20 matching lines @@
   }
 #endif
 
  private:
   struct FrameState {
     bool error_occurred;  // True if an error has occurred in this frame.
     bool is_main_frame;  // True if this is a main frame.
     bool is_navigating;  // True if there is a navigation going on.
     bool is_committed;  // True if the navigation is already committed.
     bool is_server_redirected;  // True if a server redirect happened.
+    int64 parent_frame_num;

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

It's a bit confusing to have "frame ID" mean both the plain frame ID (which this
identifier seems to be, or the |parent_frame_id| that we pass around) and
FrameID (which contains the former, but also has a RenderViewHost). Then, to add
to the confusion, the frame ID inside of a FrameID is called |frame_num|?

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

a frame is identified by this in, and the RV it is in. A WebContents (which a
frameNavigationState object relates to) can have multiple RVH, which is why it
needs to track both the int and the RVH :-/

I could also put a FrameID parent_frame_id here, but this would require a
ctor/dtor for this struct.

     GURL url;  // URL of this frame.
   };
   typedef std::map<FrameID, FrameState> FrameIdToStateMap;
 
   // Tracks the state of known frames.
   FrameIdToStateMap frame_state_map_;
 
   // Set of all known frames.
   std::set<FrameID> frame_ids_;
 
   // The id of the last comitted main frame.
   FrameID main_frame_id_;
 
   // If true, also allow events from chrome-extension:// URLs.
   static bool allow_extension_scheme_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameNavigationState);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_WEB_NAVIGATION_FRAME_NAVIGATION_STATE_H_