Change the way the ToplevelEventHandler is hooked up. It is now both a pre- and post-target event h…

ash/wm/toplevel_window_event_handler.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 "ash/wm/toplevel_window_event_handler.h"
 
 #include "ash/shell.h"
 #include "ash/wm/default_window_resizer.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/resize_shadow_controller.h"
 #include "ash/wm/window_resizer.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/snap_sizer.h"
 #include "base/message_loop.h"
 #include "base/run_loop.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/events/event.h"
+#include "ui/base/events/event_functions.h"
 #include "ui/base/gestures/gesture_recognizer.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/screen.h"
 
 namespace {
 const double kMinHorizVelocityForWindowSwipe = 1100;
 const double kMinVertVelocityForWindowMinimize = 1000;
@@ skipping 58 matching lines @@
 }
 
 
 // ToplevelWindowEventHandler --------------------------------------------------
 
 ToplevelWindowEventHandler::ToplevelWindowEventHandler(aura::Window* owner)
     : in_move_loop_(false),
       move_cancelled_(false) {
   aura::client::SetWindowMoveClient(owner, this);
   Shell::GetInstance()->display_controller()->AddObserver(this);
+  owner->AddPreTargetHandler(this);
+  owner->AddPostTargetHandler(this);
 }
 
 ToplevelWindowEventHandler::~ToplevelWindowEventHandler() {
   Shell::GetInstance()->display_controller()->RemoveObserver(this);
 }
 
 ui::EventResult ToplevelWindowEventHandler::OnKeyEvent(ui::KeyEvent* event) {
   if (window_resizer_.get() && event->type() == ui::ET_KEY_PRESSED &&
       event->key_code() == ui::VKEY_ESCAPE) {
     CompleteDrag(DRAG_REVERT, event->flags());
   }
   return ui::ER_UNHANDLED;
 }
 
 ui::EventResult ToplevelWindowEventHandler::OnMouseEvent(
     ui::MouseEvent* event) {
   if ((event->flags() &
       (ui::EF_MIDDLE_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON)) != 0)
     return ui::ER_UNHANDLED;
 
   aura::Window* target = static_cast<aura::Window*>(event->target());
   switch (event->type()) {
-    case ui::ET_MOUSE_PRESSED: {
-      // We also update the current window component here because for the
-      // mouse-drag-release-press case, where the mouse is released and
-      // pressed without mouse move event.
-      int component =
-          target->delegate()->GetNonClientComponent(event->location());
-      if ((event->flags() &
-           (ui::EF_IS_DOUBLE_CLICK | ui::EF_IS_TRIPLE_CLICK)) == 0 &&
-          WindowResizer::GetBoundsChangeForWindowComponent(component)) {
-        gfx::Point location_in_parent(
-            ConvertPointToParent(target, event->location()));
-        CreateScopedWindowResizer(target, location_in_parent, component);
-      } else {
-        window_resizer_.reset();
-      }
-      return WindowResizer::GetBoundsChangeForWindowComponent(component) != 0 ?
-          ui::ER_CONSUMED : ui::ER_UNHANDLED;
-    }
+    case ui::ET_MOUSE_PRESSED:
+      return HandleMousePressed(target, event);
     case ui::ET_MOUSE_DRAGGED:
       return HandleDrag(target, event) ? ui::ER_CONSUMED : ui::ER_UNHANDLED;
     case ui::ET_MOUSE_CAPTURE_CHANGED:
     case ui::ET_MOUSE_RELEASED:
-      CompleteDrag(event->type() == ui::ET_MOUSE_RELEASED ?
-                       DRAG_COMPLETE : DRAG_REVERT,
-                   event->flags());
-      if (in_move_loop_) {
-        quit_closure_.Run();
-        in_move_loop_ = false;
-      }
-      // Completing the drag may result in hiding the window. If this happens
-      // return true so no other handlers/observers see the event. Otherwise
-      // they see the event on a hidden window.
-      if (event->type() == ui::ET_MOUSE_CAPTURE_CHANGED &&
-          !target->IsVisible()) {
-        return ui::ER_CONSUMED;
-      }
-      break;
+      return HandleMouseReleased(target, event);
     case ui::ET_MOUSE_MOVED:
-      return HandleMouseMoved(target, event) ?
-          ui::ER_CONSUMED : ui::ER_UNHANDLED;
+      return HandleMouseMoved(target, event);
     case ui::ET_MOUSE_EXITED:
-      return HandleMouseExited(target, event) ?
-          ui::ER_CONSUMED : ui::ER_UNHANDLED;
+      return HandleMouseExited(target, event);
     default:
       break;
   }
   return ui::ER_UNHANDLED;
 }
 
 ui::EventResult ToplevelWindowEventHandler::OnScrollEvent(
     ui::ScrollEvent* event) {
   return ui::ER_UNHANDLED;
 }
@@ skipping 164 matching lines @@
                                               int event_flags) {
   scoped_ptr<ScopedWindowResizer> resizer(window_resizer_.release());
   if (resizer.get()) {
     if (status == DRAG_COMPLETE)
       resizer->resizer()->CompleteDrag(event_flags);
     else
       resizer->resizer()->RevertDrag();
   }
 }
 
