RDK-57375: wpe-2.46 integration

Reason for change: Some APIs were deprecated for wpe-2.46
Test Procedure: See ticket
Risks: Low
Priority: P1

Note: Initial work was done under pull requests 5327 and
5328 by VeithMetro (not merged at the time of this commit).
This is a slightly adjusted version. To note that this
version uses the Core::Partition::Size() instead of
Core::File::Size() to get the storage size, as the latter
will provide the file system directory block entry size.

This is relevant considering the conversation here:
https://github.com/rdkcentral/rdkservices/pull/5328/files#r1613157577

Additionally, the ratio is a float rather than an integer
used as a percentage value. This gives more granularity
in the control of the sizes to use for higher partition
sizes.

Signed-off-by: Filipe Norte <[email protected]>

Author: filipe-norte-red

WebKitBrowser/CMakeLists.txt

@@ -78,6 +78,8 @@ set(PLUGIN_WEBKITBROWSER_XHRCACHE "true" CACHE STRING "XHR Cache")
 set(PLUGIN_WEBKITBROWSER_EXTENSION_DIRECTORY "Extension" CACHE STRING "Directory to store extension libraries")
 set(PLUGIN_WEBKITBROWSER_LOCALSTORAGE "" CACHE STRING "HTML5 local storage path")
 set(PLUGIN_WEBKITBROWSER_COOKIESTORAGE "" CACHE STRING "Browser cookie storage path")
+set(PLUGIN_WEBKITBROWSER_INDEXEDDB_ENABLE "false" CACHE STRING "Enable IndexedDB (HTML5) database")
+set(PLUGIN_WEBKITBROWSER_INDEXEDDB_PATH "%persistentpath%" CACHE STRING "The directory where IndexedDB databases will be stored")
 set(PLUGIN_WEBKITBROWSER_WINDOWCLOSE "false" CACHE STRING "Allow window close")
 set(PLUGIN_WEBKITBROWSER_WEBGL "true" CACHE STRING "Enable WebGL")
 set(PLUGIN_WEBKITBROWSER_RESOLUTION "720p" CACHE STRING "Browser resolution")
