Resolve request mapping issues with swapped out frames and browser-side navigation (issue #2290)

libcef/browser/browser_info.h

@@ -28,50 +28,61 @@ class CefBrowserInfo : public base::RefCountedThreadSafe<CefBrowserInfo> {
     explicit RenderIDManager(base::Lock* lock);
 
     // Adds an ID pair if it doesn't already exist.
-    void add_render_view_id(int render_process_id, int render_routing_id);
     void add_render_frame_id(int render_process_id, int render_routing_id);
 
     // Remove an ID pair if it exists.
-    void remove_render_view_id(int render_process_id, int render_routing_id);
     void remove_render_frame_id(int render_process_id, int render_routing_id);
 
     // Returns true if this browser matches the specified ID pair.
-    bool is_render_view_id_match(int render_process_id,
-                                 int render_routing_id) const;
     bool is_render_frame_id_match(int render_process_id,
                                   int render_routing_id) const;
 
    private:
     typedef std::set<std::pair<int, int>> RenderIdSet;
 
-    void add_render_id(RenderIdSet* id_set,
-                       int render_process_id,
-                       int render_routing_id);
-    void remove_render_id(RenderIdSet* id_set,
-                          int render_process_id,
-                          int render_routing_id);
-    bool is_render_id_match(const RenderIdSet* id_set,
-                            int render_process_id,
-                            int render_routing_id) const;
-
+    // Access to |render_frame_id_set_| must be protected by |lock_|.
     mutable base::Lock* lock_;
 
-    // The below members must be protected by |lock_|.
-
     // Set of mapped (process_id, routing_id) pairs. Keeping this set is
     // necessary for the following reasons:
-    // 1. When navigating cross-origin the new (pending) RenderViewHost will be
-    //    created before the old (current) RenderViewHost is destroyed.
+    // 1. When navigating cross-origin the new (pending) RenderFrameHost will be
+    //    created before the old (current) RenderFrameHost is destroyed.
     // 2. When canceling and asynchronously continuing navigation of the same
-    //    URL a new RenderViewHost may be created for the first (canceled)
+    //    URL a new RenderFrameHost may be created for the first (canceled)
     //    navigation and then destroyed as a result of the second (allowed)
     //    navigation.
     // 3. Out-of-process iframes have their own render IDs which must also be
     //    associated with the host browser.
-    RenderIdSet render_view_id_set_;
     RenderIdSet render_frame_id_set_;
   };
 
+  class FrameTreeNodeIDManager {
+   public:
+    explicit FrameTreeNodeIDManager(base::Lock* lock);
+
+    // Adds an ID if it doesn't already exist.
+    void add_frame_tree_node_id(int frame_tree_node_id);
+
+    // Remove an ID if it exists.
+    void remove_frame_tree_node_id(int frame_tree_node_id);
+
+    // Returns true if this browser matches the specified ID.
+    bool is_frame_tree_node_id_match(int frame_tree_node_id) const;
+
+   private:
+    typedef std::set<int> FrameTreeNodeIdSet;
+
+    // Access to |request_id_set_| must be protected by |lock_|.
+    mutable base::Lock* lock_;
+
+    // Set of mapped frame_tree_node_id values. Keeping this set is necessary
+    // because, when navigating the main frame, a new (pre-commit) URLRequest
+    // will be created before the RenderFrameHost. Consequently we can't rely
+    // on ResourceRequestInfo::GetRenderFrameForRequest returning a valid frame
+    // ID. See https://crbug.com/776884 for background.
+    FrameTreeNodeIdSet frame_tree_node_id_set_;
+  };
+
   CefBrowserInfo(int browser_id, bool is_popup);
 
   int browser_id() const { return browser_id_; };
@@ -88,6 +99,11 @@ class CefBrowserInfo : public base::RefCountedThreadSafe<CefBrowserInfo> {
     return &guest_render_id_manager_;
   }
 
+  // Returns the frame tree node ID manager for this browser.
+  FrameTreeNodeIDManager* frame_tree_node_id_manager() {
+    return &frame_tree_node_id_manager_;
+  }
+
   CefRefPtr<CefBrowserHostImpl> browser() const;
   void set_browser(CefRefPtr<CefBrowserHostImpl> browser);
 
@@ -107,6 +123,8 @@ class CefBrowserInfo : public base::RefCountedThreadSafe<CefBrowserInfo> {
   RenderIDManager render_id_manager_;
   RenderIDManager guest_render_id_manager_;
 
+  FrameTreeNodeIDManager frame_tree_node_id_manager_;
+
   // May be NULL if the browser has not yet been created or if the browser has
   // been destroyed.
   CefRefPtr<CefBrowserHostImpl> browser_;