diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
| commit | 881da28418d380042aa95a97f0cbd42560a64f7c (patch) | |
| tree | a794dff3274695e99c651902dde93d934ea7a5af /Source/WebKit2/Shared/WebWheelEvent.cpp | |
| parent | 7e104c57a70fdf551bb3d22a5d637cdcbc69dbea (diff) | |
| parent | 0fcedcd17cc00d3dd44c718b3cb36c1033319671 (diff) | |
| download | qtwebkit-881da28418d380042aa95a97f0cbd42560a64f7c.tar.gz | |
Merge 'wip/next' into dev
Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9
Diffstat (limited to 'Source/WebKit2/Shared/WebWheelEvent.cpp')
| -rw-r--r-- | Source/WebKit2/Shared/WebWheelEvent.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/WebKit2/Shared/WebWheelEvent.cpp b/Source/WebKit2/Shared/WebWheelEvent.cpp index 0cd721685..d250a145b 100644 --- a/Source/WebKit2/Shared/WebWheelEvent.cpp +++ b/Source/WebKit2/Shared/WebWheelEvent.cpp @@ -41,7 +41,7 @@ WebWheelEvent::WebWheelEvent(Type type, const IntPoint& position, const IntPoint , m_wheelTicks(wheelTicks) , m_granularity(granularity) , m_directionInvertedFromDevice(false) -#if PLATFORM(MAC) +#if PLATFORM(COCOA) , m_phase(PhaseNone) , m_hasPreciseScrollingDeltas(false) , m_scrollCount(0) @@ -50,7 +50,7 @@ WebWheelEvent::WebWheelEvent(Type type, const IntPoint& position, const IntPoint ASSERT(isWheelEventType(type)); } -#if PLATFORM(MAC) +#if PLATFORM(COCOA) WebWheelEvent::WebWheelEvent(Type type, const IntPoint& position, const IntPoint& globalPosition, const FloatSize& delta, const FloatSize& wheelTicks, Granularity granularity, bool directionInvertedFromDevice, Phase phase, Phase momentumPhase, bool hasPreciseScrollingDeltas, uint32_t scrollCount, const WebCore::FloatSize& unacceleratedScrollingDelta, Modifiers modifiers, double timestamp) : WebEvent(type, modifiers, timestamp) , m_position(position) @@ -69,7 +69,7 @@ WebWheelEvent::WebWheelEvent(Type type, const IntPoint& position, const IntPoint } #endif -void WebWheelEvent::encode(CoreIPC::ArgumentEncoder& encoder) const +void WebWheelEvent::encode(IPC::ArgumentEncoder& encoder) const { WebEvent::encode(encoder); @@ -79,7 +79,7 @@ void WebWheelEvent::encode(CoreIPC::ArgumentEncoder& encoder) const encoder << m_wheelTicks; encoder << m_granularity; encoder << m_directionInvertedFromDevice; -#if PLATFORM(MAC) +#if PLATFORM(COCOA) encoder << m_phase; encoder << m_momentumPhase; encoder << m_hasPreciseScrollingDeltas; @@ -88,7 +88,7 @@ void WebWheelEvent::encode(CoreIPC::ArgumentEncoder& encoder) const #endif } -bool WebWheelEvent::decode(CoreIPC::ArgumentDecoder& decoder, WebWheelEvent& t) +bool WebWheelEvent::decode(IPC::ArgumentDecoder& decoder, WebWheelEvent& t) { if (!WebEvent::decode(decoder, t)) return false; @@ -104,7 +104,7 @@ bool WebWheelEvent::decode(CoreIPC::ArgumentDecoder& decoder, WebWheelEvent& t) return false; if (!decoder.decode(t.m_directionInvertedFromDevice)) return false; -#if PLATFORM(MAC) +#if PLATFORM(COCOA) if (!decoder.decode(t.m_phase)) return false; if (!decoder.decode(t.m_momentumPhase)) |