<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 674 matching lines @@
 
 void RenderWidgetHostImpl::GotFocus() {
   Focus();
   if (owner_delegate_)
     owner_delegate_->RenderWidgetGotFocus();
   if (delegate_)
     delegate_->RenderWidgetGotFocus(this);
 }
 
 void RenderWidgetHostImpl::Focus() {
+  RenderWidgetHostImpl* focused_widget = nullptr;
+  if (delegate_)
+    focused_widget = delegate_->GetFocusedRenderWidgetHost(this);

[wjmaclean, 2016/10/27 18:41:01]

Minor suggestion:

RenderWidgetHostImpl* focused_widget =
  delegate_ ? delegate_->GetFocusedRenderWidgetHost(this) : nullptr;

[avallee, 2016/10/27 19:00:57]

Done. How do we feel about auto*?

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

csreis asked for this to be reverted in
https://codereview.chromium.org/2451143003/diff/200001/content/browser/render...

[Charlie Reis, 2016/11/16 21:51:19]

Maybe there's a misunderstanding?  I'm fine with wjmaclean's suggestion here
about using a ternary operator in general.  I was just asking not to use it
within a parenthetical phrase that we then call a method on.

+
+  if (focused_widget)
+    focused_widget->FocusDirect();
+  else
+    FocusDirect();
+}
+
+void RenderWidgetHostImpl::Blur() {
+  RenderWidgetHostImpl* focused_widget = nullptr;
+  if (delegate_)
+    focused_widget = delegate_->GetFocusedRenderWidgetHost(this);
+
+  if (focused_widget)
+    focused_widget->BlurDirect();
+  else
+    BlurDirect();
+}
+
+void RenderWidgetHostImpl::FocusDirect() {
   is_focused_ = true;
 
   Send(new InputMsg_SetFocus(routing_id_, true));
 
   // 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() {
+void RenderWidgetHostImpl::BlurDirect() {
   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();
@@ skipping 1163 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 318 matching lines @@
   return delegate_ ? delegate_->GetRootBrowserAccessibilityManager() : NULL;
 }
 
 BrowserAccessibilityManager*
     RenderWidgetHostImpl::GetOrCreateRootBrowserAccessibilityManager() {
   return delegate_ ?
       delegate_->GetOrCreateRootBrowserAccessibilityManager() : NULL;
 }
 
 }  // namespace content