Redesigns the text input focus handling.

ui/views/controls/webview/webview.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 "ui/views/controls/webview/webview.h"
 
 #include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "ipc/ipc_message.h"
 #include "ui/accessibility/ax_enums.h"
 #include "ui/accessibility/ax_view_state.h"
+#include "ui/base/ui_base_switches_util.h"
 #include "ui/events/event.h"
 #include "ui/views/accessibility/native_view_accessibility.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/views_delegate.h"
 
 namespace views {
 
 // static
 const char WebView::kViewClassName[] = "WebView";
@@ skipping 17 matching lines @@
 
 content::WebContents* WebView::GetWebContents() {
   if (!web_contents()) {
     wc_owner_.reset(CreateWebContents(browser_context_));
     wc_owner_->SetDelegate(this);
     SetWebContents(wc_owner_.get());
   }
   return web_contents();
 }
 
 void WebView::SetWebContents(content::WebContents* replacement) {

[msw, 2014/03/11 23:24:39]

Should this also call OnTextInputClientChanged?

[Yuki, 2014/03/12 09:13:15]

Very good catch.  I added it to {Attach,Detach}WebContents().

{Attach,Detach}WebContents are one-stop place that handles a web contents
changes.  SetWebContents() calls DetachWebContents and then AttachWebContents().

   if (replacement == web_contents())
     return;
   DetachWebContents();
   if (wc_owner_ != replacement)
     wc_owner_.reset();
   WebContentsObserver::Observe(replacement);
   // web_contents() now returns |replacement| from here onwards.
   if (embed_fullscreen_widget_mode_enabled_) {
     is_embedding_fullscreen_widget_ =
         web_contents() && web_contents()->GetFullscreenRenderWidgetHostView();
@@ skipping 38 matching lines @@
   PreferredSizeChanged();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebView, View overrides:
 
 const char* WebView::GetClassName() const {
   return kViewClassName;
 }
 
+ui::TextInputClient* WebView::GetTextInputClient() {
+  if (switches::IsTextInputFocusManagerEnabled() &&
+      web_contents() && !web_contents()->IsBeingDestroyed()) {
+    content::RenderWidgetHostView* host_view =
+        web_contents()->GetRenderWidgetHostView();

[msw, 2014/03/11 23:24:39]

Should this ever use web_contents()->GetFullscreenRenderWidgetHostView()?

[Yuki, 2014/03/12 09:13:15]

Very good catch.  Updated.

+    if (host_view)
+      return host_view->GetTextInputClient();
+  }
+  return NULL;
+}
+
 void WebView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   wcv_holder_->SetSize(bounds().size());
 }
 
 void WebView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add)
     AttachWebContents();
 }
 
