From: Heeyong Song <heeyong.song@samsung.com>
Date: Tue, 18 Aug 2020 08:54:01 +0000 (+0000)
Subject: Merge "(Vector) Change event processing" into devel/master
X-Git-Tag: dali_1.9.26~6
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=ef15505c94dffeb0639c91d9d3cd374918c21c4f;hp=-c

Merge "(Vector) Change event processing" into devel/master
---

ef15505c94dffeb0639c91d9d3cd374918c21c4f
diff --combined dali-toolkit/internal/controls/web-view/web-view-impl.cpp
index f252318,dd8e990..80314dc
--- a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
+++ b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
@@@ -31,6 -31,7 +31,7 @@@
  #include <dali-toolkit/devel-api/controls/control-devel.h>
  #include <dali-toolkit/devel-api/image-loader/texture-manager.h>
  #include <dali-toolkit/internal/visuals/visual-factory-impl.h>
+ #include <dali-toolkit/public-api/visuals/image-visual-properties.h>
  
  namespace Dali
  {
@@@ -518,7 -519,7 +519,7 @@@ Property::Value WebView::GetProperty( B
    return value;
  }
  
 -bool WebView::OnTouchEvent( Actor actor, const Dali::TouchData& touch )
 +bool WebView::OnTouchEvent( Actor actor, const Dali::TouchEvent& touch )
  {
    bool result = false;