Skip to content

Commit fbece25

Browse files
emutavchiemutavchi
authored
Merge branch 'sprint/25Q3' into hdr_settings_2
2 parents ed407a0 + feddce4 commit fbece25

17 files changed

+145
-84
lines changed

‎TextToSpeech/TextToSpeechImplementation.cpp‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#define TTS_MINOR_VERSION 0
3030

3131
#define GET_STR(map, key, def) ((map.HasLabel(key) && !map[key].String().empty() && map[key].String() != "null") ? map[key].String() : def)
32+
#define SERVER_DETAILS "127.0.0.1:9998"
3233

3334
#undef returnResponse
3435
#define returnResponse(success) \
@@ -78,8 +79,32 @@ namespace Plugin {
7879
JsonObject config;
7980
config.FromString(service->ConfigLine());
8081

82+
std::string token;
83+
auto security = service->QueryInterfaceByCallsign<PluginHost::IAuthenticate>("SecurityAgent");
84+
if (nullptr != security)
85+
{
86+
std::string payload = "http://localhost";
87+
if (security->CreateToken(static_cast<uint16_t>(payload.length()),
88+
reinterpret_cast<const uint8_t *>(payload.c_str()),
89+
token) == Core::ERROR_NONE)
90+
{
91+
TTSLOG_INFO("got security token - %s", token.empty() ? "" : token.c_str());
92+
}
93+
else
94+
{
95+
TTSLOG_INFO("Failed to get security token");
96+
}
97+
security->Release();
98+
}
99+
else
100+
{
101+
TTSLOG_INFO("No security agent\n");
102+
}
103+
std::string query = "token=" + token;
104+
Core::SystemInfo::SetEnvironment(_T("THUNDER_ACCESS"), (_T(SERVER_DETAILS)));
105+
81106
TTS::TTSConfiguration *ttsConfig = _ttsManager->configuration();
82-
TTS::RFCURLObserver::getInstance()->triggerRFC(ttsConfig);
107+
TTS::RFCURLObserver::getInstance()->triggerRFC(ttsConfig, query);
83108
ttsConfig->setEndPoint(GET_STR(config, "endpoint", ""));
84109
ttsConfig->setSecureEndPoint(GET_STR(config, "secureendpoint", ""));
85110
ttsConfig->setLocalEndPoint(GET_STR(config, "localendpoint", ""));

‎TextToSpeech/impl/RFCURLObserver.cpp‎

Lines changed: 3 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ RFCURLObserver* RFCURLObserver::getInstance() {
2727
}
2828

2929

30-
void RFCURLObserver::triggerRFC(TTSConfiguration *config)
30+
void RFCURLObserver::triggerRFC(TTSConfiguration *config,std::string token)
3131
{
3232
m_defaultConfig = config;
33+
m_token = token;
3334
fetchURLFromConfig();
3435
std::thread notificationThread(&RFCURLObserver::registerNotification, this);
3536
notificationThread.detach(); // Detach the thread to run independently
@@ -49,65 +50,9 @@ void RFCURLObserver::fetchURLFromConfig() {
4950
}
5051
}
5152

52-
string RFCURLObserver::getSecurityToken() {
53-
std::string token = "token=";
54-
int tokenLength = 0;
55-
unsigned char buffer[MAX_SECURITY_TOKEN_SIZE] = {0};
56-
static std::string endpoint;
57-
58-
if(endpoint.empty()) {
59-
Core::SystemInfo::GetEnvironment(_T("THUNDER_ACCESS"), endpoint);
60-
TTSLOG_INFO("Thunder RPC Endpoint read from env - %s", endpoint.c_str());
61-
}
62-
63-
if(endpoint.empty()) {
64-
Core::File file("/etc/WPEFramework/config.json");
65-
if(file.Open(true)) {
66-
JsonObject config;
67-
if(config.IElement::FromFile(file)) {
68-
Core::JSON::String port = config.Get("port");
69-
Core::JSON::String binding = config.Get("binding");
70-
if(!binding.Value().empty() && !port.Value().empty())
71-
endpoint = binding.Value() + ":" + port.Value();
72-
}
73-
file.Close();
74-
}
75-
if(endpoint.empty())
76-
endpoint = _T("127.0.0.1:9998");
77-
78-
TTSLOG_INFO("Thunder RPC Endpoint read from config file - %s", endpoint.c_str());
79-
Core::SystemInfo::SetEnvironment(_T("THUNDER_ACCESS"), endpoint);
80-
}
81-
82-
string payload = "http://localhost";
83-
if(payload.empty()) {
84-
tokenLength = GetSecurityToken(sizeof(buffer), buffer);
85-
} else {
86-
int buffLength = std::min(sizeof(buffer), payload.length());
87-
::memcpy(buffer, payload.c_str(), buffLength);
88-
tokenLength = GetToken(sizeof(buffer), buffLength, buffer);
89-
}
90-
91-
if(tokenLength > 0) {
92-
token.append((char*)buffer);
93-
} else {
94-
token.clear();
95-
}
96-
97-
TTSLOG_INFO("Thunder token - %s", token.empty() ? "" : token.c_str());
98-
return token;
99-
}
100-
101-
10253
void RFCURLObserver::registerNotification() {
10354
if (m_systemService == nullptr && !m_eventRegistered) {
104-
std::string token = getSecurityToken();
105-
if(token.empty()) {
106-
m_systemService = new WPEFramework::JSONRPC::LinkType<Core::JSON::IElement>(_T(SYSTEMSERVICE_CALLSIGN_VER),"");
107-
} else {
108-
m_systemService = new WPEFramework::JSONRPC::LinkType<Core::JSON::IElement>(_T(SYSTEMSERVICE_CALLSIGN_VER),"", false, token);
109-
}
110-
55+
m_systemService = new WPEFramework::JSONRPC::LinkType<Core::JSON::IElement>(_T(SYSTEMSERVICE_CALLSIGN_VER),"", false, m_token);
11156
while (!m_eventRegistered) {
11257
if (m_systemService->Subscribe<JsonObject>(3000, "onDeviceMgtUpdateReceived",
11358
&RFCURLObserver::onDeviceMgtUpdateReceivedHandler, this) == Core::ERROR_NONE) {

‎TextToSpeech/impl/RFCURLObserver.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace TTS {
88
class RFCURLObserver {
99
public:
1010
static RFCURLObserver* getInstance();
11-
void triggerRFC(TTSConfiguration*);
11+
void triggerRFC(TTSConfiguration*,std::string);
1212
~RFCURLObserver();
1313

1414
private:
@@ -18,12 +18,12 @@ class RFCURLObserver {
1818

1919
void fetchURLFromConfig();
2020
void registerNotification();
21-
string getSecurityToken();
2221

2322
void onDeviceMgtUpdateReceivedHandler(const JsonObject& parameters);
2423

2524
WPEFramework::JSONRPC::LinkType<WPEFramework::Core::JSON::IElement>* m_systemService{nullptr};
2625
bool m_eventRegistered {false};
26+
std::string m_token;
2727
TTSConfiguration *m_defaultConfig;
2828
};
2929

‎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})

0 commit comments

Comments
 (0)