Index: ui/aura/env_input_state_controller.cc |
diff --git a/ui/aura/env_input_state_controller.cc b/ui/aura/env_input_state_controller.cc |
index 7267f9f730fb16acf3731785463188ac560b774c..d856b496821d72741ab4553e25e6baa16dd46b26 100644 |
--- a/ui/aura/env_input_state_controller.cc |
+++ b/ui/aura/env_input_state_controller.cc |
@@ -26,7 +26,9 @@ void EnvInputStateController::UpdateStateForMouseEvent( |
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. |
+ if (window && event.type() != ui::ET_MOUSE_CAPTURE_CHANGED && |
!(event.flags() & ui::EF_IS_SYNTHESIZED)) { |
SetLastMouseLocation(window, event.root_location()); |
} |