@@ skipping 64 matching lines @@
 }
 
 bool WebView::EmbedsFullscreenWidget() const {
   DCHECK(wc_owner_.get());
   return embed_fullscreen_widget_mode_enabled_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebView, content::WebContentsObserver implementation:
 
+void WebView::RenderViewDeleted(content::RenderViewHost* render_view_host) {
+  // WebView::GetTextInputClient() delegates the text input handling to the
+  // underlying content::RenderWidgetHostView.  So when the underlying RWHV is
+  // destroyed, we have to notify the FocusManager that the focused
+  // TextInputClient needs to be updated.
+  FocusManager* const focus_manager = GetFocusManager();
+  if (focus_manager)
+    focus_manager->OnTextInputClientChanged(this);
+}
+
 void WebView::RenderViewHostChanged(content::RenderViewHost* old_host,
                                     content::RenderViewHost* new_host) {
   FocusManager* const focus_manager = GetFocusManager();
   if (focus_manager && focus_manager->GetFocusedView() == this)
     OnFocus();
 }
 
 void WebView::WebContentsDestroyed(content::WebContents* web_contents) {

[msw, 2014/03/11 23:24:39]

Should this also call OnTextInputClientChanged?

[Yuki, 2014/03/12 09:13:15]

I think no need here.  SetWebContents(NULL) handles it.

In addition, if the web contents is destroyed, its RWHV should be destroyed. 
Then RenderViewDeleted() above should be called.

   // We watch for destruction of WebContents that we host but do not own. If we
   // own a WebContents that is being destroyed, we're doing the destroying, so
   // we don't want to recursively tear it down while it's being torn down.
   if (!wc_owner_.get())
     SetWebContents(NULL);
 }
 
 void WebView::DidShowFullscreenWidget(int routing_id) {
   if (embed_fullscreen_widget_mode_enabled_)
     ReattachForFullscreenChange(true);
 }
 
 void WebView::DidDestroyFullscreenWidget(int routing_id) {
   if (embed_fullscreen_widget_mode_enabled_)
     ReattachForFullscreenChange(false);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebView, private:
 
 void WebView::AttachWebContents() {

[msw, 2014/03/11 23:24:39]

Should this also call OnTextInputClientChanged?

[Yuki, 2014/03/12 09:13:15]

Done.

   // Prevents attachment if the WebView isn't already in a Widget, or it's
   // already attached.
   if (!GetWidget() || !web_contents())
     return;
 
   const gfx::NativeView view_to_attach = is_embedding_fullscreen_widget_ ?
       web_contents()->GetFullscreenRenderWidgetHostView()->GetNativeView() :
       web_contents()->GetView()->GetNativeView();
   if (wcv_holder_->native_view() == view_to_attach)
     return;
   wcv_holder_->Attach(view_to_attach);
 
   // The view will not be focused automatically when it is attached, so we need
   // to pass on focus to it if the FocusManager thinks the view is focused. Note
   // that not every Widget has a focus manager.
   FocusManager* const focus_manager = GetFocusManager();
   if (focus_manager && focus_manager->GetFocusedView() == this)
     OnFocus();
 
 #if defined(OS_WIN)
   if (!is_embedding_fullscreen_widget_) {
     web_contents()->SetParentNativeViewAccessible(
         parent()->GetNativeViewAccessible());
   }
 #endif
 }
 
 void WebView::DetachWebContents() {

[msw, 2014/03/11 23:24:39]

Should this also call OnTextInputClientChanged?

[Yuki, 2014/03/12 09:13:15]

Done.

   if (web_contents()) {
     wcv_holder_->Detach();
 #if defined(OS_WIN)
     if (!is_embedding_fullscreen_widget_) {
 #if !defined(USE_AURA)
       // TODO(beng): This should either not be necessary, or be done implicitly
       // by NativeViewHostWin on Detach(). As it stands, this is needed so that
       // the of the detached contents knows to tell the renderer it's been
       // hidden.
       //
       // Moving this out of here would also mean we wouldn't be potentially
       // calling member functions on a half-destroyed WebContents.
       ShowWindow(web_contents()->GetView()->GetNativeView(), SW_HIDE);
 #else
       web_contents()->SetParentNativeViewAccessible(NULL);
 #endif
     }
 #endif
   }
 }
 
 void WebView::ReattachForFullscreenChange(bool enter_fullscreen) {

[msw, 2014/03/11 23:24:39]

Should this also call OnTextInputClientChanged?

[Yuki, 2014/03/12 09:13:15]

This method calls DetachWebContents() and then AttachWebConents().  So it's
okay.

   DetachWebContents();
   is_embedding_fullscreen_widget_ = enter_fullscreen &&
       web_contents() && web_contents()->GetFullscreenRenderWidgetHostView();
   AttachWebContents();
 }
 
 content::WebContents* WebView::CreateWebContents(
       content::BrowserContext* browser_context) {
   content::WebContents* contents = NULL;
   if (ViewsDelegate::views_delegate) {
     contents = ViewsDelegate::views_delegate->CreateWebContents(
         browser_context, NULL);
   }
 
   if (!contents) {
     content::WebContents::CreateParams create_params(
         browser_context, NULL);
     return content::WebContents::Create(create_params);
   }
 
   return contents;
 }
 
 }  // namespace views