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

Unified Diff: third_party/WebKit/Source/core/events/TouchEvent.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/events/TouchEvent.cpp
diff --git a/third_party/WebKit/Source/core/events/TouchEvent.cpp b/third_party/WebKit/Source/core/events/TouchEvent.cpp
index 27306e533cd0d05604d533b98d88f999a53b8ba8..066d2c9db8dbecbd529dc828fd56e07c39c97779 100644
--- a/third_party/WebKit/Source/core/events/TouchEvent.cpp
+++ b/third_party/WebKit/Source/core/events/TouchEvent.cpp
@@ -33,6 +33,7 @@
#include "core/frame/FrameView.h"
#include "core/frame/LocalDOMWindow.h"
#include "core/html/HTMLElement.h"
+#include "core/input/InputDeviceCapabilities.h"
#include "core/inspector/ConsoleMessage.h"
#include "platform/Histogram.h"
@@ -218,7 +219,8 @@ TouchEvent::TouchEvent(const WebTouchEvent& event,
0,
static_cast<PlatformEvent::Modifiers>(event.modifiers()),
TimeTicks::FromSeconds(event.timeStampSeconds()),
- InputDeviceCapabilities::firesTouchEventsSourceCapabilities()),
+ view ? view->getInputDeviceCapabilities()->firesTouchEvents(true)
+ : nullptr),
m_touches(touches),
m_targetTouches(targetTouches),
m_changedTouches(changedTouches),
« no previous file with comments | « third_party/WebKit/Source/core/events/MouseEvent.cpp ('k') | third_party/WebKit/Source/core/events/UIEvent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698