Fix virtual keyboard on aura

chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.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 "chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h"
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/views/dom_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/site_instance.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/gfx/compositor/layer.h"
-#include "ui/gfx/interpolated_transform.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/ime/text_input_type_tracker.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/virtual_keyboard_selector.h"
 #endif
 
 #if defined(USE_AURA)
@@ skipping 53 matching lines @@
   void Hide() OVERRIDE;
 
  private:
   // Sets the target widget, adds/removes Widget::Observer, reparents etc.
   void SetTarget(Widget* target);
 
   // Returns the widget of the active browser, or NULL if there is no such
   // widget.
   views::Widget* GetBrowserWidget();
 
-  // Update layer opacity and transform with values in animation_.
+  // Update layer opacity and bounds with values in animation_.
   void UpdateForAnimation();
 
   // Overridden from views::Widget.
   virtual bool OnKeyEvent(const views::KeyEvent& event) OVERRIDE;
 
   // Overridden from ui::AnimationDelegate.
   virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
   virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
 
   // Overridden from content::WebContentsObserver.
@@ skipping 28 matching lines @@
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Overridden from views::Widget::Observer.
   virtual void OnWidgetClosing(Widget* widget) OVERRIDE;
   virtual void OnWidgetVisibilityChanged(Widget* widget, bool visible) OVERRIDE;
   virtual void OnWidgetActivationChanged(Widget* widget, bool active) OVERRIDE;
 
   // The animation.
   scoped_ptr<ui::SlideAnimation> animation_;
 
-  // Interpolated transform used during animation.
-  scoped_ptr<ui::InterpolatedTransform> transform_;
-
   GURL keyboard_url_;
 
   // The DOM view to host the keyboard.
   DOMView* dom_view_;
 
   ExtensionFunctionDispatcher extension_dispatcher_;
 
   // The widget the events from the keyboard should be directed to.
   views::Widget* target_;
 
@@ skipping 57 matching lines @@
                  content::NOTIFICATION_APP_TERMINATING,
                  content::NotificationService::AllSources());
 
 #if defined(OS_CHROMEOS)
   chromeos::input_method::InputMethodManager* manager =
       chromeos::input_method::InputMethodManager::GetInstance();
   manager->AddVirtualKeyboardObserver(this);
 #endif
 
 #if defined(USE_AURA)
-  aura::RootWindow::GetInstance()->AddObserver(this);
+  aura::RootWindow::GetInstance()->AddRootWindowObserver(this);
 #endif
 }
 
 KeyboardWidget::~KeyboardWidget() {
   if (target_)
     target_->RemoveObserver(this);
   views::TextInputTypeTracker::GetInstance()->RemoveTextInputTypeObserver(this);
 #if defined(OS_CHROMEOS)
   chromeos::input_method::InputMethodManager* manager =
       chromeos::input_method::InputMethodManager::GetInstance();
   manager->RemoveVirtualKeyboardObserver(this);
 #endif
 
 #if defined(USE_AURA)
-  aura::RootWindow::GetInstance()->RemoveObserver(this);
+  aura::RootWindow::GetInstance()->RemoveRootWindowObserver(this);
 #endif
   // TODO(sad): Do anything else?
 }
 
 void KeyboardWidget::ShowKeyboardForWidget(views::Widget* widget) {
   if (target_ == widget && IsVisible() && !animation_->is_animating())
     return;
   SetTarget(widget);
 
-  transform_.reset(new ui::InterpolatedTranslation(
-      gfx::Point(0, keyboard_height_), gfx::Point()));
-
   UpdateForAnimation();
   animation_->Show();
 
   Show();
 
   bool visible = true;
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_KEYBOARD_VISIBILITY_CHANGED,
       content::Source<KeyboardWidget>(this),
       content::Details<bool>(&visible));
@@ skipping 36 matching lines @@
     return NULL;
   return view->GetWidget();
 }
 
 bool KeyboardWidget::OnKeyEvent(const views::KeyEvent& event) {
   return target_ ? target_->OnKeyEvent(event) : false;
 }
 
 void KeyboardWidget::UpdateForAnimation() {
   float t = static_cast<float>(animation_->GetCurrentValue());
-  GetRootView()->SetTransform(transform_->Interpolate(t));
+  gfx::Rect bounds = GetKeyboardPosition(keyboard_height_);
+  bounds.Offset(0, keyboard_height_*(1 - t));
+  SetBounds(bounds);

[hashimoto, 2012/01/23 10:21:53]

Replace SetTransform with SetBounds because virtual keyboard cannot be shown
correctly with SetTransform on desktop build.

[sadrul, 2012/01/23 22:47:57]

I think this is a wrong thing to do. Changing the bounds will cause the keyboard
contents to relayout. Doing this for every animation step is going to be very
expensive, and will almost undoubtedly result in a very janky animation.

What is the reason SetTransform does not work in a desktop build?

[hashimoto, 2012/01/24 11:23:05]

Unless |keyboard_height_| is changed, the size of KeyboardWidget does not
change.
Simply moving a widget without changing its size looks not costing much and it
actually works smoothly on my Alex.
I have no idea why the current code does not work but there are some known
limitations when using DomView, so I'm not surprised to see a code which worked
fine with RenderWidgetHostViewViews not working fine with
RenderWidgetHostViewAura.
(
http://code.google.com/codesearch#OAMlx_jo-ck/src/chrome/browser/chromeos/log...
  URL above is a good example of a limitation of DomView, they have to create an
additional Widget to avoid a DomView's bug where adding a child to DomView will
break the displayed content.)

Adding to that, since this code is the only place where SetTransform is used
inside chrome directory (see the result of
http://cs.chromium.org/settransform%20file:^src/chrome), I think SetBounds is a
safer choice than SetTransform.

   if (GetRootView()->layer())
     GetRootView()->layer()->SetOpacity(t * t);
 }
 
 void KeyboardWidget::AnimationProgressed(const ui::Animation* animation) {
   UpdateForAnimation();
 }
 
 void KeyboardWidget::AnimationEnded(const ui::Animation* animation) {
   gfx::Rect keyboard_rect;
@@ skipping 207 matching lines @@
 
 void VirtualKeyboardManager::OnWidgetClosing(views::Widget* widget) {
   DCHECK_EQ(keyboard_, widget);
   keyboard_ = NULL;
 }
 
 // static
 VirtualKeyboardManager* VirtualKeyboardManager::GetInstance() {
   return Singleton<VirtualKeyboardManager>::get();
 }