Index: Source/core/events/WheelEvent.cpp |
diff --git a/Source/core/events/WheelEvent.cpp b/Source/core/events/WheelEvent.cpp |
index 418b5d14772386fff5a649e0dff72ddf6b0f7a03..65de9d2867a73d28c9744baff1828a38da89f91a 100644 |
--- a/Source/core/events/WheelEvent.cpp |
+++ b/Source/core/events/WheelEvent.cpp |
@@ -45,6 +45,7 @@ WheelEvent::WheelEvent() |
, m_deltaY(0) |
, m_deltaZ(0) |
, m_deltaMode(DOM_DELTA_PIXEL) |
+ , m_canScroll(true) |
{ |
} |
@@ -55,12 +56,13 @@ WheelEvent::WheelEvent(const AtomicString& type, const WheelEventInit& initializ |
, m_deltaY(initializer.deltaY ? initializer.deltaY : -initializer.wheelDeltaY) |
, m_deltaZ(initializer.deltaZ) |
, m_deltaMode(initializer.deltaMode) |
+ , m_canScroll(true) |
{ |
} |
WheelEvent::WheelEvent(const FloatPoint& wheelTicks, const FloatPoint& rawDelta, unsigned deltaMode, |
PassRefPtrWillBeRawPtr<AbstractView> view, const IntPoint& screenLocation, const IntPoint& pageLocation, |
- bool ctrlKey, bool altKey, bool shiftKey, bool metaKey) |
+ bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool canScroll) |
: MouseEvent(EventTypeNames::wheel, true, true, view, 0, screenLocation.x(), screenLocation.y(), |
pageLocation.x(), pageLocation.y(), 0, 0, ctrlKey, altKey, shiftKey, metaKey, 0, nullptr, |
nullptr, false, PlatformMouseEvent::RealOrIndistinguishable) |
@@ -69,6 +71,7 @@ WheelEvent::WheelEvent(const FloatPoint& wheelTicks, const FloatPoint& rawDelta, |
, m_deltaY(-rawDelta.y()) |
, m_deltaZ(0) |
, m_deltaMode(deltaMode) |
+ , m_canScroll(canScroll) |
{ |
} |
@@ -109,7 +112,7 @@ WheelEventDispatchMediator::WheelEventDispatchMediator(const PlatformWheelEvent& |
setEvent(WheelEvent::create(FloatPoint(event.wheelTicksX(), event.wheelTicksY()), FloatPoint(event.deltaX(), event.deltaY()), |
deltaMode(event), view, event.globalPosition(), event.position(), |
- event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey())); |
+ event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey(), event.canScroll())); |
} |
WheelEvent* WheelEventDispatchMediator::event() const |