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

ui/aura/env_input_state_controller.cc

 // Copyright 2016 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/env_input_state_controller.h"
 
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/events/event.h"
 #include "ui/gfx/geometry/point.h"
 
 namespace aura {
 
 void EnvInputStateController::UpdateStateForMouseEvent(
     const Window* window,
     const ui::MouseEvent& event) {
   switch (event.type()) {
     case ui::ET_MOUSE_PRESSED:
       Env::GetInstance()->set_mouse_button_flags(event.button_flags());
       break;
     case ui::ET_MOUSE_RELEASED:
       Env::GetInstance()->set_mouse_button_flags(
           event.button_flags() & ~event.changed_button_flags());
       break;
     default:
       break;
   }
 
-  if (event.type() != ui::ET_MOUSE_CAPTURE_CHANGED &&
+  // If |window| is null, we are only using |event| to update event states, so
+  // we shouldn't update mouse location.

[sadrul, 2017/05/01 15:27:55]

Can you move this into SetLastMouseLocation() instead?

[riajiang, 2017/05/01 16:19:59]

Done.

+  if (window && event.type() != ui::ET_MOUSE_CAPTURE_CHANGED &&
       !(event.flags() & ui::EF_IS_SYNTHESIZED)) {
     SetLastMouseLocation(window, event.root_location());
   }
 }
 
 void EnvInputStateController::UpdateStateForTouchEvent(
     const ui::TouchEvent& event) {
   switch (event.type()) {
     case ui::ET_TOUCH_PRESSED:
       touch_ids_down_ |= (1 << event.pointer_details().id);
@@ skipping 16 matching lines @@
 
     default:
       NOTREACHED();
       break;
   }
 }
 
 void EnvInputStateController::SetLastMouseLocation(
     const Window* root_window,
     const gfx::Point& location_in_root) const {
   client::ScreenPositionClient* client =

[sadrul, 2017/05/01 15:27:55]

Early return here if window is nullptr (but only for MUS).

[riajiang, 2017/05/01 16:19:59]

Done.

       client::GetScreenPositionClient(root_window);
   if (client) {
     gfx::Point location_in_screen = location_in_root;
     client->ConvertPointToScreen(root_window, &location_in_screen);
     Env::GetInstance()->set_last_mouse_location(location_in_screen);
   } else {
     Env::GetInstance()->set_last_mouse_location(location_in_root);
   }
 }
 
 }  // namespace aura