| Index: Source/core/events/WheelEvent.h
|
| diff --git a/Source/core/events/WheelEvent.h b/Source/core/events/WheelEvent.h
|
| index 6659e2d06aff20472853b7f536cc647c96e362a9..60b0727a85b96a36f37ffb53a03569c816dcd2ef 100644
|
| --- a/Source/core/events/WheelEvent.h
|
| +++ b/Source/core/events/WheelEvent.h
|
| @@ -61,10 +61,10 @@ public:
|
| static PassRefPtrWillBeRawPtr<WheelEvent> create(const FloatPoint& wheelTicks,
|
| const FloatPoint& rawDelta, unsigned deltaMode, PassRefPtrWillBeRawPtr<AbstractView> view,
|
| const IntPoint& screenLocation, const IntPoint& windowLocation,
|
| - bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short buttons, bool canScroll, bool hasPreciseScrollingDeltas, RailsMode railsMode)
|
| + bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short buttons, bool canScroll, int resendingPluginId, bool hasPreciseScrollingDeltas, RailsMode railsMode)
|
| {
|
| return adoptRefWillBeNoop(new WheelEvent(wheelTicks, rawDelta, deltaMode, view,
|
| - screenLocation, windowLocation, ctrlKey, altKey, shiftKey, metaKey, buttons, canScroll, hasPreciseScrollingDeltas, railsMode));
|
| + screenLocation, windowLocation, ctrlKey, altKey, shiftKey, metaKey, buttons, canScroll, resendingPluginId, hasPreciseScrollingDeltas, railsMode));
|
| }
|
|
|
| double deltaX() const { return m_deltaX; } // Positive when scrolling right.
|
| @@ -77,6 +77,7 @@ public:
|
| float ticksX() const { return static_cast<float>(m_wheelDelta.x()) / TickMultiplier; }
|
| float ticksY() const { return static_cast<float>(m_wheelDelta.y()) / TickMultiplier; }
|
| bool canScroll() const { return m_canScroll; }
|
| + int resendingPluginId() const { return m_resendingPluginId; }
|
| bool hasPreciseScrollingDeltas() const { return m_hasPreciseScrollingDeltas; }
|
| RailsMode railsMode() const { return m_railsMode; }
|
|
|
| @@ -93,7 +94,7 @@ private:
|
| WheelEvent(const AtomicString&, const WheelEventInit&);
|
| WheelEvent(const FloatPoint& wheelTicks, const FloatPoint& rawDelta,
|
| unsigned, PassRefPtrWillBeRawPtr<AbstractView>, const IntPoint& screenLocation, const IntPoint& windowLocation,
|
| - bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short buttons, bool canScroll, bool hasPreciseScrollingDeltas, RailsMode);
|
| + bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short buttons, bool canScroll, int resendingPluginId, bool hasPreciseScrollingDeltas, RailsMode);
|
|
|
| IntPoint m_wheelDelta;
|
| double m_deltaX;
|
| @@ -101,6 +102,7 @@ private:
|
| double m_deltaZ;
|
| unsigned m_deltaMode;
|
| bool m_canScroll;
|
| + int m_resendingPluginId;
|
| bool m_hasPreciseScrollingDeltas;
|
| RailsMode m_railsMode;
|
| };
|
|
|