Allow javascript change the virtual keyboard window size and position freely in FLOATING mode

ui/keyboard/keyboard_layout_manager.cc

Index: ui/keyboard/keyboard_layout_manager.cc
diff --git a/ui/keyboard/keyboard_layout_manager.cc b/ui/keyboard/keyboard_layout_manager.cc
index c54f78ceeefebd14b5c6f780d55b4c1903122bb2..6eee390dabf8734f7682f3839cb272cebf239809 100644
--- a/ui/keyboard/keyboard_layout_manager.cc
+++ b/ui/keyboard/keyboard_layout_manager.cc
@@ -14,52 +14,74 @@ namespace keyboard {
 // Overridden from aura::LayoutManager
 void KeyboardLayoutManager::OnWindowResized() {
   if (keyboard_) {
-    gfx::Rect window_bounds = controller_->GetContainerWindow()->bounds();
-    // Keep the same height when window resize. It usually get called when
-    // screen rotate.
-    int height = keyboard_->bounds().height();
-    keyboard_->SetBounds(gfx::Rect(
-        window_bounds.x(),
-        window_bounds.bottom() - height,
-        window_bounds.width(),
-        height));
+    // Container window is the top level window of the virtual keyboard window.
+    // To support window.moveTo for the virtual keyboard window, as it actually
+    // moves the top level window, the container window should be set to the
+    // desired bounds before changing the bounds of the virtual keyboard window.
+    gfx::Rect container_bounds = controller_->GetContainerWindow()->bounds();
+    // Always align container window and keyboard window.
+    SetChildBoundsDirect(keyboard_, gfx::Rect(container_bounds.size()));
   }
 }
 
 void KeyboardLayoutManager::OnWindowAddedToLayout(aura::Window* child) {
   DCHECK(!keyboard_);
   keyboard_ = child;
-  keyboard_->SetBounds(DefaultKeyboardBoundsFromWindowBounds(
-      controller_->GetContainerWindow()->bounds()));
+  if (controller_->keyboard_mode() == FULL_WIDTH) {
+    controller_->GetContainerWindow()->SetBounds(gfx::Rect());
+  } else if (controller_->keyboard_mode() == FLOATING) {
+    controller_->GetContainerWindow()->SetBounds(child->bounds());
+    SetChildBoundsDirect(keyboard_, gfx::Rect(child->bounds().size()));
+  }
 }
 
 void KeyboardLayoutManager::SetChildBounds(aura::Window* child,
                                            const gfx::Rect& requested_bounds) {
-  // SetChildBounds can be invoked by resizing from the container or by
-  // resizing from the contents (through window.resizeTo call in JS).
-  // The flag resizing_from_contents() is used to determine the source of the
-  // resize.
   DCHECK(child == keyboard_);
 
+  // Request to change the bounds of child window (AKA the virtual keyboard
+  // window) should change the container window first. Then the child window is
+  // resized and covers the container window. Note the child's bound is only set
+  // in OnWindowResized.
+  gfx::Rect old_bounds = controller_->GetContainerWindow()->bounds();
+  gfx::Rect new_bounds = requested_bounds;
+  if (controller_->keyboard_mode() == FULL_WIDTH) {
+    const gfx::Rect& window_bounds =
+        controller_->GetContainerWindow()->GetRootWindow()->bounds();
+    new_bounds.set_y(window_bounds.height() - new_bounds.height());
+    new_bounds.set_width(window_bounds.width());
+  }
+  // Keyboard bounds should only be reset when it actually changes. Otherwise
+  // it interrupts the initial animation of showing the keyboard. Described in
+  // crbug.com/356753.
+  if (new_bounds == old_bounds) {
+    return;
+  }
+
   ui::LayerAnimator* animator =
       controller_->GetContainerWindow()->layer()->GetAnimator();
   // Stops previous animation if a window resize is requested during animation.
   if (animator->is_animating())
     animator->StopAnimating();
 
-  gfx::Rect old_bounds = child->bounds();
-  SetChildBoundsDirect(child, requested_bounds);
-  if (old_bounds.height() == 0 && child->bounds().height() != 0 &&
-      controller_->show_on_resize()) {
-    // The window height is set to 0 initially or before switch to an IME in a
-    // different extension. Virtual keyboard window may wait for this bounds
-    // change to correctly animate in.
-    controller_->ShowKeyboard(false);
-  } else {
-    // We need to send out this notification only if keyboard is visible since
-    // keyboard window is resized even if keyboard is hidden.
-    if (controller_->keyboard_visible())
-      controller_->NotifyKeyboardBoundsChanging(requested_bounds);
+  controller_->GetContainerWindow()->SetBounds(new_bounds);
+  SetChildBoundsDirect(keyboard_, gfx::Rect(new_bounds.size()));
+
+  if (controller_->keyboard_mode() == FULL_WIDTH) {
+    if (old_bounds.height() == 0 && child->bounds().height() != 0 &&
+        controller_->show_on_resize()) {
+      // The window height is set to 0 initially or before switch to an IME in a
+      // different extension. Virtual keyboard window may wait for this bounds
+      // change to correctly animate in.
+      controller_->ShowKeyboard(false);
+    } else {
+      // We need to send out this notification only if keyboard is visible since
+      // keyboard window is resized even if keyboard is hidden.
+      if (controller_->keyboard_visible())
+        controller_->NotifyKeyboardBoundsChanging(requested_bounds);
+    }
+  } else if (controller_->keyboard_mode() == FLOATING) {
+    controller_->NotifyKeyboardBoundsChanging(gfx::Rect());
   }
 }