-bool ToplevelWindowEventHandler::HandleDrag(aura::Window* target,
-                                            ui::LocatedEvent* event) {
+ui::EventResult ToplevelWindowEventHandler::HandleMousePressed(
+    aura::Window* target,
+    ui::MouseEvent* event) {
+

[sky, 2012/09/12 21:25:39]

nit: remove newline.

+  // Move/size operations are initiated post-target handling to give the target
+  // an opportunity to cancel this default behavior by returning ER_HANDLED.
+  if (ui::EventCanceledDefaultHandling(*event))
+    return ui::ER_UNHANDLED;
+
+  // We also update the current window component here because for the
+  // mouse-drag-release-press case, where the mouse is released and
+  // pressed without mouse move event.
+  int component =
+      target->delegate()->GetNonClientComponent(event->location());
+  if ((event->flags() &
+        (ui::EF_IS_DOUBLE_CLICK | ui::EF_IS_TRIPLE_CLICK)) == 0 &&
+      WindowResizer::GetBoundsChangeForWindowComponent(component)) {
+    gfx::Point location_in_parent(
+        ConvertPointToParent(target, event->location()));
+    CreateScopedWindowResizer(target, location_in_parent, component);
+  } else {
+    window_resizer_.reset();
+  }
+  return WindowResizer::GetBoundsChangeForWindowComponent(component) != 0 ?
+      ui::ER_CONSUMED : ui::ER_UNHANDLED;
+}
+
+ui::EventResult ToplevelWindowEventHandler::HandleMouseReleased(
+    aura::Window* target,
+    ui::MouseEvent* event) {
+  if (event->phase() != ui::EP_PRETARGET)
+    return ui::ER_UNHANDLED;
+
+  CompleteDrag(event->type() == ui::ET_MOUSE_RELEASED ?
+                    DRAG_COMPLETE : DRAG_REVERT,
+                event->flags());
+  if (in_move_loop_) {
+    quit_closure_.Run();
+    in_move_loop_ = false;
+  }
+  // Completing the drag may result in hiding the window. If this happens
+  // return true so no other handlers/observers see the event. Otherwise
+  // they see the event on a hidden window.
+  if (event->type() == ui::ET_MOUSE_CAPTURE_CHANGED &&
+      !target->IsVisible()) {
+    return ui::ER_CONSUMED;
+  }
+  return ui::ER_UNHANDLED;
+}
+
+ui::EventResult ToplevelWindowEventHandler::HandleDrag(
+    aura::Window* target,
+    ui::LocatedEvent* event) {
   // This function only be triggered to move window
   // by mouse drag or touch move event.
   DCHECK(event->type() == ui::ET_MOUSE_DRAGGED ||
          event->type() == ui::ET_TOUCH_MOVED ||
          event->type() == ui::ET_GESTURE_SCROLL_UPDATE);
 
+  // Drag actions are performed pre-target handling to prevent spurious mouse
+  // moves from the move/size operation from being sent to the target.
+  if (event->phase() != ui::EP_PRETARGET)
+    return ui::ER_UNHANDLED;
+
   if (!window_resizer_.get())
-    return false;
+    return ui::ER_UNHANDLED;
   window_resizer_->resizer()->Drag(
       ConvertPointToParent(target, event->location()), event->flags());
-  return true;
+  return ui::ER_CONSUMED;
 }
 
-bool ToplevelWindowEventHandler::HandleMouseMoved(aura::Window* target,
-                                                  ui::LocatedEvent* event) {
+ui::EventResult ToplevelWindowEventHandler::HandleMouseMoved(
+    aura::Window* target,
+    ui::LocatedEvent* event) {
+  // Shadow effects are applied after target handling. Note that we don't
+  // respect ER_HANDLED here right now since we have not had a reason to allow
+  // the target to cancel shadow rendering.
+  if (event->phase() != ui::EP_POSTTARGET)
+    return ui::ER_UNHANDLED;
+
   // TODO(jamescook): Move the resize cursor update code into here from
   // CompoundEventFilter?
   internal::ResizeShadowController* controller =
       Shell::GetInstance()->resize_shadow_controller();
   if (controller) {
     if (event->flags() & ui::EF_IS_NON_CLIENT) {
       int component =
           target->delegate()->GetNonClientComponent(event->location());
         controller->ShowShadow(target, component);
     } else {
       controller->HideShadow(target);
     }
   }
-  return false;
+  return ui::ER_UNHANDLED;
 }
 
-bool ToplevelWindowEventHandler::HandleMouseExited(aura::Window* target,
-                                                   ui::LocatedEvent* event) {
+ui::EventResult ToplevelWindowEventHandler::HandleMouseExited(
+    aura::Window* target,
+    ui::LocatedEvent* event) {
+  // Shadow effects are applied after target handling. Note that we don't
+  // respect ER_HANDLED here right now since we have not had a reason to allow
+  // the target to cancel shadow rendering.
+  if (event->phase() != ui::EP_POSTTARGET)
+    return ui::ER_UNHANDLED;
+
   internal::ResizeShadowController* controller =
       Shell::GetInstance()->resize_shadow_controller();
   if (controller)
     controller->HideShadow(target);
-  return false;
+  return ui::ER_UNHANDLED;
 }
 
 void ToplevelWindowEventHandler::ResizerWindowDestroyed() {
   // We explicitly don't invoke RevertDrag() since that may do things to window.
   // Instead we destroy the resizer.
   window_resizer_.reset();
 
   // End the move loop. This does nothing if we're not in a move loop.
   EndMoveLoop();
 }
 
 }  // namespace ash