diff options
Diffstat (limited to 'Source/WebKit2/Shared/WebWheelEvent.cpp')
-rw-r--r-- | Source/WebKit2/Shared/WebWheelEvent.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/WebKit2/Shared/WebWheelEvent.cpp b/Source/WebKit2/Shared/WebWheelEvent.cpp index 26f2337..5940bcc 100644 --- a/Source/WebKit2/Shared/WebWheelEvent.cpp +++ b/Source/WebKit2/Shared/WebWheelEvent.cpp @@ -49,7 +49,7 @@ WebWheelEvent::WebWheelEvent(Type type, const IntPoint& position, const IntPoint } #if PLATFORM(MAC) -WebWheelEvent::WebWheelEvent(Type type, const IntPoint& position, const IntPoint& globalPosition, const FloatSize& delta, const FloatSize& wheelTicks, Granularity granularity, Phase phase, bool hasPreciseScrollingDeltas, Modifiers modifiers, double timestamp) +WebWheelEvent::WebWheelEvent(Type type, const IntPoint& position, const IntPoint& globalPosition, const FloatSize& delta, const FloatSize& wheelTicks, Granularity granularity, Phase phase, Phase momentumPhase, bool hasPreciseScrollingDeltas, Modifiers modifiers, double timestamp) : WebEvent(type, modifiers, timestamp) , m_position(position) , m_globalPosition(globalPosition) @@ -57,6 +57,7 @@ WebWheelEvent::WebWheelEvent(Type type, const IntPoint& position, const IntPoint , m_wheelTicks(wheelTicks) , m_granularity(granularity) , m_phase(phase) + , m_momentumPhase(momentumPhase) , m_hasPreciseScrollingDeltas(hasPreciseScrollingDeltas) { ASSERT(isWheelEventType(type)); @@ -74,6 +75,7 @@ void WebWheelEvent::encode(CoreIPC::ArgumentEncoder* encoder) const encoder->encode(m_granularity); #if PLATFORM(MAC) encoder->encode(m_phase); + encoder->encode(m_momentumPhase); encoder->encode(m_hasPreciseScrollingDeltas); #endif } @@ -95,6 +97,8 @@ bool WebWheelEvent::decode(CoreIPC::ArgumentDecoder* decoder, WebWheelEvent& t) #if PLATFORM(MAC) if (!decoder->decode(t.m_phase)) return false; + if (!decoder->decode(t.m_momentumPhase)) + return false; if (!decoder->decode(t.m_hasPreciseScrollingDeltas)) return false; #endif |