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/WebPlatformTouchPoint.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/WebPlatformTouchPoint.cpp')
| -rw-r--r-- | Source/WebKit2/Shared/WebPlatformTouchPoint.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebKit2/Shared/WebPlatformTouchPoint.cpp b/Source/WebKit2/Shared/WebPlatformTouchPoint.cpp index f15201383..6ebf4f53c 100644 --- a/Source/WebKit2/Shared/WebPlatformTouchPoint.cpp +++ b/Source/WebKit2/Shared/WebPlatformTouchPoint.cpp @@ -27,7 +27,7 @@ #include "config.h" #include "WebEvent.h" -#if ENABLE(TOUCH_EVENTS) +#if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS) #include "Arguments.h" #include "WebCoreArgumentCoders.h" @@ -57,7 +57,7 @@ WebPlatformTouchPoint::WebPlatformTouchPoint(unsigned id, TouchPointState state, { } -void WebPlatformTouchPoint::encode(CoreIPC::ArgumentEncoder& encoder) const +void WebPlatformTouchPoint::encode(IPC::ArgumentEncoder& encoder) const { encoder << m_id; encoder << m_state; @@ -68,7 +68,7 @@ void WebPlatformTouchPoint::encode(CoreIPC::ArgumentEncoder& encoder) const encoder << m_force; } -bool WebPlatformTouchPoint::decode(CoreIPC::ArgumentDecoder& decoder, WebPlatformTouchPoint& result) +bool WebPlatformTouchPoint::decode(IPC::ArgumentDecoder& decoder, WebPlatformTouchPoint& result) { if (!decoder.decode(result.m_id)) return false; @@ -90,4 +90,4 @@ bool WebPlatformTouchPoint::decode(CoreIPC::ArgumentDecoder& decoder, WebPlatfor } // namespace WebKit -#endif // ENABLE(TOUCH_EVENTS) +#endif // ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS) |