webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 17 insertions, 6 deletions

diff --git a/Source/WebKit2/Shared/WebEvent.cpp b/Source/WebKit2/Shared/WebEvent.cpp
index 54f434b6e..507bc1662 100644
--- a/Source/WebKit2/Shared/WebEvent.cpp
+++ b/Source/WebKit2/Shared/WebEvent.cpp
@@ -26,9 +26,8 @@
 #include "config.h"
 #include "WebEvent.h"
 
-#include "ArgumentDecoder.h"
-#include "ArgumentEncoder.h"
-#include "Arguments.h"
+#include "Decoder.h"
+#include "Encoder.h"
 
 namespace WebKit {
 
@@ -46,14 +45,14 @@ WebEvent::WebEvent(Type type, Modifiers modifiers, double timestamp)
 {
 }
 
-void WebEvent::encode(IPC::ArgumentEncoder& encoder) const
+void WebEvent::encode(IPC::Encoder& encoder) const
 {
     encoder << m_type;
     encoder << m_modifiers;
     encoder << m_timestamp;
 }
 
-bool WebEvent::decode(IPC::ArgumentDecoder& decoder, WebEvent& result)
+bool WebEvent::decode(IPC::Decoder& decoder, WebEvent& result)
 {
     if (!decoder.decode(result.m_type))
         return false;
@@ -63,5 +62,17 @@ bool WebEvent::decode(IPC::ArgumentDecoder& decoder, WebEvent& result)
         return false;
     return true;
 }
-    
+
+#if ENABLE(TOUCH_EVENTS)
+bool WebTouchEvent::allTouchPointsAreReleased() const
+{
+    for (const auto& touchPoint : touchPoints()) {
+        if (touchPoint.state() != WebPlatformTouchPoint::TouchReleased && touchPoint.state() != WebPlatformTouchPoint::TouchCancelled)
+            return false;
+    }
+
+    return true;
+}
+#endif
+
 } // namespace WebKit