Chromium Code Reviews| Index: Source/core/frame/FrameView.cpp |
| diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp |
| index 35c1db9241d67355d0c58d090082f7bc8a46b473..85ba535d955e4b4f3b7a86691fa9409de961f7b0 100644 |
| --- a/Source/core/frame/FrameView.cpp |
| +++ b/Source/core/frame/FrameView.cpp |
| @@ -1405,7 +1405,7 @@ IntPoint FrameView::lastKnownMousePosition() const |
| bool FrameView::shouldSetCursor() const |
| { |
| Page* page = frame().page(); |
| - return page && page->visibilityState() != PageVisibilityStateHidden && page->focusController().isActive(); |
| + return page && page->visibilityState() != PageVisibilityStateHidden && page->focusController().isActive() && page->settings().deviceSupportsMouse(); |
|
pfeldman
2014/04/07 17:52:50
isCursorVisible()?
dgozman
2014/04/08 16:51:48
I don't think so. When cursor is invisible (i.e. p
|
| } |
| void FrameView::scrollContentsIfNeededRecursive() |
| @@ -3244,6 +3244,8 @@ AXObjectCache* FrameView::axObjectCache() const |
| void FrameView::setCursor(const Cursor& cursor) |
| { |
| + if (!shouldSetCursor()) |
| + return; |
| Page* page = frame().page(); |
| if (!page) |
| return; |