Merge "Cache animated image's frame index" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / web-view / web-view-impl.cpp

diff --git a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
index 7fc2117..09bea45 100755 (executable)
--- a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
+++ b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
@@ -1246,6 +1246,8 @@ bool WebView::SetVisibility(bool visible)
 WebView::WebViewAccessible::WebViewAccessible(Dali::Actor self, Dali::WebEngine& webEngine)
 : ControlAccessible(self), mRemoteChild{}, mWebEngine{webEngine}
 {
+  mRemoteChild.SetParent(this);
+
   Dali::Accessibility::Bridge::EnabledSignal().Connect(this, &WebViewAccessible::OnAccessibilityEnabled);
   Dali::Accessibility::Bridge::DisabledSignal().Connect(this, &WebViewAccessible::OnAccessibilityDisabled);
 
@@ -1291,8 +1293,13 @@ void WebView::WebViewAccessible::OnAccessibilityDisabled()
 
 void WebView::WebViewAccessible::SetRemoteChildAddress(Dali::Accessibility::Address address)
 {
-  mRemoteChild.SetAddress(std::move(address));
+  mRemoteChild.SetAddress(address);
   OnChildrenChanged();
+
+  if(address)
+  {
+    Accessibility::Bridge::GetCurrentBridge()->EmbedAtkSocket(GetAddress(), address);
+  }
 }
 
 #undef GET_ENUM_STRING