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

Unified Diff: third_party/WebKit/Source/core/input/GestureManager.cpp

Issue 2675793005: Track constant InputDeviceCapabilities objects per-window. (Closed)
Patch Set: test tidying Created 3 years, 10 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
Index: third_party/WebKit/Source/core/input/GestureManager.cpp
diff --git a/third_party/WebKit/Source/core/input/GestureManager.cpp b/third_party/WebKit/Source/core/input/GestureManager.cpp
index fc76f4b8cfdd1a1fb425ef0f1a1e3de80cea654a..4eddb518a574717af1b51cf311bb32f2e2c9a5fa 100644
--- a/third_party/WebKit/Source/core/input/GestureManager.cpp
+++ b/third_party/WebKit/Source/core/input/GestureManager.cpp
@@ -14,6 +14,7 @@
#include "core/frame/VisualViewport.h"
#include "core/input/EventHandler.h"
#include "core/input/EventHandlingUtil.h"
+#include "core/input/InputDeviceCapabilities.h"
#include "core/page/ChromeClient.h"
#include "core/page/Page.h"
@@ -213,13 +214,17 @@ WebInputEventResult GestureManager::handleGestureTap(
currentHitTest.innerNode(), currentHitTest.canvasRegionId(),
EventTypeNames::mousedown, fakeMouseDown);
m_selectionController->initializeSelectionState();
- if (mouseDownEventResult == WebInputEventResult::NotHandled)
+ if (mouseDownEventResult == WebInputEventResult::NotHandled) {
mouseDownEventResult = m_mouseEventManager->handleMouseFocus(
- currentHitTest,
- InputDeviceCapabilities::firesTouchEventsSourceCapabilities());
- if (mouseDownEventResult == WebInputEventResult::NotHandled)
+ currentHitTest, m_frame->document()
+ ->domWindow()
+ ->getInputDeviceCapabilities()
+ ->firesTouchEvents(true));
+ }
+ if (mouseDownEventResult == WebInputEventResult::NotHandled) {
mouseDownEventResult = m_mouseEventManager->handleMousePressEvent(
MouseEventWithHitTestResults(fakeMouseDown, currentHitTest));
+ }
}
if (currentHitTest.innerNode()) {
@@ -393,9 +398,11 @@ WebInputEventResult GestureManager::sendContextMenuEventForGesture(
MouseEventWithHitTestResults mev =
m_frame->document()->performMouseEventHitTest(request, documentPoint,
mouseEvent);
- m_mouseEventManager->handleMouseFocus(
- mev.hitTestResult(),
- InputDeviceCapabilities::firesTouchEventsSourceCapabilities());
+ m_mouseEventManager->handleMouseFocus(mev.hitTestResult(),
+ m_frame->document()
+ ->domWindow()
+ ->getInputDeviceCapabilities()
+ ->firesTouchEvents(true));
}
return m_frame->eventHandler().sendContextMenuEvent(mouseEvent);
}
« no previous file with comments | « third_party/WebKit/Source/core/input/EventHandler.cpp ('k') | third_party/WebKit/Source/core/input/InputDeviceCapabilities.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698