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 33 matching lines @@
   // web_contents() now returns |replacement| from here onwards.
   if (wc_owner_ != replacement)
     wc_owner_.reset();
   if (embed_fullscreen_widget_mode_enabled_) {
     is_embedding_fullscreen_widget_ =
         web_contents() && web_contents()->GetFullscreenRenderWidgetHostView();
   } else {
     DCHECK(!is_embedding_fullscreen_widget_);
   }
   AttachWebContents();
+  NotifyMaybeTextInputClientChanged();
 }
 
 void WebView::SetEmbedFullscreenWidgetMode(bool enable) {
   DCHECK(!web_contents())
       << "Cannot change mode while a WebContents is attached.";
   embed_fullscreen_widget_mode_enabled_ = enable;
 }
 
 void WebView::LoadInitialURL(const GURL& url) {
   GetWebContents()->GetController().LoadURL(
@@ skipping 16 matching lines @@
   PreferredSizeChanged();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebView, View overrides:
 
 const char* WebView::GetClassName() const {
   return kViewClassName;
 }
 
+ui::TextInputClient* WebView::GetTextInputClient() {
+  // This function delegates the text input handling to the underlying
+  // content::RenderWidgetHostView.  So when the underlying RWHV is destroyed or
+  // replaced with another one, we have to notify the FocusManager through
+  // FocusManager::OnTextInputClientChanged() that the focused TextInputClient
+  // needs to be updated.
+

[msw, 2014/04/18 19:57:57]

nit: remove blank line

[Yuki, 2014/04/22 09:09:02]

Done.

+  if (switches::IsTextInputFocusManagerEnabled() &&
+      web_contents() && !web_contents()->IsBeingDestroyed()) {
+    content::RenderWidgetHostView* host_view =
+        is_embedding_fullscreen_widget_ ?
+        web_contents()->GetFullscreenRenderWidgetHostView() :
+        web_contents()->GetRenderWidgetHostView();
+    if (host_view)
+      return host_view->GetTextInputClient();
+  }
+  return NULL;
+}
+
 void WebView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   // In most cases, the holder is simply sized to fill this WebView's bounds.
   // Only WebContentses that are in fullscreen mode and being screen-captured
   // will engage the special layout/sizing behavior.
   gfx::Rect holder_bounds(bounds().size());
   if (!embed_fullscreen_widget_mode_enabled_ ||
       !web_contents() ||
       web_contents()->GetCapturerCount() == 0 ||
       web_contents()->GetPreferredSize().IsEmpty() ||
       !(is_embedding_fullscreen_widget_ ||
@@ skipping 106 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) {
+  NotifyMaybeTextInputClientChanged();
+}
+
 void WebView::RenderViewHostChanged(content::RenderViewHost* old_host,
                                     content::RenderViewHost* new_host) {
   FocusManager* const focus_manager = GetFocusManager();
   if (focus_manager && focus_manager->GetFocusedView() == this)
     OnFocus();
+  NotifyMaybeTextInputClientChanged();
 }
 
 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);
@@ skipping 55 matching lines @@
     // widget.  Need to detach and re-attach to a different native view.
     DetachWebContents();
     is_embedding_fullscreen_widget_ =
         enter_fullscreen && web_contents_has_separate_fs_widget;
     AttachWebContents();
   } else {
     // Entering or exiting "non-Flash" fullscreen mode, where the native view is
     // the same.  So, do not change attachment.
     OnBoundsChanged(bounds());
   }
+  NotifyMaybeTextInputClientChanged();
+}
+
+void WebView::NotifyMaybeTextInputClientChanged() {
+  // Update the TextInputClient as needed; see GetTextInputClient().
+  FocusManager* const focus_manager = GetFocusManager();

[msw, 2014/04/18 19:57:57]

nit: remove const.

[Yuki, 2014/04/22 09:09:02]

I'm okay to remove this const, but this is the style used in this file.  I just
followed the style used on other lines in this file.  Should I remove 'const'
from all the lines which call GetFocusManager()?

[msw, 2014/04/22 17:12:56]

Okay, the style guide says encourages putting const first (const FocusManager*
focus_manager), but does not require it; it's more important to be consistent
with the surrounding code. So, you can leave the const as-is here to be
consistent.

[Yuki, 2014/04/23 03:53:40]

Thanks.

Just FYI, const T* and T* const have different effects while const T* and T
const* have the same effect.

const T* p = The value pointed to is const.  The pointer is not const, so ++p is
valid.

T* const p = The pointer is const, so ++p is invalid.  But the value pointed to
is not const, so *p = x is valid.

const T* const p = Both of the value pointed to and the pointer itself are
const.  Either of ++p or *p = x are invalid.

[msw, 2014/04/23 04:50:12]

Right, I'm aware of the significance, but I believe using only one const
qualifier to protect against mutation of the object is more prevalent. Here,
|const FocusManager* const p| is viable, but it's just not frequently done (at
least in my experience). |FocusManager* const| is only used twice (and only in
this file), whereas the other form occurs four times (in view and widget).

+  if (focus_manager)
+    focus_manager->OnTextInputClientChanged(this);
 }
 
 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