Merge pull request #5520 from emutavchi/24Q3_sprint_webkitbrowser_sync

WebKitBrowserPlugin: bring latest changes to 24Q3 sprint
rdkcentral · Jul 11, 2024 · 444826a · 444826a
2 parents 37ad3aa + 4e0a6b0
commit 444826a
Show file tree

Hide file tree

Showing 21 changed files with 217 additions and 53 deletions.
diff --git a/WebKitBrowser/BrowserConsoleLog.h b/WebKitBrowser/BrowserConsoleLog.h
@@ -37,7 +37,11 @@ class BrowserConsoleLog {
     BrowserConsoleLog(const string& prefix, const string& message, const uint64_t line, const uint64_t column)
     {
         _text = '[' + prefix + "][" + Core::NumberType<uint64_t>(line).Text() + ',' + Core::NumberType<uint64_t>(column).Text() + ']' + message;
+#ifdef __CORE_MESSAGING__
+        const uint16_t maxStringLength = Messaging::MessageUnit::DataSize - 1;
+#else
         const uint16_t maxStringLength = Trace::TRACINGBUFFERSIZE - 1;
+#endif
         if (_text.length() > maxStringLength) {
             _text = _text.substr(0, maxStringLength);
         }
@@ -46,7 +50,11 @@ class BrowserConsoleLog {
     BrowserConsoleLog(const string& prefix, const WKStringRef message, const uint64_t line, const uint64_t column)
     { 
         _text = '[' + prefix + "][" + Core::NumberType<uint64_t>(line).Text() + ',' + Core::NumberType<uint64_t>(column).Text() + ']' + WebKit::Utils::WKStringToString(message);
+#ifdef __CORE_MESSAGING__
+        const uint16_t maxStringLength = Messaging::MessageUnit::DataSize - 1;
+#else
         const uint16_t maxStringLength = Trace::TRACINGBUFFERSIZE - 1;
+#endif
         if (_text.length() > maxStringLength) {
             _text = _text.substr(0, maxStringLength);
         }

diff --git a/WebKitBrowser/CHANGELOG.md b/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.22] - 2024-07-02
+### Changed
+- Improve Thunder R4 compatibility
+- Enable/disable service worker support at runtime
+- Workaround crash in bmalloc's BMScavenger during shutdown
 
 ## [1.1.21] - 2024-04-09
 ### Changed

diff --git a/WebKitBrowser/CMakeLists.txt b/WebKitBrowser/CMakeLists.txt
@@ -68,6 +68,8 @@ set(PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE "" CACHE ST
 set(PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL "1" CACHE STRING "WebkitBrower Memory Pressure Webprocess Poll Interval")
 set(PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT "100" CACHE STRING "WebkitBrower Memory Pressure Networkprocess Limit")
 set(PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL "1" CACHE STRING "WebkitBrower Memory Pressure Networkprocess Poll Interval")
+set(PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT "100" CACHE STRING "WebkitBrower Memory Pressure Service Worker process Limit")
+set(PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL "1" CACHE STRING "WebkitBrower Memory Pressure Service Worker process Poll Interval")
 set(PLUGIN_WEBKITBROWSER_MEDIA_CONTENT_TYPES_REQUIRING_HARDWARE_SUPPORT "video/*" CACHE STRING "Media content types requiring hardware support")
 set(PLUGIN_WEBKITBROWSER_MEDIADISKCACHE "false" CACHE STRING "Media Disk Cache")
 set(PLUGIN_WEBKITBROWSER_MSEBUFFERS "audio:2m,video:15m,text:1m" CACHE STRING "MSE Buffers for WebKit")
@@ -104,6 +106,8 @@ set(PLUGIN_YOUTUBE_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE ${PLUGIN_WEBKITBR
 set(PLUGIN_YOUTUBE_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "YouTube Memory Pressure Webprocess Poll Interval")
 set(PLUGIN_YOUTUBE_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT} CACHE STRING "YouTube Memory Pressure Networkprocess Limit")
 set(PLUGIN_YOUTUBE_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "YouTube Memory Pressure Networkprocess Poll Interval")
+set(PLUGIN_YOUTUBE_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT} CACHE STRING "YouTube Memory Pressure Service Worker kprocess Limit")
+set(PLUGIN_YOUTUBE_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "YouTube Memory Pressure Service Worker process Poll Interval")
 
 set(PLUGIN_UX_AUTOSTART "false" CACHE STRING "Automatically start UX plugin")
 set(PLUGIN_UX_STARTUPORDER "" CACHE STRING "To configure startup order of UX plugin")
@@ -118,6 +122,8 @@ set(PLUGIN_UX_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE ${PLUGIN_WEBKITBROWSER
 set(PLUGIN_UX_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "UX Memory Pressure Webprocess Poll Interval")
 set(PLUGIN_UX_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT} CACHE STRING "UX Memory Pressure Networkprocess Limit")
 set(PLUGIN_UX_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "UX Memory Pressure Networkprocess Poll Interval")
+set(PLUGIN_UX_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT} CACHE STRING "UX Memory Pressure Service Worker kprocess Limit")
+set(PLUGIN_UX_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "UX Memory Pressure Service Worker process Poll Interval")
 
 set(PLUGIN_APPS_AUTOSTART "false" CACHE STRING "Automatically start Apps plugin")
 set(PLUGIN_APPS_STARTUPORDER "" CACHE STRING "To configure startup order of Apps plugin")
@@ -133,6 +139,8 @@ set(PLUGIN_APPS_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE ${PLUGIN_WEBKITBROWS
 set(PLUGIN_APPS_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Apps Memory Pressure Webprocess Poll Interval")
 set(PLUGIN_APPS_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT} CACHE STRING "Apps Memory Pressure Networkprocess Limit")
 set(PLUGIN_APPS_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Apps Memory Pressure Networkprocess Poll Interval")
+set(PLUGIN_APPS_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT} CACHE STRING "Apps Memory Pressure Service Worker kprocess Limit")
+set(PLUGIN_APPS_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Apps Memory Pressure Service Worker process Poll Interval")
 
 set(PLUGIN_RESIDENT_APP_AUTOSTART "false" CACHE STRING "Automatically start Resident App plugin")
 set(PLUGIN_RESIDENT_APP_STARTUPORDER "" CACHE STRING "To configure startup order of Resident App plugin")
@@ -148,6 +156,8 @@ set(PLUGIN_RESIDENT_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE ${PLUGIN_WEB
 set(PLUGIN_RESIDENT_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Resident App Memory Pressure Webprocess Poll Interval")
 set(PLUGIN_RESIDENT_APP_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT} CACHE STRING "Resident App Memory Pressure Networkprocess Limit")
 set(PLUGIN_RESIDENT_APP_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Resident App Memory Pressure Networkprocess Poll Interval")
+set(PLUGIN_RESIDENT_APP_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT} CACHE STRING "Resident App Memory Pressure Service Worker kprocess Limit")
+set(PLUGIN_RESIDENT_APP_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Resident App Memory Pressure Service Worker process Poll Interval")
 set(PLUGIN_RESIDENT_APP_COMPOSITOR "msaa" CACHE STRING "cairo compositor mode for Resident App")
 
 set(PLUGIN_SEARCH_AND_DISCOVERY_APP_AUTOSTART "false" CACHE STRING "Automatically start Search&Discovery App plugin")
@@ -163,6 +173,8 @@ set(PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE
 set(PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Search and Discovery App Memory Pressure Webprocess Poll Interval")
 set(PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT} CACHE STRING "Search and Discovery App Memory Pressure Networkprocess Limit")
 set(PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Search and Discovery App Memory Pressure Networkprocess Poll Interval")
+set(PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT} CACHE STRING "Search and Discovery App Memory Pressure Service Worker kprocess Limit")
+set(PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Search and Discovery App Memory Pressure Service Worker process Poll Interval")
 set(PLUGIN_SEARCH_AND_DISCOVERY_APP_COMPOSITOR "msaa" CACHE STRING "cairo compositor mode for Search&Discovery App")
 
 set(PLUGIN_HTML_APP_AUTOSTART "false" CACHE STRING "Automatically start Htmp App plugin")
@@ -178,6 +190,8 @@ set(PLUGIN_HTML_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE ${PLUGIN_WEBKITB
 set(PLUGIN_HTML_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Html App Memory Pressure Webprocess Poll Interval")
 set(PLUGIN_HTML_APP_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT} CACHE STRING "Html App Memory Pressure Networkprocess Limit")
 set(PLUGIN_HTML_APP_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Html App Memory Pressure Networkprocess Poll Interval")
+set(PLUGIN_HTML_APP_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT} CACHE STRING "Html App Memory Pressure Service Worker kprocess Limit")
+set(PLUGIN_HTML_APP_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Html App Memory Pressure Service Worker process Poll Interval")
 set(PLUGIN_HTML_APP_COMPOSITOR "noaa" CACHE STRING "cairo compositor mode for Html App")
 
 set(PLUGIN_LIGHTNING_APP_AUTOSTART "false" CACHE STRING "Automatically start Lightning App plugin")
@@ -193,6 +207,8 @@ set(PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE ${PLUGIN_WE
 set(PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Lightning App Memory Pressure Webprocess Poll Interval")
 set(PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT} CACHE STRING "Lightning App Memory Pressure Networkprocess Limit")
 set(PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Lightning App Memory Pressure Networkprocess Poll Interval")
+set(PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT} CACHE STRING "Lightning App Memory Pressure Service Worker kprocess Limit")
+set(PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Lightning App Memory Pressure Service Worker process Poll Interval")
 set(PLUGIN_LIGHTNING_APP_COMPOSITOR "noaa" CACHE STRING "cairo compositor mode for Lightning App")
 
 set(PLUGIN_JSPP_AUTOSTART "false" CACHE STRING "Automatically start JSPP plugin")
@@ -207,6 +223,8 @@ set(PLUGIN_JSPP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE ${PLUGIN_WEBKITBROWS
 set(PLUGIN_JSPP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "JSPP App Memory Pressure Webprocess Poll Interval")
 set(PLUGIN_JSPP_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT} CACHE STRING "JSPP App Memory Pressure Networkprocess Limit")
 set(PLUGIN_JSPP_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "JSPP App Memory Pressure Networkprocess Poll Interval")
+set(PLUGIN_JSPP_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT} CACHE STRING "JSPP App Memory Pressure Service Worker kprocess Limit")
+set(PLUGIN_JSPP_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "JSPP App Memory Pressure Service Worker process Poll Interval")
 set(PLUGIN_JSPP_STARTURL "about:blank" CACHE STRING "JSPP default URL to use")
 
 set(PLUGIN_AMAZON_AUTOSTART "false" CACHE STRING "Automatically start Amazon plugin")
@@ -221,6 +239,8 @@ set(PLUGIN_AMAZON_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE ${PLUGIN_WEBKITBRO
 set(PLUGIN_AMAZON_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Amazon App Memory Pressure Webprocess Poll Interval")
 set(PLUGIN_AMAZON_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT} CACHE STRING "Amazon App Memory Pressure Networkprocess Limit")
 set(PLUGIN_AMAZON_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Amazon App Memory Pressure Networkprocess Poll Interval")
+set(PLUGIN_AMAZON_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT} CACHE STRING "Amazon App Memory Pressure Service Worker kprocess Limit")
+set(PLUGIN_AMAZON_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Amazon App Memory Pressure Service Worker process Poll Interval")
 
 find_package(${NAMESPACE}Plugins REQUIRED)
 find_package(${NAMESPACE}Definitions REQUIRED)
@@ -254,6 +274,10 @@ if(NOT WEBKIT_GLIB_API)
     target_sources(${PLUGIN_WEBKITBROWSER_IMPLEMENTATION} PRIVATE InjectedBundle/Utils.cpp)
 endif()
 
+# This is a temporary solution. Normally we should leave this to the framework.
+# Do not replicate for other plugins.
+target_link_options(${PLUGIN_WEBKITBROWSER_IMPLEMENTATION} PRIVATE "-Wl,-z,nodelete")
+
 target_link_libraries(${PLUGIN_WEBKITBROWSER_IMPLEMENTATION}
     PRIVATE
         ${NAMESPACE}Plugins::${NAMESPACE}Plugins

diff --git a/WebKitBrowser/CookieJar.cpp b/WebKitBrowser/CookieJar.cpp
@@ -106,7 +106,7 @@ static std::vector<uint8_t> compress(const std::string& str)
             result[3] = (nbytes & 0x000000ff);
             break;
         case Z_MEM_ERROR:
-            TRACE_GLOBAL(Trace::Error,(_T("Z_MEM_ERROR: Not enough memory")));
+            SYSLOG(Logging::Error,(_T("Z_MEM_ERROR: Not enough memory")));
             result.resize(0);
             break;
         case Z_BUF_ERROR:
@@ -126,7 +126,7 @@ static std::string uncompress(const std::vector<uint8_t>& in)
     {
         if (nbytes < 4 || std::any_of(in.cbegin(), in.cend(), [](int v) {return v != 0;}))
         {
-            TRACE_GLOBAL(Trace::Error,(_T("Input data is corrupted")));
+            SYSLOG(Logging::Error,(_T("Input data is corrupted")));
         }
         return result;
     }
@@ -146,11 +146,11 @@ static std::string uncompress(const std::vector<uint8_t>& in)
             len *= 2;
             break;
         case Z_MEM_ERROR:
-            TRACE_GLOBAL(Trace::Error,(_T("Z_MEM_ERROR: Not enough memory")));
+            SYSLOG(Logging::Error,(_T("Z_MEM_ERROR: Not enough memory")));
             result.resize(0);
             break;
         case Z_DATA_ERROR:
-            TRACE_GLOBAL(Trace::Error,(_T("Z_DATA_ERROR: Input data is corrupted")));
+            SYSLOG(Logging::Error,(_T("Z_DATA_ERROR: Input data is corrupted")));
             result.resize(0);
             break;
         }
@@ -201,7 +201,7 @@ struct CookieJar::CookieJarPrivate
 
         if (rc != Core::ERROR_NONE)
         {
-            TRACE_GLOBAL(Trace::Error,(_T("Encryption failed, rc = %u"), rc));
+            SYSLOG(Logging::Error,(_T("Encryption failed, rc = %u"), rc));
         }
         else
         {
@@ -220,7 +220,7 @@ struct CookieJar::CookieJarPrivate
 
         if (rc != Core::ERROR_NONE)
         {
-            TRACE_GLOBAL(Trace::Error,(_T("Decryption failed, rc = %u"), rc));
+            SYSLOG(Logging::Error,(_T("Decryption failed, rc = %u"), rc));
         }
         else
         {
@@ -232,7 +232,7 @@ struct CookieJar::CookieJarPrivate
             if (actualChecksum != checksum)
             {
                 rc = Core::ERROR_GENERAL;
-                TRACE_GLOBAL(Trace::Error,(_T("Checksum does not match: actual=%d expected=%d"), actualChecksum, checksum));
+                SYSLOG(Logging::Error,(_T("Checksum does not match: actual=%d expected=%d"), actualChecksum, checksum));
             }
             else
             {

diff --git a/WebKitBrowser/Extension/BridgeObject.cpp b/WebKitBrowser/Extension/BridgeObject.cpp
@@ -65,7 +65,7 @@ static void CallBridge(WebKitWebPage* page, const char* scriptSrc, WebKitUserMes
     gsize decodedLen = 0;
     gchar *decoded = reinterpret_cast<gchar*>(g_base64_decode(payloadPtr, &decodedLen));
     if (g_utf8_validate(decoded, decodedLen, nullptr) == FALSE) {
-        TRACE_GLOBAL(Trace::Error, (_T("Decoded message is not a valid UTF8 string!")));
+        SYSLOG(Logging::Error, (_T("Decoded message is not a valid UTF8 string!")));
         gchar *tmp = decoded;
 #if GLIB_CHECK_VERSION(2, 52, 0)
         decoded = g_utf8_make_valid(tmp, decodedLen);

diff --git a/WebKitBrowser/Extension/Module.h b/WebKitBrowser/Extension/Module.h
@@ -25,7 +25,11 @@
 
 #include <com/com.h>
 #include <core/core.h>
+#ifdef __CORE_MESSAGING__
+#include <messaging/messaging.h>
+#else
 #include <tracing/tracing.h>
+#endif
 
 #undef EXTERNAL
 #define EXTERNAL
diff --git a/WebKitBrowser/Extension/ProcessInfo.cpp b/WebKitBrowser/Extension/ProcessInfo.cpp
@@ -40,9 +40,9 @@ void SetProcessName()
     #error("No implementation available to set process name on this platform")
 #endif
     if (0 != ret ) {
-        TRACE_GLOBAL(Trace::Error, (_T("Setting process name to '%s' FAILED with code %d\n"), processName.c_str(), ret));
+        SYSLOG(Logging::Error, (_T("Setting process name to '%s' FAILED with code %d\n"), processName.c_str(), ret));
     } else {
-        TRACE_GLOBAL(Trace::Error, (_T("Setting process name to '%s' SUCCESS\n"), processName.c_str()));
+        TRACE_GLOBAL(Trace::Information, (_T("Setting process name to '%s' SUCCESS\n"), processName.c_str()));
     }
 }