Fix virtual keyboard overscroll on Athena

ui/keyboard/keyboard_controller.cc

 // Copyright (c) 2013 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/keyboard/keyboard_controller.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 127 matching lines @@
     command.AppendArg("1");
   else
     command.AppendArg("0");
   VLOG(1) << "Running " << command.GetCommandLineString();
   base::LaunchOptions options;
   options.wait = true;
   base::LaunchProcess(command, options, NULL);
 #endif
 }
 
-aura::Window *GetFrameWindow(aura::Window *window) {
-  // Each container window has a non-negative id.  Stop traversing at the child
-  // of a container window.
-  if (!window)
-    return NULL;
-  while (window->parent() && window->parent()->id() < 0) {
-    window = window->parent();
-  }
-  return window;
-}
-
 }  // namespace
 
 namespace keyboard {
 
 // Observer for both keyboard show and hide animations. It should be owned by
 // KeyboardController.
 class CallbackAnimationObserver : public ui::LayerAnimationObserver {
  public:
   CallbackAnimationObserver(ui::LayerAnimator* animator,
                             base::Callback<void(void)> callback);
@@ skipping 28 matching lines @@
   callback_.Run();
 }
 
 void CallbackAnimationObserver::OnLayerAnimationAborted(
     ui::LayerAnimationSequence* seq) {
   animator_->RemoveObserver(this);
 }
 
 class WindowBoundsChangeObserver : public aura::WindowObserver {
  public:
+  explicit WindowBoundsChangeObserver(aura::Window* window);
+  ~WindowBoundsChangeObserver() override;
+
   void OnWindowBoundsChanged(aura::Window* window,
                              const gfx::Rect& old_bounds,
                              const gfx::Rect& new_bounds) override;
   void OnWindowDestroyed(aura::Window* window) override;
 
-  void AddObservedWindow(aura::Window* window);
-  void RemoveAllObservedWindows();
+ private:
+  aura::Window* window_;
 
- private:
-  std::set<aura::Window*> observed_windows_;
+  DISALLOW_COPY_AND_ASSIGN(WindowBoundsChangeObserver);
 };
 
+WindowBoundsChangeObserver::WindowBoundsChangeObserver(aura::Window* window)
+    : window_(window) {
+  window_->AddObserver(this);
+}
+
+WindowBoundsChangeObserver::~WindowBoundsChangeObserver() {
+  if (window_)
+    window_->RemoveObserver(this);
+}
+
 void WindowBoundsChangeObserver::OnWindowBoundsChanged(aura::Window* window,
     const gfx::Rect& old_bounds, const gfx::Rect& new_bounds) {
   KeyboardController* controller =  KeyboardController::GetInstance();
   if (controller)
     controller->UpdateWindowInsets(window);
 }
 
 void WindowBoundsChangeObserver::OnWindowDestroyed(aura::Window* window) {
-  if (window->HasObserver(this))
-    window->RemoveObserver(this);
-  observed_windows_.erase(window);
-}
-
-void WindowBoundsChangeObserver::AddObservedWindow(aura::Window* window) {
-  if (!window->HasObserver(this)) {
-    window->AddObserver(this);
-    observed_windows_.insert(window);
-  }
-}
-
-void WindowBoundsChangeObserver::RemoveAllObservedWindows() {
-  for (std::set<aura::Window*>::iterator it = observed_windows_.begin();
-       it != observed_windows_.end(); ++it)
-    (*it)->RemoveObserver(this);
-  observed_windows_.clear();
+  window_ = nullptr;
 }
 
 // static
 KeyboardController* KeyboardController::instance_ = NULL;
 
 KeyboardController::KeyboardController(KeyboardControllerProxy* proxy)
     : proxy_(proxy),
       input_method_(NULL),
       keyboard_visible_(false),
       show_on_resize_(false),
       lock_keyboard_(false),
       type_(ui::TEXT_INPUT_TYPE_NONE),
       weak_factory_(this) {
   CHECK(proxy);
   input_method_ = proxy_->GetInputMethod();
   input_method_->AddObserver(this);
-  window_bounds_observer_.reset(new WindowBoundsChangeObserver());
 }
 
 KeyboardController::~KeyboardController() {
   if (container_)
     container_->RemoveObserver(this);
   if (input_method_)
     input_method_->RemoveObserver(this);
   ResetWindowInsets();
 }
 
@@ skipping 31 matching lines @@
     FOR_EACH_OBSERVER(KeyboardControllerObserver,
                       observer_list_,
                       OnKeyboardBoundsChanging(new_bounds));
     if (keyboard::IsKeyboardOverscrollEnabled()) {
       // Adjust the height of the viewport for visible windows on the primary
       // display.
       // TODO(kevers): Add EnvObserver to properly initialize insets if a
       // window is created while the keyboard is visible.
       scoped_ptr<content::RenderWidgetHostIterator> widgets(
           content::RenderWidgetHost::GetRenderWidgetHosts());
-      aura::Window *keyboard_window = proxy_->GetKeyboardWindow();
-      aura::Window *root_window = keyboard_window->GetRootWindow();
+      aura::Window* keyboard_window = proxy_->GetKeyboardWindow();
+      aura::Window* root_window = keyboard_window->GetRootWindow();
       while (content::RenderWidgetHost* widget = widgets->GetNextHost()) {
         content::RenderWidgetHostView* view = widget->GetView();
         // Can be NULL, e.g. if the RenderWidget is being destroyed or
         // the render process crashed.
         if (view) {
           aura::Window *window = view->GetNativeView();
           // If virtual keyboard failed to load, a widget that displays error
-          // message will be created and adds as a child of the virtual keyboard
-          // window. We want to avoid add BoundsChangedObserver to that window.
-          if (GetFrameWindow(window) != keyboard_window &&
+          // message will be created and added as a child of the virtual
+          // keyboard window.

[pkotwicz, 2014/11/12 06:01:14]

Kevin do you have any suggestions for comments here?

+          if (!keyboard_window->Contains(window) &&
               window->GetRootWindow() == root_window) {
             gfx::Rect window_bounds = window->GetBoundsInScreen();
             gfx::Rect intersect = gfx::IntersectRects(window_bounds,
                                                       new_bounds);
             int overlap = intersect.height();
             if (overlap > 0 && overlap < window_bounds.height())
               view->SetInsets(gfx::Insets(0, 0, overlap, 0));
             else
               view->SetInsets(gfx::Insets());
-            AddBoundsChangedObserver(window);
           }
         }
       }
+      root_window_bounds_observer_.reset(
+          new WindowBoundsChangeObserver(root_window));
     } else {
       ResetWindowInsets();
     }
   } else {
     current_keyboard_bounds_ = gfx::Rect();
   }
 }
 
 void KeyboardController::HideKeyboard(HideReason reason) {
   keyboard_visible_ = false;
@@ skipping 203 matching lines @@
 
 void KeyboardController::ResetWindowInsets() {
   const gfx::Insets insets;
   scoped_ptr<content::RenderWidgetHostIterator> widgets(
       content::RenderWidgetHost::GetRenderWidgetHosts());
   while (content::RenderWidgetHost* widget = widgets->GetNextHost()) {
     content::RenderWidgetHostView* view = widget->GetView();
     if (view)
       view->SetInsets(insets);
   }
-  window_bounds_observer_->RemoveAllObservedWindows();
+  root_window_bounds_observer_.reset();
 }
 
 bool KeyboardController::WillHideKeyboard() const {
   return weak_factory_.HasWeakPtrs();
 }
 
 void KeyboardController::ShowAnimationFinished() {
   // Notify observers after animation finished to prevent reveal desktop
   // background during animation.
   NotifyKeyboardBoundsChanging(proxy_->GetKeyboardWindow()->bounds());
   proxy_->EnsureCaretInWorkArea();
 }
 
 void KeyboardController::HideAnimationFinished() {
   proxy_->HideKeyboardContainer(container_.get());
 }
 
-void KeyboardController::AddBoundsChangedObserver(aura::Window* window) {
-  aura::Window* target_window = GetFrameWindow(window);
-  if (target_window)
-    window_bounds_observer_->AddObservedWindow(target_window);
-}
-
 }  // namespace keyboard