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

Unified Diff: third_party/WebKit/Source/core/events/GestureEvent.cpp

Issue 1829743003: Fix missing fields in GestureScrollBegin/Update/End event conversions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tdresser's comments in patch set 1 Created 4 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
Index: third_party/WebKit/Source/core/events/GestureEvent.cpp
diff --git a/third_party/WebKit/Source/core/events/GestureEvent.cpp b/third_party/WebKit/Source/core/events/GestureEvent.cpp
index f758af2d67b0d17f26ca4e345455b0be69473e10..97575e9aa23b62165ee7576acc0b243d70c07854 100644
--- a/third_party/WebKit/Source/core/events/GestureEvent.cpp
+++ b/third_party/WebKit/Source/core/events/GestureEvent.cpp
@@ -38,6 +38,8 @@ PassRefPtrWillBeRawPtr<GestureEvent> GestureEvent::create(PassRefPtrWillBeRawPtr
float velocityX = 0;
float velocityY = 0;
bool inertial = false;
+ bool synthetic = false;
+ ScrollGranularity deltaUnits = ScrollGranularity::ScrollByPrecisePixel;
GestureSource source = GestureSourceUninitialized;
switch (event.source()) {
@@ -53,9 +55,17 @@ PassRefPtrWillBeRawPtr<GestureEvent> GestureEvent::create(PassRefPtrWillBeRawPtr
switch (event.type()) {
case PlatformEvent::GestureScrollBegin:
- eventType = EventTypeNames::gesturescrollstart; break;
+ eventType = EventTypeNames::gesturescrollstart;
+ synthetic = event.synthetic();
+ deltaUnits = event.deltaUnits();
+ inertial = event.inertial();
+ break;
case PlatformEvent::GestureScrollEnd:
- eventType = EventTypeNames::gesturescrollend; break;
+ eventType = EventTypeNames::gesturescrollend;
+ synthetic = event.synthetic();
+ deltaUnits = event.deltaUnits();
+ inertial = event.inertial();
+ break;
case PlatformEvent::GestureScrollUpdate:
// Only deltaX/Y are used when converting this
// back to a PlatformGestureEvent.
@@ -63,6 +73,7 @@ PassRefPtrWillBeRawPtr<GestureEvent> GestureEvent::create(PassRefPtrWillBeRawPtr
deltaX = event.deltaX();
deltaY = event.deltaY();
inertial = event.inertial();
+ deltaUnits = event.deltaUnits();
break;
case PlatformEvent::GestureTap:
eventType = EventTypeNames::gesturetap; break;
@@ -87,7 +98,7 @@ PassRefPtrWillBeRawPtr<GestureEvent> GestureEvent::create(PassRefPtrWillBeRawPtr
default:
return nullptr;
}
- return adoptRefWillBeNoop(new GestureEvent(eventType, view, event.globalPosition().x(), event.globalPosition().y(), event.position().x(), event.position().y(), event.getModifiers(), deltaX, deltaY, velocityX, velocityY, inertial, event.timestamp(), event.resendingPluginId(), source));
+ return adoptRefWillBeNoop(new GestureEvent(eventType, view, event.globalPosition().x(), event.globalPosition().y(), event.position().x(), event.position().y(), event.getModifiers(), deltaX, deltaY, velocityX, velocityY, inertial, synthetic, deltaUnits, event.timestamp(), event.resendingPluginId(), source));
}
const AtomicString& GestureEvent::interfaceName() const
@@ -109,18 +120,22 @@ GestureEvent::GestureEvent()
, m_velocityX(0)
, m_velocityY(0)
, m_inertial(false)
+ , m_synthetic(false)
+ , m_deltaUnits(ScrollGranularity::ScrollByPrecisePixel)
, m_source(GestureSourceUninitialized)
, m_resendingPluginId(-1)
{
}
-GestureEvent::GestureEvent(const AtomicString& type, PassRefPtrWillBeRawPtr<AbstractView> view, int screenX, int screenY, int clientX, int clientY, PlatformEvent::Modifiers modifiers, float deltaX, float deltaY, float velocityX, float velocityY, bool inertial, double platformTimeStamp, int resendingPluginId, GestureSource source)
+GestureEvent::GestureEvent(const AtomicString& type, PassRefPtrWillBeRawPtr<AbstractView> view, int screenX, int screenY, int clientX, int clientY, PlatformEvent::Modifiers modifiers, float deltaX, float deltaY, float velocityX, float velocityY, bool inertial, bool synthetic, ScrollGranularity deltaUnits, double platformTimeStamp, int resendingPluginId, GestureSource source)
: MouseRelatedEvent(type, true, true, nullptr, view, 0, IntPoint(screenX, screenY), IntPoint(clientX, clientY), IntPoint(0, 0), modifiers, platformTimeStamp, PositionType::Position)
, m_deltaX(deltaX)
, m_deltaY(deltaY)
, m_velocityX(velocityX)
, m_velocityY(velocityY)
, m_inertial(inertial)
+ , m_synthetic(synthetic)
+ , m_deltaUnits(deltaUnits)
, m_source(source)
, m_resendingPluginId(resendingPluginId)
{
« no previous file with comments | « third_party/WebKit/Source/core/events/GestureEvent.h ('k') | third_party/WebKit/Source/platform/PlatformGestureEvent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698