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

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

Issue 1894363004: Articulate the cancel behavior in WebMouseWheelEvent. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master_all_passive
Patch Set: Rebase Created 4 years, 8 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/WheelEvent.cpp
diff --git a/third_party/WebKit/Source/core/events/WheelEvent.cpp b/third_party/WebKit/Source/core/events/WheelEvent.cpp
index 50d33cd600164aa8f1899968c1f334922b3d8ed6..0b202b0e1ec9dea76ae2608260713714db56a1c6 100644
--- a/third_party/WebKit/Source/core/events/WheelEvent.cpp
+++ b/third_party/WebKit/Source/core/events/WheelEvent.cpp
@@ -41,7 +41,8 @@ WheelEvent* WheelEvent::create(const PlatformWheelEvent& event, AbstractView* vi
event.getModifiers(),
MouseEvent::platformModifiersToButtons(event.getModifiers()), event.timestamp(),
event.canScroll(), event.resendingPluginId(), event.hasPreciseScrollingDeltas(),
- static_cast<Event::RailsMode>(event.getRailsMode()));
+ static_cast<Event::RailsMode>(event.getRailsMode()),
+ event.cancelable());
}
WheelEvent::WheelEvent()
@@ -73,8 +74,8 @@ WheelEvent::WheelEvent(const AtomicString& type, const WheelEventInit& initializ
WheelEvent::WheelEvent(const FloatPoint& wheelTicks, const FloatPoint& rawDelta, unsigned deltaMode,
AbstractView* view, const IntPoint& screenLocation, const IntPoint& windowLocation,
PlatformEvent::Modifiers modifiers, unsigned short buttons, double platformTimeStamp,
- bool canScroll, int resendingPluginId, bool hasPreciseScrollingDeltas, RailsMode railsMode)
- : MouseEvent(EventTypeNames::wheel, true, true, view, 0, screenLocation.x(), screenLocation.y(),
+ bool canScroll, int resendingPluginId, bool hasPreciseScrollingDeltas, RailsMode railsMode, bool cancelable)
+ : MouseEvent(EventTypeNames::wheel, true, cancelable, view, 0, screenLocation.x(), screenLocation.y(),
windowLocation.x(), windowLocation.y(), 0, 0, modifiers, 0, buttons,
nullptr, platformTimeStamp, PlatformMouseEvent::RealOrIndistinguishable,
// TODO(zino): Should support canvas hit region because the wheel event
« no previous file with comments | « third_party/WebKit/Source/core/events/WheelEvent.h ('k') | third_party/WebKit/Source/platform/PlatformWheelEvent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698