Merge branch 'master' of github.com:WebPlatformForEmbedded/ThunderNan…

…oServicesRDK into R3
WebPlatformForEmbedded · Aug 9, 2021 · 788e865 · 788e865
2 parents 3417568 + c9b4c12
commit 788e865
Show file tree

Hide file tree

Showing 15 changed files with 136 additions and 35 deletions.
diff --git a/Messenger/Messenger.config b/Messenger/Messenger.config
@@ -1,9 +1,17 @@
-set (autostart ${PLUGIN_MESSENGER_AUTOSTART})
+set(autostart ${PLUGIN_MESSENGER_AUTOSTART})
 
 map()
     key(root)
     map()
-      kv(outofprocess ${PLUGIN_MESSENGER_OUTOFPROCESS})
+        if(PLUGIN_MESSENGER_MODE)
+            kv(mode ${PLUGIN_MESSENGER_MODE})
+        else()
+            if(PLUGIN_MESSENGER_OUTOFPROCESS)
+                kv(mode "Local")
+            else()
+                kv(mode "Off")
+            endif()
+        endif()
     end()
 end()
 

diff --git a/OpenCDMi/OCDM.config b/OpenCDMi/OCDM.config
@@ -7,7 +7,15 @@ if(PLUGIN_OPENCDMI_PLAYREADY_NEXUS OR PLUGIN_OPENCDMI_PLAYREADY_NEXUS_SVP OR PLU
 endif()
 
 map()
-    kv(outofprocess ${PLUGIN_OPENCDMI_OUTOFPROCESS})
+    if(PLUGIN_OPENCDMI_MODE)
+        kv(mode ${PLUGIN_OPENCDMI_MODE})
+    else()
+        if(PLUGIN_OPENCDMI_OUTOFPROCESS)
+            kv(mode "Local")
+        else()
+            kv(mode "Off")
+        endif()
+    endif()
     if(PLUGIN_OPENCDMI_USER)
         kv(user ${PLUGIN_OPENCDMI_USER})
     endif()

diff --git a/Packager/Packager.config b/Packager/Packager.config
@@ -3,7 +3,15 @@ set(autostart ${PLUGIN_PACKAGER_AUTOSTART})
 map()
     key(root)
     map()
-      kv(outofprocess ${PLUGIN_PACKAGER_OUTOFPROCESS})
+        if(PLUGIN_PACKAGER_MODE)
+            kv(mode ${PLUGIN_PACKAGER_MODE})
+        else()
+            if(PLUGIN_PACKAGER_OUTOFPROCESS)
+                kv(mode "Local")
+            else()
+                kv(mode "Off")
+            endif()
+        endif()
     end()
 end()
 ans(configuration)
diff --git a/WebKitBrowser/Amazon.config b/WebKitBrowser/Amazon.config
@@ -3,7 +3,11 @@ set(autostart ${PLUGIN_AMAZON_AUTOSTART})
 set(preconditions Graphics Internet)
 
 map()
-    kv(outofprocess true)
+    if(PLUGIN_AMAZON_MODE)
+        kv(mode ${PLUGIN_AMAZON_MODE})
+    else()
+        kv(mode "Local")
+    endif()
     kv(locator lib${PLUGIN_WEBKITBROWSER_IMPLEMENTATION}.so)
     if(PLUGIN_AMAZON_USER)
         kv(user ${PLUGIN_AMAZON_USER})

diff --git a/WebKitBrowser/Apps.config b/WebKitBrowser/Apps.config
@@ -3,7 +3,11 @@ set(autostart ${PLUGIN_APPS_AUTOSTART})
 set(preconditions Graphics Internet)
 
 map()
-    kv(outofprocess true)
+    if(PLUGIN_APPS_MODE)
+        kv(mode ${PLUGIN_APPS_MODE})
+    else()
+        kv(mode "Local")
+    endif()
     kv(locator lib${PLUGIN_WEBKITBROWSER_IMPLEMENTATION}.so)
 end()
 ans(rootobject)

diff --git a/WebKitBrowser/HtmlApp.config b/WebKitBrowser/HtmlApp.config
@@ -3,7 +3,11 @@ set(autostart ${PLUGIN_HTML_APP_AUTOSTART})
 set(preconditions Graphics Internet)
 
 map()
-    kv(outofprocess true)
+    if(PLUGIN_HTML_APP_MODE)
+        kv(mode ${PLUGIN_HTML_APP_MODE})
+    else()
+        kv(mode "Local")
+    endif()
     kv(locator lib${PLUGIN_WEBKITBROWSER_IMPLEMENTATION}.so)
     if(PLUGIN_WEBKITBROWSER_USER)
         kv(user ${PLUGIN_WEBKITBROWSER_USER})

diff --git a/WebKitBrowser/LightningApp.config b/WebKitBrowser/LightningApp.config
@@ -3,7 +3,11 @@ set(autostart ${PLUGIN_LIGHTNING_APP_AUTOSTART})
 set(preconditions Graphics Internet)
 
 map()
-    kv(outofprocess true)
+    if(PLUGIN_LIGHTNING_APP_MODE)
+        kv(mode ${PLUGIN_LIGHTNING_APP_MODE})
+    else()
+        kv(mode "Local")
+    endif()
     kv(locator lib${PLUGIN_WEBKITBROWSER_IMPLEMENTATION}.so)
     if(PLUGIN_WEBKITBROWSER_USER)
         kv(user ${PLUGIN_WEBKITBROWSER_USER})

diff --git a/WebKitBrowser/ResidentApp.config b/WebKitBrowser/ResidentApp.config
@@ -4,7 +4,11 @@ set(resumed true)
 set(preconditions Graphics)
 
 map()
-    kv(outofprocess true)
+    if(PLUGIN_RESIDENT_APP_MODE)
+        kv(mode ${PLUGIN_RESIDENT_APP_MODE})
+    else()
+        kv(mode "Local")
+    endif()
     kv(locator lib${PLUGIN_WEBKITBROWSER_IMPLEMENTATION}.so)
     if(PLUGIN_WEBKITBROWSER_USER)
         kv(user ${PLUGIN_WEBKITBROWSER_USER})

diff --git a/WebKitBrowser/SearchAndDiscoveryApp.config b/WebKitBrowser/SearchAndDiscoveryApp.config
@@ -3,7 +3,11 @@ set(autostart ${PLUGIN_SEARCH_AND_DISCOVERY_APP_AUTOSTART})
 set(preconditions Graphics)
 
 map()
-    kv(outofprocess true)
+    if(PLUGIN_SEARCH_AND_DISCOVERY_APP_MODE)
+        kv(mode ${PLUGIN_SEARCH_AND_DISCOVERY_APP_MODE})
+    else()
+        kv(mode "Local")
+    endif()
     kv(locator lib${PLUGIN_WEBKITBROWSER_IMPLEMENTATION}.so)
     if(PLUGIN_WEBKITBROWSER_USER)
         kv(user ${PLUGIN_WEBKITBROWSER_USER})

diff --git a/WebKitBrowser/UX.config b/WebKitBrowser/UX.config
@@ -3,7 +3,11 @@ set(autostart ${PLUGIN_UX_AUTOSTART})
 set(preconditions Graphics)
 
 map()
-    kv(outofprocess true)
+    if(PLUGIN_UX_MODE)
+        kv(mode ${PLUGIN_UX_MODE})
+    else()
+        kv(mode "Local")
+    endif()
     kv(locator lib${PLUGIN_WEBKITBROWSER_IMPLEMENTATION}.so)
     if(PLUGIN_WEBKITBROWSER_USER)
         kv(user ${PLUGIN_WEBKITBROWSER_USER})

diff --git a/WebKitBrowser/WebKitBrowser.config b/WebKitBrowser/WebKitBrowser.config
@@ -8,7 +8,11 @@ else()
 endif(PLUGIN_WEBSERVER)
 
 map()
-    kv(outofprocess true)
+    if(PLUGIN_WEBKITBROWSER_MODE)
+        kv(mode ${PLUGIN_WEBKITBROWSER_MODE})
+    else()
+        kv(mode "Local")
+    endif()
     kv(locator lib${PLUGIN_WEBKITBROWSER_IMPLEMENTATION}.so)
     if(PLUGIN_WEBKITBROWSER_USER)
         kv(user ${PLUGIN_WEBKITBROWSER_USER})

diff --git a/WebKitBrowser/WebKitBrowser.cpp b/WebKitBrowser/WebKitBrowser.cpp
@@ -285,10 +285,10 @@ namespace Plugin {
         Exchange::JWebBrowser::Event::PageClosure(*this);
     }
 
-    void WebKitBrowser::BridgeQueryResponse(const string& message)
+    void WebKitBrowser::BridgeQuery(const string& message)
     {
-        TRACE(Trace::Information, (_T("BridgeQueryResponse: %s"), message.c_str()));
-       event_bridgequery(message);
+        TRACE(Trace::Information, (_T("BridgeQuery: %s"), message.c_str()));
+        event_bridgequery(message);
     }
 
     void WebKitBrowser::StateChange(const PluginHost::IStateControl::state state)

diff --git a/WebKitBrowser/WebKitBrowser.h b/WebKitBrowser/WebKitBrowser.h
@@ -83,9 +83,9 @@ namespace Plugin {
             {
                 _parent.PageClosure();
             }
-            void BridgeQueryResponse(const string& message) override
+            void BridgeQuery(const string& message) override
             {
-                _parent.BridgeQueryResponse(message);
+                _parent.BridgeQuery(message);
             }
             void StateChange(const PluginHost::IStateControl::state state) override
             {
@@ -216,7 +216,7 @@ namespace Plugin {
         void URLChange(const string& URL, bool loaded);
         void VisibilityChange(const bool hidden);
         void PageClosure();
-        void BridgeQueryResponse(const string& message);
+        void BridgeQuery(const string& message);
         void StateChange(const PluginHost::IStateControl::state state);
         uint32_t DeleteDir(const string& path);