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 f7b6dd4bab4bc7905212ba216be02c7ec3a3100b..e7f36f19bf2045c16ceeaa24f01c30e333903bfa 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc |
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc |
| @@ -3193,11 +3193,13 @@ void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() { |
| // If there's another toplevel window above us at this point (for example a |
| // menu), we don't want to update the cursor. |
| POINT windows_point = { screen_point.x(), screen_point.y() }; |
| - if (root_window->GetAcceleratedWidget() != ::WindowFromPoint(windows_point)) |
| + if (root_window->GetEventHandlerForPoint(local_point) != window_ || |
| + root_window->GetAcceleratedWidget() != ::WindowFromPoint(windows_point)) |
| return; |
| -#endif |
| - if (root_window->GetEventHandlerForPoint(local_point) != window_) |
| +#else |
| + if (root_window->GetEventHandlerForPoint(screen_point) != window_) |
|
sadrul
2013/10/01 14:33:36
Window::GetEventHandlerForPoint() expects the loca
tdanderson
2013/10/17 18:23:47
Done.
|
| return; |
| +#endif |
| gfx::NativeCursor cursor = current_cursor_.GetNativeCursor(); |
| // Do not show loading cursor when the cursor is currently hidden. |