New accessibility virtual keyboard behavior in non-sticky mode.

content/browser/renderer_host/render_widget_host_view_aura.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_view_aura.h"
 
 #include <set>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 55 matching lines @@
 #include "ui/aura/client/transient_window_client.h"
 #include "ui/aura/client/window_parenting_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ime/input_method.h"
+#include "ui/base/ui_base_switches.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/compositor_vsync_manager.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/events/blink/blink_event_util.h"
 #include "ui/events/blink/web_input_event.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
@@ skipping 1185 matching lines @@
 
 gfx::Rect RenderWidgetHostViewAura::ConvertRectFromScreen(
     const gfx::Rect& rect) const {
   gfx::Point origin = rect.origin();
   gfx::Point end = gfx::Point(rect.right(), rect.bottom());
 
   aura::Window* root_window = window_->GetRootWindow();
   if (root_window) {
     aura::client::ScreenPositionClient* screen_position_client =
         aura::client::GetScreenPositionClient(root_window);
-    screen_position_client->ConvertPointFromScreen(window_, &origin);
-    screen_position_client->ConvertPointFromScreen(window_, &end);
-    return gfx::Rect(origin.x(),
-                     origin.y(),
-                     end.x() - origin.x(),
-                     end.y() - origin.y());
+    if (screen_position_client) {
+      screen_position_client->ConvertPointFromScreen(window_, &origin);
+      screen_position_client->ConvertPointFromScreen(window_, &end);
+      return gfx::Rect(origin.x(),
+                       origin.y(),
+                       end.x() - origin.x(),
+                       end.y() - origin.y());
+    }
   }
 
   return rect;
 }
 
 gfx::Rect RenderWidgetHostViewAura::GetCaretBounds() const {
   if (!text_input_manager_ || !text_input_manager_->GetActiveWidget())
     return gfx::Rect();
 
   const TextInputManager::SelectionRegion* region =
@@ skipping 125 matching lines @@
   RenderFrameHostImpl* rfh = GetFocusedFrame();
   if (rfh)
     rfh->ExtendSelectionAndDelete(before, after);
 }
 
 void RenderWidgetHostViewAura::EnsureCaretNotInRect(const gfx::Rect& rect) {
   gfx::Rect rect_in_local_space = ConvertRectFromScreen(rect);
   gfx::Rect hiding_area_in_this_window =
       gfx::IntersectRects(rect_in_local_space, window_->bounds());
 
-  if (hiding_area_in_this_window.IsEmpty())
+  if (hiding_area_in_this_window.IsEmpty()) {
+    OnClientFocusLost();

[oshima, 2016/12/13 18:15:07]

Can this be called when VK size changed for some reason? If so, you need to
compute based on the original window bounds for cros.

[yhanada, 2017/01/12 02:19:56]

Yes. Changed to use the original window bounds if exists.

+    return;
+  }
+
+  const gfx::Rect visible_area_in_this_window(
+      gfx::SubtractRects(window_->bounds(), hiding_area_in_this_window));
+
+#if defined(OS_CHROMEOS)
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+          ::switches::kUseNewVirtualKeyboardBehavior))
     return;
 
-  host_->ScrollFocusedEditableNodeIntoRect(
-      gfx::SubtractRects(window_->bounds(), hiding_area_in_this_window));
+  aura::Window* top_level_window = window_->GetToplevelWindow();
+  // Calculate vertical window shift.
+  const gfx::Rect window_bounds = top_level_window->GetBoundsInRootWindow();
+  const int vertical_displacement =
+      std::max(0, top_level_window->GetBoundsInScreen().bottom() -
+                      visible_area_in_this_window.bottom());
+  const int shift = std::min(vertical_displacement, window_bounds.y());
+
+  // Set restore bounds and move window.
+  if (shift > 0) {
+    const gfx::Point origin(window_bounds.x(), window_bounds.y() - shift);
+    top_level_window->SetProperty(
+        aura::client::kVirtualKeyboardRestoreBoundsKey,
+        new gfx::Rect(window_bounds));
+    top_level_window->SetBounds(gfx::Rect(origin, window_bounds.size()));
+  }

[oshima, 2016/12/13 18:15:07]

This moving/restoring logic should be almost same for TextField and contents.
Can you define a utility functions/class in ui/chromeos/ime and use it here?

[yhanada, 2017/01/12 02:19:56]

ui/chromeos/ime depends on ui/views, so this logic can't be in ui/chromeos/ime.
How about ui/base/ime? Can I create a utility function in ui/base/ime?

[oshima, 2017/01/18 02:37:19]

ui/base shouldn't depend on aura. How about ui/wm/ime? Please consult with sky@
as well.

[yhanada, 2017/01/30 13:02:47]

I understand.

sky@: I intend to create a utility function under ui/wm/ime or ui/wm/core/ime.
What do you think?

+#endif  // defined(OS_CHROMEOS)
+
+  // Perform overscroll.
+  host_->ScrollFocusedEditableNodeIntoRect(visible_area_in_this_window);
+}
+
+void RenderWidgetHostViewAura::OnClientFocusLost() {
+#if defined(OS_CHROMEOS)
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+          ::switches::kUseNewVirtualKeyboardBehavior))
+    return;
+
+  // Get restore bounds of window.
+  aura::Window* top_level_window = window_->GetToplevelWindow();
+  gfx::Rect* vk_restore_bounds = top_level_window->GetProperty(
+      aura::client::kVirtualKeyboardRestoreBoundsKey);
+
+  if (vk_restore_bounds) {
+    // Restore window.
+    top_level_window->SetBounds(*vk_restore_bounds);
+    top_level_window->ClearProperty(
+        aura::client::kVirtualKeyboardRestoreBoundsKey);

[oshima, 2016/12/13 18:15:07]

a user might have moved a window, and in that case, we may want to just leave
it. Can you add TODO and discuss with Tom?

[yhanada, 2017/01/12 02:19:56]

Done.

+  }
+#endif  // defined(OS_CHROMEOS)
 }
 
 bool RenderWidgetHostViewAura::IsTextEditCommandEnabled(
     ui::TextEditCommand command) const {
   return false;
 }
 
 void RenderWidgetHostViewAura::SetTextEditCommandForNextKeyEvent(
     ui::TextEditCommand command) {}
 
@@ skipping 942 matching lines @@
 
 void RenderWidgetHostViewAura::SetPopupChild(
     RenderWidgetHostViewAura* popup_child_host_view) {
   popup_child_host_view_ = popup_child_host_view;
   event_handler_->SetPopupChild(
       popup_child_host_view,
       popup_child_host_view ? popup_child_host_view->event_handler() : nullptr);
 }
 
 }  // namespace content