Revert "Revert "Changes after TouchData renamed to TouchEvent""

This reverts commit 56ee3d3d439b4b37eb876a82f6112b74ac2d7979.

diff --git a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
index 8b8aa15..31a12a3 100644 (file)
--- a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
+++ b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
@@ -322,7 +322,7 @@ public:
     evas_object_resize( mWebView, mWidth, mHeight );
   }
 
-  bool SendTouchEvent( const TouchData& touch )
+  bool SendTouchEvent( const TouchEvent& touch )
   {
     Ewk_Touch_Event_Type type = EWK_TOUCH_START;
     Evas_Touch_Point_State state = EVAS_TOUCH_POINT_DOWN;
@@ -813,7 +813,7 @@ void TizenWebEngineChromium::SetSize( int width, int height )
   }
 }
 
-bool TizenWebEngineChromium::SendTouchEvent( const Dali::TouchData& touch )
+bool TizenWebEngineChromium::SendTouchEvent( const Dali::TouchEvent& touch )
 {
   if( mWebViewContainer )
   {

diff --git a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.h b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.h
index cf1f53f..2aca277 100644 (file)
--- a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.h
+++ b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.h
@@ -2,7 +2,7 @@
 #define DALI_TIZEN_WEB_ENGINE_CHROMIUM_H
 
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -279,7 +279,7 @@ public:
   /**
    * @copydoc Dali::WebEnginePlugin::SendTouchEvent()
    */
-  bool SendTouchEvent( const Dali::TouchData& touch ) override;
+  bool SendTouchEvent( const Dali::TouchEvent& touch ) override;
 
   /**
    * @copydoc Dali::WebEnginePlugin::SendKeyEvent()

diff --git a/dali-extension/web-engine-lwe/tizen-web-engine-lwe.cpp b/dali-extension/web-engine-lwe/tizen-web-engine-lwe.cpp
index 82ca3d1..dd63972 100644 (file)
--- a/dali-extension/web-engine-lwe/tizen-web-engine-lwe.cpp
+++ b/dali-extension/web-engine-lwe/tizen-web-engine-lwe.cpp
@@ -22,7 +22,7 @@
 #include <dali/integration-api/debug.h>
 #include <dali/devel-api/common/stage.h>
 #include <dali/public-api/events/key-event.h>
-#include <dali/public-api/events/touch-data.h>
+#include <dali/public-api/events/touch-event.h>
 #include <dali/devel-api/adaptor-framework/application-devel.h>
 
 #include <unistd.h>
@@ -731,7 +731,7 @@ void TizenWebEngineLWE::DispatchMouseMoveEvent( float x, float y, bool isLButton
     : LWE::MouseButtonsValue::NoButtonDown, x, y );
 }
 
-bool TizenWebEngineLWE::SendTouchEvent( const TouchData& touch )
+bool TizenWebEngineLWE::SendTouchEvent( const TouchEvent& touch )
 {
   size_t pointCount = touch.GetPointCount();
   if( pointCount == 1 )

diff --git a/dali-extension/web-engine-lwe/tizen-web-engine-lwe.h b/dali-extension/web-engine-lwe/tizen-web-engine-lwe.h
index 2168115..7fa5d7e 100644 (file)
--- a/dali-extension/web-engine-lwe/tizen-web-engine-lwe.h
+++ b/dali-extension/web-engine-lwe/tizen-web-engine-lwe.h
@@ -2,7 +2,7 @@
 #define DALI_TIZEN_WEB_ENGINE_LWE_H
 
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -235,7 +235,7 @@ public:
   /**
    * @copydoc Dali::WebEnginePlugin::SendTouchEvent()
    */
-  bool SendTouchEvent( const Dali::TouchData& touch ) override;
+  bool SendTouchEvent( const Dali::TouchEvent& touch ) override;
 
   /**
    * @copydoc Dali::WebEnginePlugin::SendKeyEvent()