Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1034)

Unified Diff: Source/core/frame/FrameView.cpp

Issue 145003002: [DevTools] Switch from blink-based to content-based touch emulation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/core/inspector/InspectorClient.h » ('j') | Source/web/WebDevToolsAgentImpl.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « no previous file | Source/core/inspector/InspectorClient.h » ('j') | Source/web/WebDevToolsAgentImpl.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698