<webview>: Correctly shift focus between WebContents.

content/browser/renderer_host/render_widget_host_impl.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 "content/browser/renderer_host/render_widget_host_impl.h"
 
 #include <math.h>
 
 #include <set>
 #include <tuple>
@@ skipping 719 matching lines @@
 
 void RenderWidgetHostImpl::GotFocus() {
   Focus();
   if (owner_delegate_)
     owner_delegate_->RenderWidgetGotFocus();
   if (delegate_)
     delegate_->RenderWidgetGotFocus(this);
 }
 
 void RenderWidgetHostImpl::Focus() {
-  is_focused_ = true;
+  RenderWidgetHostImpl* focused_widget =
+      delegate_ ? delegate_->GetRenderWidgetHostWithPageFocus() : nullptr;
 
-  Send(new InputMsg_SetFocus(routing_id_, true));
+  (focused_widget ? focused_widget : this)->SetPageFocus(true);

[Charlie Reis, 2016/11/16 20:28:23]

Style nit: Let's avoid using ternary operators inside an expression like this. 
Let's just add this before:
if (!focused_widget)
  focused_widget = this;

Same below.

[avallee, 2016/11/16 21:18:10]

wjmaclean asked for this on
https://codereview.chromium.org/2451143003/diff/60001/content/browser/rendere...
. Reverted.

[wjmaclean, 2016/11/16 21:57:09]

It would make sense, in this case, to do

RenderWidgetHostImpl* focused_widget =
  delegate_ ? delegate_->GetRenderWidgetHostWithPageFocus() : this;
focused_widget->SetPageFocus(false);

N'est-ce pas?

[Charlie Reis, 2016/11/16 22:00:57]

Only if GetRenderWidgetHostWithPageFocus() can never return null.  :)  Looks
like at least the default impl returns null, though.

+}
+
+void RenderWidgetHostImpl::Blur() {
+  RenderWidgetHostImpl* focused_widget =
+      delegate_ ? delegate_->GetRenderWidgetHostWithPageFocus() : nullptr;
+
+  (focused_widget ? focused_widget : this)->SetPageFocus(false);
+}
+
+void RenderWidgetHostImpl::SetPageFocus(bool focused) {
+  is_focused_ = focused;
+
+  if (!focused) {
+    // If there is a pending mouse lock request, we don't want to reject it at
+    // this point. The user can switch focus back to this view and approve the
+    // request later.
+    if (IsMouseLocked())
+      view_->UnlockMouse();
+
+    if (touch_emulator_)
+      touch_emulator_->CancelTouch();
+  }
+
+  Send(new InputMsg_SetFocus(routing_id_, focused));
 
   // Also send page-level focus state to other SiteInstances involved in
   // rendering the current FrameTree.
   if (RenderViewHost::From(this) && delegate_)
-    delegate_->ReplicatePageFocus(true);
-}
-
-void RenderWidgetHostImpl::Blur() {
-  is_focused_ = false;
-
-  // If there is a pending mouse lock request, we don't want to reject it at
-  // this point. The user can switch focus back to this view and approve the
-  // request later.
-  if (IsMouseLocked())
-    view_->UnlockMouse();
-
-  if (touch_emulator_)
-    touch_emulator_->CancelTouch();
-
-  Send(new InputMsg_SetFocus(routing_id_, false));
-
-  // Also send page-level focus state to other SiteInstances involved in
-  // rendering the current FrameTree.
-  if (RenderViewHost::From(this) && delegate_)
-    delegate_->ReplicatePageFocus(false);
+    delegate_->ReplicatePageFocus(focused);
 }
 
 void RenderWidgetHostImpl::LostCapture() {
   if (touch_emulator_)
     touch_emulator_->CancelTouch();
 
   Send(new InputMsg_MouseCaptureLost(routing_id_));
 
   if (delegate_)
     delegate_->LostCapture(this);
@@ skipping 1288 matching lines @@
     const blink::WebInputEvent& event, const ui::LatencyInfo& latency_info) {
   // Don't ignore touch cancel events, since they may be sent while input
   // events are being ignored in order to keep the renderer from getting
   // confused about how many touches are active.
   if (ShouldDropInputEvents() && event.type != WebInputEvent::TouchCancel)
     return INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS;
 
   if (!process_->HasConnection())
     return INPUT_EVENT_ACK_STATE_UNKNOWN;
 
-  if (delegate_ && (event.type == WebInputEvent::MouseDown ||
-                    event.type == WebInputEvent::GestureScrollBegin ||
-                    event.type == WebInputEvent::TouchStart ||
-                    event.type == WebInputEvent::RawKeyDown)) {
-    delegate_->OnUserInteraction(this, event.type);
+  if (delegate_) {
+    if (event.type == WebInputEvent::MouseDown ||
+        event.type == WebInputEvent::TouchStart) {
+      delegate_->EnsureOwningContentsIsFocused(this);
+    }
+    if (event.type == WebInputEvent::MouseDown ||
+        event.type == WebInputEvent::GestureScrollBegin ||
+        event.type == WebInputEvent::TouchStart ||
+        event.type == WebInputEvent::RawKeyDown) {
+      delegate_->OnUserInteraction(this, event.type);
+    }
   }
 
   return view_ ? view_->FilterInputEvent(event)
                : INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
 }
 
 void RenderWidgetHostImpl::IncrementInFlightEventCount(
     blink::WebInputEvent::Type event_type) {
   increment_in_flight_event_count();
   if (!is_hidden_) {
@@ skipping 398 matching lines @@
     // Note: We are using the origin URL provided by the sender here. It may be
     // different from the receiver's.
     file_system_file.url =
         GURL(storage::GetIsolatedFileSystemRootURIString(
                  file_system_url.origin(), filesystem_id, std::string())
                  .append(register_name));
   }
 }
 
 }  // namespace content