@@ -88,6 +90,8 @@ set(PLUGIN_WEBKITBROWSER_THUNDER_DECRYPTOR_PREFERENCE "true" CACHE STRING "Enabl
 set(PLUGIN_WEBKITBROWSER_PERSISTENTPATHPOSTFIX "" CACHE STRING "Specify callsign persistent path postfix")
 set(PLUGIN_WEBKITBROWSER_PTSOFFSET "0" CACHE STRING "Set ptsoffset for webkit")
 set(PLUGIN_WEBKITBROWSER_USE_EXACT_PATHS "false" CACHE STRING "Use paths specified in configuration options without further modifying them") 
+set(PLUGIN_WEBKITBROWSER_ORIGIN_STORAGE_RATIO "0" CACHE STRING "The percentage of volume space that can be used for data storage for each domain")
+set(PLUGIN_WEBKITBROWSER_TOTAL_STORAGE_RATIO "0" CACHE STRING "The percentage of volume space that can be used for data storage for all domains")
 
 set(PLUGIN_YOUTUBE_AUTOSTART "false" CACHE STRING "Automatically start Youtube plugin")
 set(PLUGIN_YOUTUBE_STARTUPORDER "" CACHE STRING "To configure startup order of YouTube plugin")
@@ -108,6 +112,8 @@ set(PLUGIN_YOUTUBE_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITB
 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_YOUTUBE_ORIGIN_STORAGE_RATIO "${PLUGIN_WEBKITBROWSER_ORIGIN_STORAGE_RATIO}" CACHE STRING "The percentage of volume space that can be used for data storage for each domain")
+set(PLUGIN_YOUTUBE_TOTAL_STORAGE_RATIO "${PLUGIN_WEBKITBROWSER_TOTAL_STORAGE_RATIO}" CACHE STRING "The percentage of volume space that can be used for data storage for all domains")
 
 set(PLUGIN_UX_AUTOSTART "false" CACHE STRING "Automatically start UX plugin")
 set(PLUGIN_UX_STARTUPORDER "" CACHE STRING "To configure startup order of UX plugin")
@@ -124,6 +130,8 @@ set(PLUGIN_UX_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSE
 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_UX_ORIGIN_STORAGE_RATIO "${PLUGIN_WEBKITBROWSER_ORIGIN_STORAGE_RATIO}" CACHE STRING "The percentage of volume space that can be used for data storage for each domain")
+set(PLUGIN_UX_TOTAL_STORAGE_RATIO "${PLUGIN_WEBKITBROWSER_TOTAL_STORAGE_RATIO}" CACHE STRING "The percentage of volume space that can be used for data storage for all domains")
 
 set(PLUGIN_APPS_AUTOSTART "false" CACHE STRING "Automatically start Apps plugin")
 set(PLUGIN_APPS_STARTUPORDER "" CACHE STRING "To configure startup order of Apps plugin")
@@ -141,6 +149,8 @@ set(PLUGIN_APPS_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROW
 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_APPS_ORIGIN_STORAGE_RATIO "${PLUGIN_WEBKITBROWSER_ORIGIN_STORAGE_RATIO}" CACHE STRING "The percentage of volume space that can be used for data storage for each domain")
+set(PLUGIN_APPS_TOTAL_STORAGE_RATIO "${PLUGIN_WEBKITBROWSER_TOTAL_STORAGE_RATIO}" CACHE STRING "The percentage of volume space that can be used for data storage for all domains")
 
 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")
@@ -159,6 +169,8 @@ set(PLUGIN_RESIDENT_APP_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL ${PL
 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_RESIDENT_APP_ORIGIN_STORAGE_RATIO "${PLUGIN_WEBKITBROWSER_ORIGIN_STORAGE_RATIO}" CACHE STRING "The percentage of volume space that can be used for data storage for each domain")
+set(PLUGIN_RESIDENT_APP_TOTAL_STORAGE_RATIO "${PLUGIN_WEBKITBROWSER_TOTAL_STORAGE_RATIO}" CACHE STRING "The percentage of volume space that can be used for data storage for all domains")
 
 set(PLUGIN_SEARCH_AND_DISCOVERY_APP_AUTOSTART "false" CACHE STRING "Automatically start Search&Discovery App plugin")
 set(PLUGIN_SEARCH_AND_DISCOVERY_APP_STARTUPORDER "" CACHE STRING "To configure startup order of Search&Discovery App plugin")
@@ -176,6 +188,8 @@ set(PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLI
 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_SEARCH_AND_DISCOVERY_APP_ORIGIN_STORAGE_RATIO "${PLUGIN_WEBKITBROWSER_ORIGIN_STORAGE_RATIO}" CACHE STRING "The percentage of volume space that can be used for data storage for each domain")
+set(PLUGIN_SEARCH_AND_DISCOVERY_APP_TOTAL_STORAGE_RATIO "${PLUGIN_WEBKITBROWSER_TOTAL_STORAGE_RATIO}" CACHE STRING "The percentage of volume space that can be used for data storage for all domains")
 
 set(PLUGIN_HTML_APP_AUTOSTART "false" CACHE STRING "Automatically start Htmp App plugin")
 set(PLUGIN_HTML_APP_STARTUPORDER "" CACHE STRING "To configure startup order of Html App plugin")
@@ -193,6 +207,8 @@ set(PLUGIN_HTML_APP_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN
 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_HTML_APP_ORIGIN_STORAGE_RATIO "${PLUGIN_WEBKITBROWSER_ORIGIN_STORAGE_RATIO}" CACHE STRING "The percentage of volume space that can be used for data storage for each domain")
+set(PLUGIN_HTML_APP_TOTAL_STORAGE_RATIO "${PLUGIN_WEBKITBROWSER_TOTAL_STORAGE_RATIO}" CACHE STRING "The percentage of volume space that can be used for data storage for all domains")
 
 set(PLUGIN_LIGHTNING_APP_AUTOSTART "false" CACHE STRING "Automatically start Lightning App plugin")
 set(PLUGIN_LIGHTNING_APP_STARTUPORDER "" CACHE STRING "To configure startup order of Lightning App plugin")
@@ -210,6 +226,8 @@ set(PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL ${P
 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_LIGHTNING_APP_ORIGIN_STORAGE_RATIO "${PLUGIN_WEBKITBROWSER_ORIGIN_STORAGE_RATIO}" CACHE STRING "The percentage of volume space that can be used for data storage for each domain")
+set(PLUGIN_LIGHTNING_APP_TOTAL_STORAGE_RATIO "${PLUGIN_WEBKITBROWSER_TOTAL_STORAGE_RATIO}" CACHE STRING "The percentage of volume space that can be used for data storage for all domains")
 
 set(PLUGIN_JSPP_AUTOSTART "false" CACHE STRING "Automatically start JSPP plugin")
 set(PLUGIN_JSPP_STARTUPORDER "" CACHE STRING "To configure startup order of JSPP plugin")
@@ -226,6 +244,8 @@ set(PLUGIN_JSPP_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEB
 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_JSPP_ORIGIN_STORAGE_RATIO "${PLUGIN_WEBKITBROWSER_ORIGIN_STORAGE_RATIO}" CACHE STRING "The percentage of volume space that can be used for data storage for each domain")
+set(PLUGIN_JSPP_TOTAL_STORAGE_RATIO "${PLUGIN_WEBKITBROWSER_TOTAL_STORAGE_RATIO}" CACHE STRING "The percentage of volume space that can be used for data storage for all domains")
 
 set(PLUGIN_AMAZON_AUTOSTART "false" CACHE STRING "Automatically start Amazon plugin")
 set(PLUGIN_AMAZON_STARTUPORDER "" CACHE STRING "To configure startup order of Amazon plugin")
@@ -241,6 +261,8 @@ set(PLUGIN_AMAZON_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBR
 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")
+set(PLUGIN_AMAZON_ORIGIN_STORAGE_RATIO "${PLUGIN_WEBKITBROWSER_ORIGIN_STORAGE_RATIO}" CACHE STRING "The percentage of volume space that can be used for data storage for each domain")
+set(PLUGIN_AMAZON_TOTAL_STORAGE_RATIO "${PLUGIN_WEBKITBROWSER_TOTAL_STORAGE_RATIO}" CACHE STRING "The percentage of volume space that can be used for data storage for all domains")
 
 find_package(${NAMESPACE}Plugins REQUIRED)
 find_package(${NAMESPACE}Definitions REQUIRED)

WebKitBrowser/HtmlApp.conf.in

@@ -39,7 +39,8 @@ configuration.add("localstoragesize", "@PLUGIN_HTML_APP_LOCALSTORAGESIZE@")
 configuration.add("cookiestorage", "@PLUGIN_HTML_APP_COOKIESTORAGE@")
 configuration.add("indexeddbenabled", "@PLUGIN_HTML_APP_INDEXEDDB_ENABLE@")
 configuration.add("indexeddbpath", "@PLUGIN_HTML_APP_INDEXEDDB_PATH@")
-configuration.add("indexeddbsize", "@PLUGIN_HTML_APP_INDEXEDDB_SIZE@")
+configuration.add("originstorageratio", "@PLUGIN_HTML_APP_ORIGIN_STORAGE_RATIO@")
+configuration.add("totalstorageratio", "@PLUGIN_HTML_APP_TOTAL_STORAGE_RATIO@")
 
 if boolean("@PLUGIN_HTML_APP_WINDOWCLOSE@"):
     configuration.add("windowclose", "true")

WebKitBrowser/HtmlApp.config

@@ -75,8 +75,11 @@ map()
     if(PLUGIN_HTML_APP_INDEXEDDB_PATH)
         kv(indexeddbpath ${PLUGIN_HTML_APP_INDEXEDDB_PATH})
     endif()
-    if(PLUGIN_HTML_APP_INDEXEDDB_SIZE)
-        kv(indexeddbsize ${PLUGIN_HTML_APP_INDEXEDDB_SIZE})
+    if(PLUGIN_HTML_APP_ORIGIN_STORAGE_RATIO)
+        kv(originstorageratio ${PLUGIN_HTML_APP_ORIGIN_STORAGE_RATIO})
+    endif()
+    if(PLUGIN_HTML_APP_TOTAL_STORAGE_RATIO)
+        kv(totalstorageratio ${PLUGIN_HTML_APP_TOTAL_STORAGE_RATIO})
     endif()
     if(PLUGIN_HTML_APP_WINDOWCLOSE)
         kv(windowclose ${PLUGIN_HTML_APP_WINDOWCLOSE})

WebKitBrowser/JSPP.conf.in

@@ -36,6 +36,10 @@ configuration.add("localstorageenabled", "@PLUGIN_JSPP_LOCALSTORAGE_ENABLE@")
 configuration.add("localstorage", "@PLUGIN_JSPP_LOCALSTORAGE@")
 configuration.add("localstoragesize", "@PLUGIN_JSPP_LOCALSTORAGESIZE@")
 configuration.add("cookiestorage", "@PLUGIN_JSPP_COOKIESTORAGE@")
+configuration.add("indexeddbenabled", "@PLUGIN_JSPP_APP_INDEXEDDB_ENABLE@")
+configuration.add("indexeddbpath", "@PLUGIN_JSPP_APP_INDEXEDDB_PATH@")
+configuration.add("originstorageratio", "@PLUGIN_JSPP_ORIGIN_STORAGE_RATIO@")
+configuration.add("totalstorageratio", "@PLUGIN_JSPP_TOTAL_STORAGE_RATIO@")
 
 if boolean("@PLUGIN_JSPP_WINDOWCLOSE@"):
     configuration.add("windowclose", "true")

WebKitBrowser/JSPP.config

@@ -70,6 +70,18 @@ map()
     if(PLUGIN_JSPP_COOKIESTORAGE)
         kv(cookiestorage ${PLUGIN_JSPP_COOKIESTORAGE})
     endif()
+    if(PLUGIN_JSPP_APP_INDEXEDDB_ENABLE)
+        kv(indexeddbenabled ${PLUGIN_JSPP_APP_INDEXEDDB_ENABLE})
+    endif()
+    if(PLUGIN_JSPP_APP_INDEXEDDB_PATH)
+        kv(indexeddbpath ${PLUGIN_JSPP_APP_INDEXEDDB_PATH})
+    endif()
+    if(PLUGIN_JSPP_ORIGIN_STORAGE_RATIO)
+        kv(originstorageratio ${PLUGIN_JSPP_ORIGIN_STORAGE_RATIO})
+    endif()
+    if(PLUGIN_JSPP_TOTAL_STORAGE_RATIO)
+        kv(totalstorageratio ${PLUGIN_JSPP_TOTAL_STORAGE_RATIO})
+    endif()
     if(PLUGIN_JSPP_WINDOWCLOSE)
         kv(windowclose ${PLUGIN_JSPP_WINDOWCLOSE})
     endif()

WebKitBrowser/LightningApp.conf.in

@@ -39,7 +39,8 @@ configuration.add("localstoragesize", "@PLUGIN_LIGHTNING_APP_LOCALSTORAGESIZE@")
 configuration.add("cookiestorage", "@PLUGIN_LIGHTNING_APP_COOKIESTORAGE@")
 configuration.add("indexeddbenabled", "@PLUGIN_LIGHTNING_APP_INDEXEDDB_ENABLE@")
 configuration.add("indexeddbpath", "@PLUGIN_LIGHTNING_APP_INDEXEDDB_PATH@")
-configuration.add("indexeddbsize", "@PLUGIN_LIGHTNING_APP_INDEXEDDB_SIZE@")
+configuration.add("originstorageratio", "@PLUGIN_LIGHTNING_APP_ORIGIN_STORAGE_RATIO@")
+configuration.add("totalstorageratio", "@PLUGIN_LIGHTNING_APP_TOTAL_STORAGE_RATIO@")
 
 if boolean("@PLUGIN_LIGHTNING_APP_WINDOWCLOSE@"):
     configuration.add("windowclose", "true")

WebKitBrowser/LightningApp.config

@@ -75,8 +75,11 @@ map()
     if(PLUGIN_LIGHTNING_APP_INDEXEDDB_PATH)
         kv(indexeddbpath ${PLUGIN_LIGHTNING_APP_INDEXEDDB_PATH})
     endif()
-    if(PLUGIN_LIGHTNING_APP_INDEXEDDB_SIZE)
-        kv(indexeddbsize ${PLUGIN_LIGHTNING_APP_INDEXEDDB_SIZE})
+    if(PLUGIN_LIGHTNING_APP_ORIGIN_STORAGE_RATIO)
+        kv(originstorageratio ${PLUGIN_LIGHTNING_APP_ORIGIN_STORAGE_RATIO})
+    endif()
+    if(PLUGIN_LIGHTNING_APP_TOTAL_STORAGE_RATIO)
+        kv(totalstorageratio ${PLUGIN_LIGHTNING_APP_TOTAL_STORAGE_RATIO})
     endif()
     if(PLUGIN_LIGHTNING_APP_WINDOWCLOSE)
         kv(windowclose ${PLUGIN_LIGHTNING_APP_WINDOWCLOSE})

WebKitBrowser/ResidentApp.conf.in

@@ -38,7 +38,8 @@ configuration.add("localstoragesize", "@PLUGIN_RESIDENT_APP_LOCALSTORAGESIZE@")
 configuration.add("cookiestorage", "@PLUGIN_RESIDENT_APP_COOKIESTORAGE@")
 configuration.add("indexeddbenabled", "@PLUGIN_RESIDENT_APP_INDEXEDDB_ENABLE@")
 configuration.add("indexeddbpath", "@PLUGIN_RESIDENT_APP_INDEXEDDB_PATH@")
-configuration.add("indexeddbsize", "@PLUGIN_RESIDENT_APP_INDEXEDDB_SIZE@")
+configuration.add("originstorageratio", "@PLUGIN_RESIDENT_APP_ORIGIN_STORAGE_RATIO@")
+configuration.add("totalstorageratio", "@PLUGIN_RESIDENT_APP_TOTAL_STORAGE_RATIO@")
 
 if "@PLUGIN_WEBKITBROWSER_CLIENT_CERT@" != "" and "@PLUGIN_WEBKITBROWSER_CLIENT_CERT_KEY@" != "":
     configuration.add("clientcert", "@PLUGIN_WEBKITBROWSER_CLIENT_CERT@")

WebKitBrowser/ResidentApp.config

@@ -76,8 +76,11 @@ map()
     if(PLUGIN_RESIDENT_APP_INDEXEDDB_PATH)
         kv(indexeddbpath ${PLUGIN_RESIDENT_APP_INDEXEDDB_PATH})
     endif()
-    if(PLUGIN_RESIDENT_APP_INDEXEDDB_SIZE)
-        kv(indexeddbsize ${PLUGIN_RESIDENT_APP_INDEXEDDB_SIZE})
+    if(PLUGIN_RESIDENT_APP_ORIGIN_STORAGE_RATIO)
+        kv(originstorageratio ${PLUGIN_RESIDENT_APP_ORIGIN_STORAGE_RATIO})
+    endif()
+    if(PLUGIN_RESIDENT_APP_TOTAL_STORAGE_RATIO)
+        kv(totalstorageratio ${PLUGIN_RESIDENT_APP_TOTAL_STORAGE_RATIO})
     endif()
     if(PLUGIN_WEBKITBROWSER_CLIENT_CERT AND PLUGIN_WEBKITBROWSER_CLIENT_CERT_KEY)
         kv(clientcert ${PLUGIN_WEBKITBROWSER_CLIENT_CERT})

WebKitBrowser/SearchAndDiscoveryApp.conf.in

@@ -39,7 +39,8 @@ configuration.add("localstoragesize", "@PLUGIN_SEARCH_AND_DISCOVERY_APP_LOCALSTO
 configuration.add("cookiestorage", "@PLUGIN_SEARCH_AND_DISCOVERY_APP_COOKIESTORAGE@")
 configuration.add("indexeddbenabled", "@PLUGIN_SEARCH_AND_DISCOVERY_APP_INDEXEDDB_ENABLE@")
 configuration.add("indexeddbpath", "@PLUGIN_SEARCH_AND_DISCOVERY_APP_INDEXEDDB_PATH@")
-configuration.add("indexeddbsize", "@PLUGIN_SEARCH_AND_DISCOVERY_APP_INDEXEDDB_SIZE@")
+configuration.add("originstorageratio", "@PLUGIN_SEARCH_AND_DISCOVERY_APP_ORIGIN_STORAGE_RATIO@")
+configuration.add("totalstorageratio", "@PLUGIN_SEARCH_AND_DISCOVERY_APP_TOTAL_STORAGE_RATIO@")
 
 if "@PLUGIN_WEBKITBROWSER_CLIENT_CERT@" != "" and "@PLUGIN_WEBKITBROWSER_CLIENT_CERT_KEY@" != "":
     configuration.add("clientcert", "@PLUGIN_WEBKITBROWSER_CLIENT_CERT@")