Fix keyboard focus for OOPIF-<webview>.

content/browser/web_contents/web_contents_impl.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 CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
 
 #include <stdint.h>
 
 #include <functional>
@@ skipping 445 matching lines @@
   GeolocationServiceContext* GetGeolocationServiceContext() override;
   WakeLockServiceContext* GetWakeLockServiceContext() override;
   void EnterFullscreenMode(const GURL& origin) override;
   void ExitFullscreenMode(bool will_cause_resize) override;
   bool ShouldRouteMessageEvent(
       RenderFrameHost* target_rfh,
       SiteInstance* source_site_instance) const override;
   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;
   bool OnMessageReceived(RenderViewHost* render_view_host,
                          const IPC::Message& message) override;
   // RenderFrameHostDelegate has the same method, so list it there because this
   // interface is going away.
   // WebContents* GetAsWebContents() override;
   void RenderViewCreated(RenderViewHost* render_view_host) override;
   void RenderViewReady(RenderViewHost* render_view_host) override;
@@ skipping 327 matching lines @@
   //
   // Two WebContents with separate FrameTrees can be connected by
   // outer/inner relationship using this class. Note that their FrameTrees
   // still remain disjoint.
   // The parent is referred to as "outer WebContents" and the descendents are
   // referred to as "inner WebContents".
   // For each inner WebContents, the outer WebContents will have a
   // 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.
   WebContentsImpl(BrowserContext* browser_context);
 
   // Add and remove observers for page navigation notifications. The order in
   // which notifications are sent to observers is undefined. Clients must be
   // sure to remove the observer before they go away.
   void AddObserver(WebContentsObserver* observer);
   void RemoveObserver(WebContentsObserver* observer);
@@ skipping 119 matching lines @@
                                const base::string16& main_text,
                                const base::string16& sub_text);
   void OnHideValidationMessage();
   void OnMoveValidationMessage(const gfx::Rect& anchor_in_root_view);
 
   // Called by derived classes to indicate that we're no longer waiting for a
   // response. This won't actually update the throbber, but it will get picked
   // 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().
 
   // Handles post-navigation tasks in DidNavigate AFTER the entry has been
   // committed to the navigation controller. Note that the navigation entry is
   // not provided since it may be invalid/changed after being committed. The
   // current navigation entry is in the NavigationController at this point.
 
   // If our controller was restored, update the max page ID associated with the
@@ skipping 413 matching lines @@
   // Adds/removes a callback called on creation of each new WebContents.
   static void AddCreatedCallbackForTesting(const CreatedCallback& callback);
   static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback);
 
   DISALLOW_COPY_AND_ASSIGN(FriendZone);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_