Skip to content

Commit ef5a707

Browse files
authored
Merge pull request rdkcentral#6315 from filipe-norte-red/wpe-2.46-api-changes-25Q3
RDK-57375: wpe-2.46 integration
2 parents 8fbfbb2 + 1c828a6 commit ef5a707

14 files changed

+114
-23
lines changed

WebKitBrowser/CMakeLists.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ set(PLUGIN_WEBKITBROWSER_XHRCACHE "true" CACHE STRING "XHR Cache")
7878
set(PLUGIN_WEBKITBROWSER_EXTENSION_DIRECTORY "Extension" CACHE STRING "Directory to store extension libraries")
7979
set(PLUGIN_WEBKITBROWSER_LOCALSTORAGE "" CACHE STRING "HTML5 local storage path")
8080
set(PLUGIN_WEBKITBROWSER_COOKIESTORAGE "" CACHE STRING "Browser cookie storage path")
81+
set(PLUGIN_WEBKITBROWSER_INDEXEDDB_ENABLE "false" CACHE STRING "Enable IndexedDB (HTML5) database")
82+
set(PLUGIN_WEBKITBROWSER_INDEXEDDB_PATH "%persistentpath%" CACHE STRING "The directory where IndexedDB databases will be stored")
8183
set(PLUGIN_WEBKITBROWSER_WINDOWCLOSE "false" CACHE STRING "Allow window close")
8284
set(PLUGIN_WEBKITBROWSER_WEBGL "true" CACHE STRING "Enable WebGL")
8385
set(PLUGIN_WEBKITBROWSER_RESOLUTION "720p" CACHE STRING "Browser resolution")
@@ -88,6 +90,8 @@ set(PLUGIN_WEBKITBROWSER_THUNDER_DECRYPTOR_PREFERENCE "true" CACHE STRING "Enabl
8890
set(PLUGIN_WEBKITBROWSER_PERSISTENTPATHPOSTFIX "" CACHE STRING "Specify callsign persistent path postfix")
8991
set(PLUGIN_WEBKITBROWSER_PTSOFFSET "0" CACHE STRING "Set ptsoffset for webkit")
9092
set(PLUGIN_WEBKITBROWSER_USE_EXACT_PATHS "false" CACHE STRING "Use paths specified in configuration options without further modifying them")
93+
set(PLUGIN_WEBKITBROWSER_ORIGIN_STORAGE_RATIO "0" CACHE STRING "The percentage of volume space that can be used for data storage for each domain")
94+
set(PLUGIN_WEBKITBROWSER_TOTAL_STORAGE_RATIO "0" CACHE STRING "The percentage of volume space that can be used for data storage for all domains")
9195
set(PLUGIN_WEBKITBROWSER_GST_QUIRKS "" CACHE STRING "A list of GStreamer quirks to be used by the browser")
9296
set(PLUGIN_WEBKITBROWSER_GST_HOLE_PUNCH_QUIRK "" CACHE STRING "GStreamer hole punch quirk to be used by the browser")
9397

@@ -110,6 +114,8 @@ set(PLUGIN_YOUTUBE_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITB
110114
set(PLUGIN_YOUTUBE_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "YouTube Memory Pressure Networkprocess Poll Interval")
111115
set(PLUGIN_YOUTUBE_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT} CACHE STRING "YouTube Memory Pressure Service Worker kprocess Limit")
112116
set(PLUGIN_YOUTUBE_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "YouTube Memory Pressure Service Worker process Poll Interval")
117+
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")
118+
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")
113119

114120
set(PLUGIN_UX_AUTOSTART "false" CACHE STRING "Automatically start UX plugin")
115121
set(PLUGIN_UX_STARTUPORDER "" CACHE STRING "To configure startup order of UX plugin")
@@ -126,6 +132,8 @@ set(PLUGIN_UX_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSE
126132
set(PLUGIN_UX_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "UX Memory Pressure Networkprocess Poll Interval")
127133
set(PLUGIN_UX_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT} CACHE STRING "UX Memory Pressure Service Worker kprocess Limit")
128134
set(PLUGIN_UX_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "UX Memory Pressure Service Worker process Poll Interval")
135+
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")
136+
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")
129137

130138
set(PLUGIN_APPS_AUTOSTART "false" CACHE STRING "Automatically start Apps plugin")
131139
set(PLUGIN_APPS_STARTUPORDER "" CACHE STRING "To configure startup order of Apps plugin")
@@ -143,6 +151,8 @@ set(PLUGIN_APPS_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROW
143151
set(PLUGIN_APPS_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Apps Memory Pressure Networkprocess Poll Interval")
144152
set(PLUGIN_APPS_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT} CACHE STRING "Apps Memory Pressure Service Worker kprocess Limit")
145153
set(PLUGIN_APPS_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Apps Memory Pressure Service Worker process Poll Interval")
154+
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")
155+
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")
146156

147157
set(PLUGIN_RESIDENT_APP_AUTOSTART "false" CACHE STRING "Automatically start Resident App plugin")
148158
set(PLUGIN_RESIDENT_APP_STARTUPORDER "" CACHE STRING "To configure startup order of Resident App plugin")
@@ -161,6 +171,8 @@ set(PLUGIN_RESIDENT_APP_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL ${PL
161171
set(PLUGIN_RESIDENT_APP_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT} CACHE STRING "Resident App Memory Pressure Service Worker kprocess Limit")
162172
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")
163173
set(PLUGIN_RESIDENT_APP_COMPOSITOR "msaa" CACHE STRING "cairo compositor mode for Resident App")
174+
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")
175+
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")
164176

165177
set(PLUGIN_SEARCH_AND_DISCOVERY_APP_AUTOSTART "false" CACHE STRING "Automatically start Search&Discovery App plugin")
166178
set(PLUGIN_SEARCH_AND_DISCOVERY_APP_STARTUPORDER "" CACHE STRING "To configure startup order of Search&Discovery App plugin")
@@ -178,6 +190,8 @@ set(PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLI
178190
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")
179191
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")
180192
set(PLUGIN_SEARCH_AND_DISCOVERY_APP_COMPOSITOR "msaa" CACHE STRING "cairo compositor mode for Search&Discovery App")
193+
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")
194+
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")
181195

182196
set(PLUGIN_HTML_APP_AUTOSTART "false" CACHE STRING "Automatically start Htmp App plugin")
183197
set(PLUGIN_HTML_APP_STARTUPORDER "" CACHE STRING "To configure startup order of Html App plugin")
@@ -195,6 +209,8 @@ set(PLUGIN_HTML_APP_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN
195209
set(PLUGIN_HTML_APP_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT} CACHE STRING "Html App Memory Pressure Service Worker kprocess Limit")
196210
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")
197211
set(PLUGIN_HTML_APP_COMPOSITOR "noaa" CACHE STRING "cairo compositor mode for Html App")
212+
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")
213+
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")
198214

199215
set(PLUGIN_LIGHTNING_APP_AUTOSTART "false" CACHE STRING "Automatically start Lightning App plugin")
200216
set(PLUGIN_LIGHTNING_APP_STARTUPORDER "" CACHE STRING "To configure startup order of Lightning App plugin")
@@ -212,6 +228,8 @@ set(PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL ${P
212228
set(PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT} CACHE STRING "Lightning App Memory Pressure Service Worker kprocess Limit")
213229
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")
214230
set(PLUGIN_LIGHTNING_APP_COMPOSITOR "noaa" CACHE STRING "cairo compositor mode for Lightning App")
231+
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")
232+
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")
215233

216234
set(PLUGIN_JSPP_AUTOSTART "false" CACHE STRING "Automatically start JSPP plugin")
217235
set(PLUGIN_JSPP_STARTUPORDER "" CACHE STRING "To configure startup order of JSPP plugin")
@@ -228,6 +246,8 @@ set(PLUGIN_JSPP_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEB
228246
set(PLUGIN_JSPP_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT} CACHE STRING "JSPP App Memory Pressure Service Worker kprocess Limit")
229247
set(PLUGIN_JSPP_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "JSPP App Memory Pressure Service Worker process Poll Interval")
230248
set(PLUGIN_JSPP_STARTURL "about:blank" CACHE STRING "JSPP default URL to use")
249+
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")
250+
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")
231251

232252
set(PLUGIN_AMAZON_AUTOSTART "false" CACHE STRING "Automatically start Amazon plugin")
233253
set(PLUGIN_AMAZON_STARTUPORDER "" CACHE STRING "To configure startup order of Amazon plugin")
@@ -243,6 +263,8 @@ set(PLUGIN_AMAZON_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBR
243263
set(PLUGIN_AMAZON_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Amazon App Memory Pressure Networkprocess Poll Interval")
244264
set(PLUGIN_AMAZON_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_LIMIT} CACHE STRING "Amazon App Memory Pressure Service Worker kprocess Limit")
245265
set(PLUGIN_AMAZON_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_SERVICEWORKERPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Amazon App Memory Pressure Service Worker process Poll Interval")
266+
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")
267+
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")
246268

247269
find_package(${NAMESPACE}Plugins REQUIRED)
248270
find_package(${NAMESPACE}Definitions REQUIRED)

WebKitBrowser/HtmlApp.conf.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ configuration.add("localstoragesize", "@PLUGIN_HTML_APP_LOCALSTORAGESIZE@")
3434
configuration.add("cookiestorage", "@PLUGIN_HTML_APP_COOKIESTORAGE@")
3535
configuration.add("indexeddbenabled", "@PLUGIN_HTML_APP_INDEXEDDB_ENABLE@")
3636
configuration.add("indexeddbpath", "@PLUGIN_HTML_APP_INDEXEDDB_PATH@")
37-
configuration.add("indexeddbsize", "@PLUGIN_HTML_APP_INDEXEDDB_SIZE@")
37+
configuration.add("originstorageratio", "@PLUGIN_HTML_APP_ORIGIN_STORAGE_RATIO@")
38+
configuration.add("totalstorageratio", "@PLUGIN_HTML_APP_TOTAL_STORAGE_RATIO@")
3839

3940
if boolean("@PLUGIN_HTML_APP_WINDOWCLOSE@"):
4041
configuration.add("windowclose", "true")

WebKitBrowser/HtmlApp.config

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,11 @@ map()
7171
if(PLUGIN_HTML_APP_INDEXEDDB_PATH)
7272
kv(indexeddbpath ${PLUGIN_HTML_APP_INDEXEDDB_PATH})
7373
endif()
74-
if(PLUGIN_HTML_APP_INDEXEDDB_SIZE)
75-
kv(indexeddbsize ${PLUGIN_HTML_APP_INDEXEDDB_SIZE})
74+
if(PLUGIN_HTML_APP_ORIGIN_STORAGE_RATIO)
75+
kv(originstorageratio ${PLUGIN_HTML_APP_ORIGIN_STORAGE_RATIO})
76+
endif()
77+
if(PLUGIN_HTML_APP_TOTAL_STORAGE_RATIO)
78+
kv(totalstorageratio ${PLUGIN_HTML_APP_TOTAL_STORAGE_RATIO})
7679
endif()
7780
if(PLUGIN_HTML_APP_WINDOWCLOSE)
7881
kv(windowclose ${PLUGIN_HTML_APP_WINDOWCLOSE})

WebKitBrowser/JSPP.conf.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ configuration.add("localstorageenabled", "@PLUGIN_JSPP_LOCALSTORAGE_ENABLE@")
3131
configuration.add("localstorage", "@PLUGIN_JSPP_LOCALSTORAGE@")
3232
configuration.add("localstoragesize", "@PLUGIN_JSPP_LOCALSTORAGESIZE@")
3333
configuration.add("cookiestorage", "@PLUGIN_JSPP_COOKIESTORAGE@")
34+
configuration.add("indexeddbenabled", "@PLUGIN_JSPP_APP_INDEXEDDB_ENABLE@")
35+
configuration.add("indexeddbpath", "@PLUGIN_JSPP_APP_INDEXEDDB_PATH@")
36+
configuration.add("originstorageratio", "@PLUGIN_JSPP_ORIGIN_STORAGE_RATIO@")
37+
configuration.add("totalstorageratio", "@PLUGIN_JSPP_TOTAL_STORAGE_RATIO@")
3438

3539
if boolean("@PLUGIN_JSPP_WINDOWCLOSE@"):
3640
configuration.add("windowclose", "true")

WebKitBrowser/JSPP.config

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,18 @@ map()
6666
if(PLUGIN_JSPP_COOKIESTORAGE)
6767
kv(cookiestorage ${PLUGIN_JSPP_COOKIESTORAGE})
6868
endif()
69+
if(PLUGIN_JSPP_APP_INDEXEDDB_ENABLE)
70+
kv(indexeddbenabled ${PLUGIN_JSPP_APP_INDEXEDDB_ENABLE})
71+
endif()
72+
if(PLUGIN_JSPP_APP_INDEXEDDB_PATH)
73+
kv(indexeddbpath ${PLUGIN_JSPP_APP_INDEXEDDB_PATH})
74+
endif()
75+
if(PLUGIN_JSPP_ORIGIN_STORAGE_RATIO)
76+
kv(originstorageratio ${PLUGIN_JSPP_ORIGIN_STORAGE_RATIO})
77+
endif()
78+
if(PLUGIN_JSPP_TOTAL_STORAGE_RATIO)
79+
kv(totalstorageratio ${PLUGIN_JSPP_TOTAL_STORAGE_RATIO})
80+
endif()
6981
if(PLUGIN_JSPP_WINDOWCLOSE)
7082
kv(windowclose ${PLUGIN_JSPP_WINDOWCLOSE})
7183
endif()

WebKitBrowser/LightningApp.conf.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ configuration.add("localstoragesize", "@PLUGIN_LIGHTNING_APP_LOCALSTORAGESIZE@")
3434
configuration.add("cookiestorage", "@PLUGIN_LIGHTNING_APP_COOKIESTORAGE@")
3535
configuration.add("indexeddbenabled", "@PLUGIN_LIGHTNING_APP_INDEXEDDB_ENABLE@")
3636
configuration.add("indexeddbpath", "@PLUGIN_LIGHTNING_APP_INDEXEDDB_PATH@")
37-
configuration.add("indexeddbsize", "@PLUGIN_LIGHTNING_APP_INDEXEDDB_SIZE@")
37+
configuration.add("originstorageratio", "@PLUGIN_LIGHTNING_APP_ORIGIN_STORAGE_RATIO@")
38+
configuration.add("totalstorageratio", "@PLUGIN_LIGHTNING_APP_TOTAL_STORAGE_RATIO@")
3839

3940
if boolean("@PLUGIN_LIGHTNING_APP_WINDOWCLOSE@"):
4041
configuration.add("windowclose", "true")

WebKitBrowser/LightningApp.config

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,11 @@ map()
7171
if(PLUGIN_LIGHTNING_APP_INDEXEDDB_PATH)
7272
kv(indexeddbpath ${PLUGIN_LIGHTNING_APP_INDEXEDDB_PATH})
7373
endif()
74-
if(PLUGIN_LIGHTNING_APP_INDEXEDDB_SIZE)
75-
kv(indexeddbsize ${PLUGIN_LIGHTNING_APP_INDEXEDDB_SIZE})
74+
if(PLUGIN_LIGHTNING_APP_ORIGIN_STORAGE_RATIO)
75+
kv(originstorageratio ${PLUGIN_LIGHTNING_APP_ORIGIN_STORAGE_RATIO})
76+
endif()
77+
if(PLUGIN_LIGHTNING_APP_TOTAL_STORAGE_RATIO)
78+
kv(totalstorageratio ${PLUGIN_LIGHTNING_APP_TOTAL_STORAGE_RATIO})
7679
endif()
7780
if(PLUGIN_LIGHTNING_APP_WINDOWCLOSE)
7881
kv(windowclose ${PLUGIN_LIGHTNING_APP_WINDOWCLOSE})

WebKitBrowser/ResidentApp.conf.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ configuration.add("localstoragesize", "@PLUGIN_RESIDENT_APP_LOCALSTORAGESIZE@")
3333
configuration.add("cookiestorage", "@PLUGIN_RESIDENT_APP_COOKIESTORAGE@")
3434
configuration.add("indexeddbenabled", "@PLUGIN_RESIDENT_APP_INDEXEDDB_ENABLE@")
3535
configuration.add("indexeddbpath", "@PLUGIN_RESIDENT_APP_INDEXEDDB_PATH@")
36-
configuration.add("indexeddbsize", "@PLUGIN_RESIDENT_APP_INDEXEDDB_SIZE@")
36+
configuration.add("originstorageratio", "@PLUGIN_RESIDENT_APP_ORIGIN_STORAGE_RATIO@")
37+
configuration.add("totalstorageratio", "@PLUGIN_RESIDENT_APP_TOTAL_STORAGE_RATIO@")
3738

3839
if "@PLUGIN_WEBKITBROWSER_CLIENT_CERT@" != "" and "@PLUGIN_WEBKITBROWSER_CLIENT_CERT_KEY@" != "":
3940
configuration.add("clientcert", "@PLUGIN_WEBKITBROWSER_CLIENT_CERT@")

WebKitBrowser/ResidentApp.config

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,11 @@ map()
7373
if(PLUGIN_RESIDENT_APP_INDEXEDDB_PATH)
7474
kv(indexeddbpath ${PLUGIN_RESIDENT_APP_INDEXEDDB_PATH})
7575
endif()
76-
if(PLUGIN_RESIDENT_APP_INDEXEDDB_SIZE)
77-
kv(indexeddbsize ${PLUGIN_RESIDENT_APP_INDEXEDDB_SIZE})
76+
if(PLUGIN_RESIDENT_APP_ORIGIN_STORAGE_RATIO)
77+
kv(originstorageratio ${PLUGIN_RESIDENT_APP_ORIGIN_STORAGE_RATIO})
78+
endif()
79+
if(PLUGIN_RESIDENT_APP_TOTAL_STORAGE_RATIO)
80+
kv(totalstorageratio ${PLUGIN_RESIDENT_APP_TOTAL_STORAGE_RATIO})
7881
endif()
7982
if(PLUGIN_WEBKITBROWSER_CLIENT_CERT AND PLUGIN_WEBKITBROWSER_CLIENT_CERT_KEY)
8083
kv(clientcert ${PLUGIN_WEBKITBROWSER_CLIENT_CERT})

WebKitBrowser/SearchAndDiscoveryApp.conf.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ configuration.add("localstoragesize", "@PLUGIN_SEARCH_AND_DISCOVERY_APP_LOCALSTO
3434
configuration.add("cookiestorage", "@PLUGIN_SEARCH_AND_DISCOVERY_APP_COOKIESTORAGE@")
3535
configuration.add("indexeddbenabled", "@PLUGIN_SEARCH_AND_DISCOVERY_APP_INDEXEDDB_ENABLE@")
3636
configuration.add("indexeddbpath", "@PLUGIN_SEARCH_AND_DISCOVERY_APP_INDEXEDDB_PATH@")
37-
configuration.add("indexeddbsize", "@PLUGIN_SEARCH_AND_DISCOVERY_APP_INDEXEDDB_SIZE@")
37+
configuration.add("originstorageratio", "@PLUGIN_SEARCH_AND_DISCOVERY_APP_ORIGIN_STORAGE_RATIO@")
38+
configuration.add("totalstorageratio", "@PLUGIN_SEARCH_AND_DISCOVERY_APP_TOTAL_STORAGE_RATIO@")
3839

3940
if "@PLUGIN_WEBKITBROWSER_CLIENT_CERT@" != "" and "@PLUGIN_WEBKITBROWSER_CLIENT_CERT_KEY@" != "":
4041
configuration.add("clientcert", "@PLUGIN_WEBKITBROWSER_CLIENT_CERT@")

0 commit comments

Comments
 (0)