Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_view_aura.cc |
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc |
| index fd50cf54b0e64c354ee490b338f5a2f6b720747a..93221787e5cba822190eb4bd5edc26ac8ac2ff14 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc |
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc |
| @@ -2435,11 +2435,11 @@ void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() { |
| gfx::Point cursor_screen_point = screen->GetCursorScreenPoint(); |
| -#if defined(OS_WIN) |
| +#if !defined(OS_CHROMEOS) |
| // Ignore cursor update messages if the window under the cursor is not us. |
| aura::Window* window_at_screen_point = screen->GetWindowAtScreenPoint( |
| cursor_screen_point); |
| - |
| +#if defined(OS_WIN) |
| // On Windows we may fail to retrieve the aura Window at the current cursor |
| // position. This is because the WindowFromPoint API may return the legacy |
| // window which is not associated with an aura Window. In this case we need |
| @@ -2455,14 +2455,11 @@ void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() { |
| window_at_screen_point = screen_win->GetNativeWindowFromHWND( |
| hwnd_at_point); |
| } |
| - |
| +#endif |
| if (!window_at_screen_point || |
| (window_at_screen_point->GetRootWindow() != root_window)) { |
| return; |
| } |
| -#elif !defined(OS_CHROMEOS) |
| - if (!screen->IsWindowUnderCursor(window_)) |
| - return; |
| #endif |
|
sadrul
2016/05/31 20:25:23
Since you are here: // !defined(OS_CHROMEOS)
|
| gfx::Point root_window_point = cursor_screen_point; |