Update event states in Env when target window has been destroyed.

ui/aura/mus/window_tree_client.cc

 // Copyright 2014 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/aura/mus/window_tree_client.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 11 matching lines @@
 #include "services/ui/common/accelerator_util.h"
 #include "services/ui/public/cpp/gpu/gpu.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/interfaces/constants.mojom.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "services/ui/public/interfaces/window_manager_window_tree_factory.mojom.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/client/transient_window_client.h"
 #include "ui/aura/env.h"
+#include "ui/aura/env_input_state_controller.h"
 #include "ui/aura/mus/capture_synchronizer.h"
 #include "ui/aura/mus/drag_drop_controller_mus.h"
 #include "ui/aura/mus/focus_synchronizer.h"
 #include "ui/aura/mus/in_flight_change.h"
 #include "ui/aura/mus/input_method_mus.h"
 #include "ui/aura/mus/mus_context_factory.h"
 #include "ui/aura/mus/property_converter.h"
 #include "ui/aura/mus/property_utils.h"
 #include "ui/aura/mus/window_manager_delegate.h"
 #include "ui/aura/mus/window_mus.h"
 #include "ui/aura/mus/window_port_mus.h"
 #include "ui/aura/mus/window_tree_client_delegate.h"
 #include "ui/aura/mus/window_tree_client_observer.h"
 #include "ui/aura/mus/window_tree_client_test_observer.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
+#include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/base/layout.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/size.h"
 
 #if defined(HiWord)
@@ skipping 1146 matching lines @@
                                           int64_t display_id,
                                           std::unique_ptr<ui::Event> event,
                                           bool matches_pointer_watcher) {
   DCHECK(event);
 
   WindowMus* window = GetWindowByServerId(window_id);  // May be null.
 
   if (event->IsKeyEvent()) {
     DCHECK(!matches_pointer_watcher);  // PointerWatcher isn't for key events.
     if (!window || !window->GetWindow()->GetHost()) {
-      tree_->OnWindowInputEventAck(event_id, ui::mojom::EventResult::UNHANDLED);
+      // Drop the |event| and not necessary to update event states as it's a
+      // key event.
+      tree_->OnWindowInputEventAck(event_id, ui::mojom::EventResult::HANDLED);

[sadrul, 2017/03/31 05:10:51]

I actually think this should be UNHANDLED. (because otherwise, if there are some
post-target accelerators, those will not be triggered).

[riajiang, 2017/03/31 21:24:03]

Right! Done.

       return;
     }
     InputMethodMus* input_method = GetWindowTreeHostMus(window)->input_method();
     input_method->DispatchKeyEvent(event->AsKeyEvent(),
                                    CreateEventResultCallback(event_id));
     return;
   }
 
   if (matches_pointer_watcher && has_pointer_watcher_) {
     DCHECK(event->IsPointerEvent());
     std::unique_ptr<ui::Event> event_in_dip(ui::Event::Clone(*event));
     ConvertEventLocationToDip(display_id, event_in_dip->AsLocatedEvent());
     delegate_->OnPointerEventObserved(*event_in_dip->AsPointerEvent(),
                                       window ? window->GetWindow() : nullptr);
   }
 
-  // TODO: use |display_id| to find host and send there.
+  // If the window has already been deleted, use |event| to update event states
+  // kept in aura::Env and drop the |event|. Any WindowTreeHost should be okay
+  // to get aura::EnvInputStateController from since these are global states.
   if (!window || !window->GetWindow()->GetHost()) {
-    tree_->OnWindowInputEventAck(event_id, ui::mojom::EventResult::UNHANDLED);
+    DCHECK(!roots_.empty());
+    EnvInputStateController* env_controller =
+        GetWindowTreeHostMus(*roots_.begin())->dispatcher()->env_controller();
+    if (event->IsMousePointerEvent()) {
+      if (event->type() == ui::ET_POINTER_WHEEL_CHANGED) {
+        ui::MouseWheelEvent mapped_event(*event->AsPointerEvent());
+        env_controller->UpdateStateForMouseEvent(nullptr, mapped_event);
+      } else {
+        ui::MouseEvent mapped_event(*event->AsPointerEvent());
+        env_controller->UpdateStateForMouseEvent(nullptr, mapped_event);
+      }
+    } else if (event->IsMouseEvent()) {
+      env_controller->UpdateStateForMouseEvent(nullptr, *event->AsMouseEvent());
+    } else if (event->IsTouchPointerEvent()) {
+      ui::TouchEvent mapped_event(*event->AsPointerEvent());
+      env_controller->UpdateStateForTouchEvent(mapped_event);
+    } else if (event->IsTouchEvent()) {
+      env_controller->UpdateStateForTouchEvent(*event->AsTouchEvent());
+    }

[sadrul, 2017/03/31 05:10:51]

Two comments:
. We should not receive MouseEvent or TouchEvent from the window server, right?
So you shouldn't need those two cases.

. Let's move this code into
EnvInputStateController::UpdateStateForPointerEvent(), and do the necessary work
in there.

[riajiang, 2017/03/31 21:24:03]

As discussed offline, going to use the MapEvent helper function from CL
https://codereview.chromium.org/2792573003.

+    tree_->OnWindowInputEventAck(event_id, ui::mojom::EventResult::HANDLED);

[sadrul, 2017/03/31 05:10:51]

UNHANDLED.

[riajiang, 2017/03/31 21:24:03]

Done.

     return;
   }
 
   EventAckHandler ack_handler(CreateEventResultCallback(event_id));
   // TODO(moshayedi): crbug.com/617222. No need to convert to ui::MouseEvent or
   // ui::TouchEvent once we have proper support for pointer events.
   if (event->IsMousePointerEvent()) {
     if (event->type() == ui::ET_POINTER_WHEEL_CHANGED) {
       ui::MouseWheelEvent mapped_event(*event->AsPointerEvent());
       DispatchEventToTarget(&mapped_event, window);
@@ skipping 703 matching lines @@
   return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>(
       this, capture_synchronizer_.get(), window));
 }
 
 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) {
   return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>(
       this, focus_synchronizer_.get(), window));
 }
 
 }  // namespace aura