diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
| commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
| tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/WebKit2/Shared/WebTouchEvent.cpp | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/WebKit2/Shared/WebTouchEvent.cpp')
| -rw-r--r-- | Source/WebKit2/Shared/WebTouchEvent.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/WebKit2/Shared/WebTouchEvent.cpp b/Source/WebKit2/Shared/WebTouchEvent.cpp index 8ffd4baf7..b9aacbaf6 100644 --- a/Source/WebKit2/Shared/WebTouchEvent.cpp +++ b/Source/WebKit2/Shared/WebTouchEvent.cpp @@ -26,28 +26,27 @@ #include "config.h" #include "WebEvent.h" -#if ENABLE(TOUCH_EVENTS) +#if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS) #include "ArgumentCoders.h" -#include "Arguments.h" namespace WebKit { -WebTouchEvent::WebTouchEvent(WebEvent::Type type, Vector<WebPlatformTouchPoint> touchPoints, Modifiers modifiers, double timestamp) +WebTouchEvent::WebTouchEvent(WebEvent::Type type, Vector<WebPlatformTouchPoint>&& touchPoints, Modifiers modifiers, double timestamp) : WebEvent(type, modifiers, timestamp) - , m_touchPoints(touchPoints) + , m_touchPoints(WTFMove(touchPoints)) { ASSERT(isTouchEventType(type)); } -void WebTouchEvent::encode(IPC::ArgumentEncoder& encoder) const +void WebTouchEvent::encode(IPC::Encoder& encoder) const { WebEvent::encode(encoder); encoder << m_touchPoints; } -bool WebTouchEvent::decode(IPC::ArgumentDecoder& decoder, WebTouchEvent& result) +bool WebTouchEvent::decode(IPC::Decoder& decoder, WebTouchEvent& result) { if (!WebEvent::decode(decoder, result)) return false; @@ -65,4 +64,4 @@ bool WebTouchEvent::isTouchEventType(Type type) } // namespace WebKit -#endif // ENABLE(TOUCH_EVENTS) +#endif // ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS) |