From: Eunki Hong Date: Fri, 13 May 2022 03:00:54 +0000 (+0000) Subject: Merge "Cache animated image's frame index" into devel/master X-Git-Tag: dali_2.1.23~14 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=caf5fc04c96e724057981f4c7e7981e0c217f297;hp=dd5c89d78423e23ca27708cabfd0d88ce798b294 Merge "Cache animated image's frame index" into devel/master --- diff --git a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.cpp b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.cpp index 843a26c..c6499b0 100644 --- a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.cpp +++ b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.cpp @@ -52,6 +52,12 @@ namespace Accessibility wr->Encode(reply, std::tuple
{ {"bus", "root"} }); return reply; }; + wr->testMethods[std::tuple{"/org/a11y/atspi/accessible/root", "org.a11y.atspi.Socket", "Unembed", MethodType::Method}] = [wr](const MessagePtr &m) -> MessagePtr { + return wr->newReplyMessage(m); + }; + wr->testMethods[std::tuple{"/org/a11y/atspi/accessible/root", "org.a11y.atspi.Socket", "Embedded", MethodType::Method}] = [wr](const MessagePtr &m) -> MessagePtr { + return wr->newReplyMessage(m); + }; wr->testMethods[std::tuple{"/org/a11y/atspi/accessible", "org.a11y.atspi.Event.Object", "PropertyChange", MethodType::Method}] = [wr](const MessagePtr &m) -> MessagePtr { return wr->newReplyMessage(m); 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 e3f2406..09bea45 100755 --- a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp +++ b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp @@ -1293,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