Chromium Code Reviews| Index: Source/core/events/WheelEvent.h |
| diff --git a/Source/core/events/WheelEvent.h b/Source/core/events/WheelEvent.h |
| index dd98ec56b6feca40d7763163a745d38c90853dac..2bac2247eb3d39b6526e7a3df1a85c99c63305d0 100644 |
| --- a/Source/core/events/WheelEvent.h |
| +++ b/Source/core/events/WheelEvent.h |
| @@ -68,10 +68,10 @@ public: |
| static PassRefPtrWillBeRawPtr<WheelEvent> create(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 suppressScroll) |
| { |
| return adoptRefWillBeNoop(new WheelEvent(wheelTicks, rawDelta, deltaMode, view, |
| - screenLocation, pageLocation, ctrlKey, altKey, shiftKey, metaKey)); |
| + screenLocation, pageLocation, ctrlKey, altKey, shiftKey, metaKey, suppressScroll)); |
| } |
| double deltaX() const { return m_deltaX; } // Positive when scrolling right. |
| @@ -83,6 +83,7 @@ public: |
| unsigned deltaMode() const { return m_deltaMode; } |
| float ticksX() const { return static_cast<float>(m_wheelDelta.x()) / TickMultiplier; } |
| float ticksY() const { return static_cast<float>(m_wheelDelta.y()) / TickMultiplier; } |
| + bool suppressScroll() const { return m_suppressScroll; } |
|
tdresser
2014/11/27 15:06:06
This naming is a bit confusing.
suppressScroll() s
Rick Byers
2014/11/27 15:55:14
If it's clearer, we could also invert the meaning
lanwei
2014/12/02 06:28:22
Done.
lanwei
2014/12/02 06:28:22
Done.
|
| virtual const AtomicString& interfaceName() const override; |
| virtual bool isMouseEvent() const override; |
| @@ -95,13 +96,14 @@ private: |
| WheelEvent(const AtomicString&, const WheelEventInit&); |
| WheelEvent(const FloatPoint& wheelTicks, const FloatPoint& rawDelta, |
| unsigned, PassRefPtrWillBeRawPtr<AbstractView>, const IntPoint& screenLocation, const IntPoint& pageLocation, |
| - bool ctrlKey, bool altKey, bool shiftKey, bool metaKey); |
| + bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool suppressScroll); |
| IntPoint m_wheelDelta; |
| double m_deltaX; |
| double m_deltaY; |
| double m_deltaZ; |
| unsigned m_deltaMode; |
| + bool m_suppressScroll; |
| }; |
| DEFINE_EVENT_TYPE_CASTS(WheelEvent); |