Merge pull request rdkcentral#5948 from asurdej-comcast/testing_main

Fix encrypted playback in TC subview and improve visibility handling

Author: emutavchi

WebKitBrowser/CHANGELOG.md

@@ -15,6 +15,11 @@ All notable changes to this RDK Service will be documented in this file.
 * Changes in CHANGELOG should be updated when commits are added to the main or release branches. There should be one CHANGELOG entry per JIRA Ticket. This is not enforced on sprint branches since there could be multiple changes for the same JIRA ticket during development. 
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
+
+## [1.1.27] - 2024-12-18
+### Fixed
+- Testing: Fix encrypted playback in TC subview and improve visibility handling
+
 ## [1.1.26] - 2024-09-11
 ### Added
 - Config entry to enable/disable WebRTC ICE candidate filtering

WebKitBrowser/Testing/testrunner.cpp

@@ -60,6 +60,8 @@ class TestRunnerImpl : public Testing::TestRunner {
                                              void *userData);
     static void loadFailedCallback(WebKitWebView* webView, WebKitLoadEvent loadEvent,
                                    const gchar* failingURI, GError* error, void *userData);
+    static bool decidePermissionCallback(WebKitWebView* webView,
+                                         WebKitPermissionRequest* permissionRequest);
 
 private:
     std::string m_extensionDir;
@@ -146,6 +148,7 @@ bool TestRunnerImpl::createSubView() {
     g_signal_connect(m_testCaseView, "user-message-received", G_CALLBACK(userMessageReceivedCallback), this);
     g_signal_connect(m_testCaseView, "web-process-terminated", G_CALLBACK(webProcessTerminatedCallback), this);
     g_signal_connect(m_testCaseView, "load-failed", G_CALLBACK(loadFailedCallback), this);
+    g_signal_connect(m_testCaseView, "permission-request", G_CALLBACK(decidePermissionCallback), this);
     // TODO: need to handle those signals
     // g_signal_connect(m_testCaseView, "notify::is-web-process-responsive", G_CALLBACK(isWebProcessResponsiveCallback), this);
     return true;
@@ -155,9 +158,11 @@ void TestRunnerImpl::setParentVisibility(bool visible) {
     auto* backend = webkit_web_view_backend_get_wpe_backend(webkit_web_view_get_backend(m_parentView));
     assert(backend);
     if (visible) {
+        // Setting the activity state to "visible" alone doesn’t bring the view back to the screen
         wpe_view_backend_add_activity_state(backend, wpe_view_activity_state_in_window);
+        wpe_view_backend_add_activity_state(backend, wpe_view_activity_state_visible);
     } else {
-        wpe_view_backend_remove_activity_state(backend, wpe_view_activity_state_in_window);
+        wpe_view_backend_remove_activity_state(backend, wpe_view_activity_state_visible);
     }
 }
 
@@ -261,6 +266,13 @@ void TestRunnerImpl::loadFailedCallback(WebKitWebView* webView, WebKitLoadEvent
     runner->sendTestCaseResponse(false, message.c_str());
 }
 
+bool TestRunnerImpl::decidePermissionCallback(WebKitWebView* webView,
+                                              WebKitPermissionRequest* permissionRequest)
+{
+    webkit_permission_request_allow(permissionRequest);
+    return true;
+}
+
 } // namespace
 
 namespace Testing {