Fix keyboard focus for OOPIF-<webview>.

content/browser/web_contents/web_contents_impl.h

Index: content/browser/web_contents/web_contents_impl.h
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 645b6c7408ed7b6b940cf0b0a7577a276a0b4937..31d582d344d323238f973ba5691e83828011ddc0 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -463,6 +463,7 @@ class CONTENT_EXPORT WebContentsImpl
   void EnsureOpenerProxiesExist(RenderFrameHost* source_rfh) override;
   std::unique_ptr<WebUIImpl> CreateWebUIForRenderFrameHost(
       const GURL& url) override;
+  void SetFocusedFrame(FrameTreeNode* node, SiteInstance* source) override;
 
   // RenderViewHostDelegate ----------------------------------------------------
   RenderViewHostDelegateView* GetDelegateView() override;
@@ -810,26 +811,38 @@ private:
   // corresponding FrameTreeNode.
   struct WebContentsTreeNode {
    public:
-    WebContentsTreeNode();
+    explicit WebContentsTreeNode(WebContentsImpl* web_contents);
     ~WebContentsTreeNode();
 
-    typedef std::set<WebContentsTreeNode*> ChildrenSet;
+    typedef std::unordered_map<int, WebContentsTreeNode*> ChildrenMap;
 
     void ConnectToOuterWebContents(WebContentsImpl* outer_web_contents,
                                    RenderFrameHostImpl* outer_contents_frame);
 
     WebContentsImpl* outer_web_contents() { return outer_web_contents_; }
-    int outer_contents_frame_tree_node_id() {
+    int outer_contents_frame_tree_node_id() const {
       return outer_contents_frame_tree_node_id_;
     }
 
+    WebContentsImpl* get_focused_web_contents() {

[alexmos, 2016/05/26 00:32:25]

nit: just focused_web_contents(), mirroring naming for outer_web_contents() (and
it probably fits on one line)

[avallee, 2016/06/07 15:37:44]

Done.

+      return focused_web_contents_;
+    }
+
+    void SetFocusedWebContents(WebContentsImpl* web_contents);
+
    private:
+    // The WebContents that owns this node.
+    WebContentsImpl* web_contents_;

[alexmos, 2016/05/26 00:32:25]

This looks unused now.

[avallee, 2016/06/07 15:37:44]

Removed.

     // The outer WebContents.
     WebContentsImpl* outer_web_contents_;
     // The ID of the FrameTreeNode in outer WebContents that is hosting us.
     int outer_contents_frame_tree_node_id_;
-    // List of inner WebContents that we host.
-    ChildrenSet inner_web_contents_tree_nodes_;
+    // List of inner WebContents, mapped by id of the FrameTreeNode hosting
+    // them.
+    ChildrenMap inner_web_contents_tree_nodes_;

[alexmos, 2016/05/26 00:32:26]

Is the transformation to use a map here still necessary?  (It doesn't seem like
this CL needs it anymore, though looks like it enables a more efficient cleanup
in the destructor.  I'm ok keeping it if that's something desirable for
<webview> in general, since you've already done the work, though it might be
cleaner in a separate CL.)

[avallee, 2016/06/07 15:37:44]

I think it will be necessary for page focus setting.

+    // Only the root node should have this set. This indicates the WebContents
+    // whose frame tree has the focused frame.
+    WebContentsImpl* focused_web_contents_;

[alexmos, 2016/05/26 00:32:26]

It's unfortunate that we have to keep this around for each WebContentsTreeNode,
but I don't see a good/easy alternative either.  Lucas, does this seem ok? 
Maybe we should introduce something like a WebContentsFrameTree that could hold
the root WebContentsTreeNode and where we could also put something like this?

   };
 
   // See WebContents::Create for a description of these parameters.
@@ -969,6 +982,12 @@ private:
   // up at the next animation step if the throbber is going.
   void SetNotWaitingForResponse() { waiting_for_response_ = false; }
 
+  // Returns the focused WebContents.

[alexmos, 2016/05/26 00:32:26]

nit: expand a bit on what this is for.  I.e., if there are inner/outer
WebContents (for <webview>, <guestview>, ...), return the WebContents that
contains the currently focused frame.  Otherwise just returns a pointer to
itself.

[avallee, 2016/06/07 15:37:44]

Done.

+  WebContentsImpl* GetFocusedWebContents();
+
+  // Returns the root of the WebContents tree.
+  WebContentsImpl* GetOutermostWebContents();
+
   // Navigation helpers --------------------------------------------------------
   //
   // These functions are helpers for Navigate() and DidNavigate().