From: David Steele <david.steele@samsung.com>
Date: Mon, 25 Apr 2022 15:54:41 +0000 (+0000)
Subject: Merge "Block the changeness of PreMultiplied for some visuals" into devel/master
X-Git-Tag: dali_2.1.20~6
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=cef6d2324d9ecca71abf3c9e63db8e371a636b8a;hp=24e9ef34e2b4283a03e2d62f4782fccb5a72d67d

Merge "Block the changeness of PreMultiplied for some visuals" into devel/master
---

diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp
index 9a3ef2b..8364147 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp
@@ -1320,7 +1320,13 @@ int UtcDaliWebViewAccessible(void)
 
   DALI_TEST_EQUALS(children.size(), 1u, TEST_LOCATION);
 
-  auto address = children[0]->GetAddress();
+  auto* child = children[0];
+
+  DALI_TEST_CHECK(child);
+  DALI_TEST_CHECK(child->IsProxy());
+  DALI_TEST_EQUALS(child->GetParent(), webViewAccessible, TEST_LOCATION);
+
+  auto address = child->GetAddress();
 
   DALI_TEST_CHECK(address);
   DALI_TEST_NOT_EQUALS(address.GetBus(), webViewAccessible->GetAddress().GetBus(), 0.0f, TEST_LOCATION);
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..e3f2406 100755
--- 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);