[WebKitBrowser] Updating IndexedDB to match version 2.42 of WPEWebKit

WebKitBrowser/CMakeLists.txt

@@ -62,6 +62,10 @@ 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 "%persistentpath%" CACHE STRING "HTML5 local storage path")
 set(PLUGIN_WEBKITBROWSER_COOKIESTORAGE "%persistentpath%" 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_INDEXEDDB_SIZE "" CACHE STRING "The percentage of volume space that can be used for data storage for each domain")
+set(PLUGIN_WEBKITBROWSER_INDEXEDDB_TOTAL_SIZE "" CACHE STRING "The percentage of volume space that can be used for data storage for all domains")
 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")

WebKitBrowser/HtmlApp.conf.in

@@ -38,6 +38,7 @@ 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("indexeddbtotalsize", "@PLUGIN_HTML_APP_INDEXEDDB_TOTAL_SIZE@")
 
 if boolean("@PLUGIN_HTML_APP_WINDOWCLOSE@"):
     configuration.add("windowclose", "true")

WebKitBrowser/HtmlApp.config

@@ -69,15 +69,20 @@ map()
     if(PLUGIN_HTML_APP_COOKIESTORAGE)
         kv(cookiestorage ${PLUGIN_HTML_APP_COOKIESTORAGE})
     endif()
+
     if(PLUGIN_HTML_APP_INDEXEDDB_ENABLE)
         kv(indexeddbenabled ${PLUGIN_HTML_APP_INDEXEDDB_ENABLE})
+        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})
+        endif()
+        if(PLUGIN_HTML_APP_INDEXEDDB_TOTAL_SIZE)
+            kv(indexeddbtotalsize ${PLUGIN_HTML_APP_INDEXEDDB_TOTAL_SIZE})
+        endif()
     endif()
-    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})
-    endif()
+
     if(PLUGIN_HTML_APP_WINDOWCLOSE)
         kv(windowclose ${PLUGIN_HTML_APP_WINDOWCLOSE})
     endif()

WebKitBrowser/JSPP.conf.in

@@ -39,6 +39,7 @@ configuration.add("cookiestorage", "@PLUGIN_JSPP_COOKIESTORAGE@")
 configuration.add("indexeddbenabled", "@PLUGIN_JSPP_INDEXEDDB_ENABLE@")
 configuration.add("indexeddbpath", "@PLUGIN_JSPP_INDEXEDDB_PATH@")
 configuration.add("indexeddbsize", "@PLUGIN_JSPP_INDEXEDDB_SIZE@")
+configuration.add("indexeddbtotalsize", "@PLUGIN_JSPP_INDEXEDDB_TOTAL_SIZE@")
 
 if boolean("@PLUGIN_JSPP_WINDOWCLOSE@"):
     configuration.add("windowclose", "true")

WebKitBrowser/JSPP.config

@@ -70,6 +70,20 @@ map()
     if(PLUGIN_JSPP_COOKIESTORAGE)
         kv(cookiestorage ${PLUGIN_JSPP_COOKIESTORAGE})
     endif()
+
+    if(PLUGIN_JSPP_INDEXEDDB_ENABLE)
+        kv(indexeddbenabled ${PLUGIN_JSPP_INDEXEDDB_ENABLE})
+        if(PLUGIN_JSPP_INDEXEDDB_PATH)
+            kv(indexeddbpath ${PLUGIN_JSPP_INDEXEDDB_PATH})
+        endif()
+        if(PLUGIN_JSPP_INDEXEDDB_SIZE)
+            kv(indexeddbsize ${PLUGIN_JSPP_INDEXEDDB_SIZE})
+        endif()
+        if(PLUGIN_JSPP_INDEXEDDB_TOTAL_SIZE)
+            kv(indexeddbtotalsize ${PLUGIN_JSPP_INDEXEDDB_TOTAL_SIZE})
+        endif()
+    endif()
+
     if(PLUGIN_JSPP_WINDOWCLOSE)
         kv(windowclose ${PLUGIN_JSPP_WINDOWCLOSE})
     endif()

WebKitBrowser/LightningApp.conf.in

@@ -38,6 +38,7 @@ 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("indexeddbtotalsize", "@PLUGIN_LIGHTNING_APP_INDEXEDDB_TOTAL_SIZE@")
 
 if boolean("@PLUGIN_LIGHTNING_APP_WINDOWCLOSE@"):
     configuration.add("windowclose", "true")

WebKitBrowser/LightningApp.config

@@ -69,15 +69,20 @@ map()
     if(PLUGIN_LIGHTNING_APP_COOKIESTORAGE)
         kv(cookiestorage ${PLUGIN_LIGHTNING_APP_COOKIESTORAGE})
     endif()
+
     if(PLUGIN_LIGHTNING_APP_INDEXEDDB_ENABLE)
         kv(indexeddbenabled ${PLUGIN_LIGHTNING_APP_INDEXEDDB_ENABLE})
+        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})
+        endif()
+        if(PLUGIN_LIGHTNING_APP_INDEXEDDB_TOTAL_SIZE)
+            kv(indexeddbtotalsize ${PLUGIN_LIGHTNING_APP_INDEXEDDB_TOTAL_SIZE})
+        endif()
     endif()
-    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})
-    endif()
+
     if(PLUGIN_LIGHTNING_APP_WINDOWCLOSE)
         kv(windowclose ${PLUGIN_LIGHTNING_APP_WINDOWCLOSE})
     endif()

WebKitBrowser/ResidentApp.conf.in

@@ -38,6 +38,7 @@ 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("indexeddbtotalsize", "@PLUGIN_RESIDENT_APP_INDEXEDDB_TOTAL_SIZE@")
 
 if "@PLUGIN_WEBKITBROWSER_CLIENT_CERT@" != "" and "@PLUGIN_WEBKITBROWSER_CLIENT_CERT_KEY@" != "":
     configuration.add("clientcert", "@PLUGIN_WEBKITBROWSER_CLIENT_CERT@")

WebKitBrowser/ResidentApp.config

@@ -70,15 +70,20 @@ map()
     if(PLUGIN_RESIDENT_APP_COOKIESTORAGE)
         kv(cookiestorage ${PLUGIN_RESIDENT_APP_COOKIESTORAGE})
     endif()
+
     if(PLUGIN_RESIDENT_APP_INDEXEDDB_ENABLE)
         kv(indexeddbenabled ${PLUGIN_RESIDENT_APP_INDEXEDDB_ENABLE})
+        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})
+        endif()
+        if(PLUGIN_RESIDENT_APP_INDEXEDDB_TOTAL_SIZE)
+            kv(indexeddbtotalsize ${PLUGIN_RESIDENT_APP_INDEXEDDB_TOTAL_SIZE})
+        endif()
     endif()
-    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})
-    endif()
+
     if(PLUGIN_WEBKITBROWSER_CLIENT_CERT AND PLUGIN_WEBKITBROWSER_CLIENT_CERT_KEY)
         kv(clientcert ${PLUGIN_WEBKITBROWSER_CLIENT_CERT})
         kv(clientcertkey ${PLUGIN_WEBKITBROWSER_CLIENT_CERT_KEY})

WebKitBrowser/SearchAndDiscoveryApp.conf.in

@@ -37,6 +37,7 @@ configuration.add("cookiestorage", "@PLUGIN_SEARCH_AND_DISCOVERY_APP_COOKIESTORA
 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("indexeddbtotalsize", "@PLUGIN_SEARCH_AND_DISCOVERY_APP_INDEXEDDB_TOTAL_SIZE@")
 
 if "@PLUGIN_WEBKITBROWSER_CLIENT_CERT@" != "" and "@PLUGIN_WEBKITBROWSER_CLIENT_CERT_KEY@" != "":
     configuration.add("clientcert", "@PLUGIN_WEBKITBROWSER_CLIENT_CERT@")

WebKitBrowser/SearchAndDiscoveryApp.config

@@ -67,15 +67,20 @@ map()
     if(PLUGIN_SEARCH_AND_DISCOVERY_APP_COOKIESTORAGE)
         kv(cookiestorage ${PLUGIN_SEARCH_AND_DISCOVERY_APP_COOKIESTORAGE})
     endif()
+
     if(PLUGIN_SEARCH_AND_DISCOVERY_APP_INDEXEDDB_ENABLE)
         kv(indexeddbenabled ${PLUGIN_SEARCH_AND_DISCOVERY_APP_INDEXEDDB_ENABLE})
+        if(PLUGIN_SEARCH_AND_DISCOVERY_APP_INDEXEDDB_PATH)
+            kv(indexeddbpath ${PLUGIN_SEARCH_AND_DISCOVERY_APP_INDEXEDDB_PATH})
+        endif()
+        if(PLUGIN_SEARCH_AND_DISCOVERY_APP_INDEXEDDB_SIZE)
+            kv(indexeddbsize ${PLUGIN_SEARCH_AND_DISCOVERY_APP_INDEXEDDB_SIZE})
+        endif()
+        if(PLUGIN_SEARCH_AND_DISCOVERY_APP_INDEXEDDB_TOTAL_SIZE)
+            kv(indexeddbtotalsize ${PLUGIN_SEARCH_AND_DISCOVERY_APP_INDEXEDDB_TOTAL_SIZE})
+        endif()
     endif()
-    if(PLUGIN_SEARCH_AND_DISCOVERY_APP_INDEXEDDB_PATH)
-        kv(indexeddbpath ${PLUGIN_SEARCH_AND_DISCOVERY_APP_INDEXEDDB_PATH})
-    endif()
-    if(PLUGIN_SEARCH_AND_DISCOVERY_APP_INDEXEDDB_SIZE)
-        kv(indexeddbsize ${PLUGIN_SEARCH_AND_DISCOVERY_APP_INDEXEDDB_SIZE})
-    endif()
+
     if(PLUGIN_WEBKITBROWSER_CLIENT_CERT AND PLUGIN_WEBKITBROWSER_CLIENT_CERT_KEY)
         kv(clientcert ${PLUGIN_WEBKITBROWSER_CLIENT_CERT})
         kv(clientcertkey ${PLUGIN_WEBKITBROWSER_CLIENT_CERT_KEY})

WebKitBrowser/WebKitBrowser.conf.in

@@ -44,6 +44,7 @@ configuration.add("cookiestorage", "@PLUGIN_WEBKITBROWSER_COOKIESTORAGE@")
 configuration.add("indexeddbenabled", "@PLUGIN_WEBKITBROWSER_INDEXEDDB_ENABLE@")
 configuration.add("indexeddbpath", "@PLUGIN_WEBKITBROWSER_INDEXEDDB_PATH@")
 configuration.add("indexeddbsize", "@PLUGIN_WEBKITBROWSER_INDEXEDDB_SIZE@")
+configuration.add("indexeddbtotalsize", "@PLUGIN_WEBKITBROWSER_INDEXEDDB_TOTAL_SIZE@")
 
 if boolean("@PLUGIN_WEBKITBROWSER_WINDOWCLOSE@"):
     configuration.add("windowclose", "@PLUGIN_WEBKITBROWSER_WINDOWCLOSE@")

WebKitBrowser/WebKitBrowser.config

@@ -73,15 +73,20 @@ map()
     if(PLUGIN_WEBKITBROWSER_COOKIESTORAGE)
         kv(cookiestorage ${PLUGIN_WEBKITBROWSER_COOKIESTORAGE})
     endif()
+
     if(PLUGIN_WEBKITBROWSER_INDEXEDDB_ENABLE)
         kv(indexeddbenabled ${PLUGIN_WEBKITBROWSER_INDEXEDDB_ENABLE})
+        if(PLUGIN_WEBKITBROWSER_INDEXEDDB_PATH)
+            kv(indexeddbpath ${PLUGIN_WEBKITBROWSER_INDEXEDDB_PATH})
+        endif()
+        if(PLUGIN_WEBKITBROWSER_INDEXEDDB_SIZE)
+            kv(indexeddbsize ${PLUGIN_WEBKITBROWSER_INDEXEDDB_SIZE})
+        endif()
+        if(PLUGIN_WEBKITBROWSER_INDEXEDDB_TOTAL_SIZE)
+            kv(indexeddbtotalsize ${PLUGIN_WEBKITBROWSER_INDEXEDDB_TOTAL_SIZE})
+        endif()
     endif()
-    if(PLUGIN_WEBKITBROWSER_INDEXEDDB_PATH)
-        kv(indexeddbpath ${PLUGIN_WEBKITBROWSER_INDEXEDDB_PATH})
-    endif()
-    if(PLUGIN_WEBKITBROWSER_INDEXEDDB_SIZE)
-        kv(indexeddbsize ${PLUGIN_WEBKITBROWSER_INDEXEDDB_SIZE})
-    endif()
+
     if(PLUGIN_WEBKITBROWSER_WINDOWCLOSE)
         kv(windowclose ${PLUGIN_WEBKITBROWSER_WINDOWCLOSE})
     endif()

WebKitBrowser/WebKitImplementation.cpp

@@ -593,6 +593,7 @@ static GSourceFuncs _handlerIntervention =
                 , IndexedDBEnabled(false)
                 , IndexedDBPath()
                 , IndexedDBSize()
+                , IndexedDBTotalSize()
                 , Secure(false)
                 , InjectedBundle()
                 , Transparent(false)
@@ -661,6 +662,7 @@ static GSourceFuncs _handlerIntervention =
                 Add(_T("indexeddbenabled"), &IndexedDBEnabled);
                 Add(_T("indexeddbpath"), &IndexedDBPath);
                 Add(_T("indexeddbsize"), &IndexedDBSize);
+                Add(_T("indexeddbtotalsize"), &IndexedDBTotalSize);
                 Add(_T("secure"), &Secure);
                 Add(_T("injectedbundle"), &InjectedBundle);
                 Add(_T("transparent"), &Transparent);
@@ -735,7 +737,8 @@ static GSourceFuncs _handlerIntervention =
             Core::JSON::DecUInt16 LocalStorageSize;
             Core::JSON::Boolean IndexedDBEnabled;
             Core::JSON::String IndexedDBPath;
-            Core::JSON::DecUInt16 IndexedDBSize; // [KB]
+            Core::JSON::DecUInt16 IndexedDBSize; // [percentage of volume space for each domain]
+            Core::JSON::DecUInt16 IndexedDBTotalSize; // [percentage of volume space for all domains]
             Core::JSON::Boolean Secure;
             Core::JSON::String InjectedBundle;
             Core::JSON::Boolean Transparent;
@@ -2885,17 +2888,21 @@ static GSourceFuncs _handlerIntervention =
 
                 gchar* indexedDBPath = nullptr;
                 if (_config.IndexedDBPath.IsSet() && !_config.IndexedDBPath.Value().empty()) {
+                    _config.IndexedDBPath = _service->Substitute(_config.IndexedDBPath.Value());
+#ifdef USE_EXACT_PATHS
+                    indexedDBPath = g_build_filename(_config.IndexedDBPath.Value().c_str(), nullptr);
+#else
                     indexedDBPath = g_build_filename(_config.IndexedDBPath.Value().c_str(), "wpe", "databases", "indexeddb", nullptr);
+#endif
                 } else {
+#ifdef USE_EXACT_PATHS
+                    indexedDBPath = g_build_filename(g_get_user_cache_dir(), nullptr);
+#else
                     indexedDBPath = g_build_filename(g_get_user_cache_dir(), "wpe", "databases", "indexeddb", nullptr);
+#endif
                 }
                 g_mkdir_with_parents(indexedDBPath, 0700);
 
-                uint64_t indexedDBSizeBytes = 0;    // No limit by default, use WebKit defaults (1G at the moment of writing)
-                if (_config.IndexedDBSize.IsSet() && _config.IndexedDBSize.Value() != 0) {
-                    indexedDBSizeBytes = _config.IndexedDBSize.Value() * 1024;
-                }
-
 #if HAS_MEMORY_PRESSURE_SETTINGS_API
                 if ((_config.Memory.IsSet() == true) && (_config.Memory.NetworkProcessSettings.IsSet() == true)) {
                     WebKitMemoryPressureSettings* memoryPressureSettings = webkit_memory_pressure_settings_new();
@@ -2909,16 +2916,36 @@ static GSourceFuncs _handlerIntervention =
                     webkit_memory_pressure_settings_free(memoryPressureSettings);
                 }
 #endif
+
+#if WEBKIT_CHECK_VERSION(2, 42, 0)
+                double originStorageRatio = -1.0;    // -1.0 means WebKit will use the default quota (1GB)
+                if (_config.IndexedDBSize.IsSet() && _config.IndexedDBSize.Value() != 0) {
+                    originStorageRatio = static_cast<double>(_config.IndexedDBSize.Value());
+                }
+
+                double totalStorageRatio = -1.0;    // -1.0 means there's no limit for the total storage
+                if (_config.IndexedDBTotalSize.IsSet() && _config.IndexedDBTotalSize.Value() != 0) {
+                    totalStorageRatio = static_cast<double>(_config.IndexedDBTotalSize.Value());
+                }
+
                 auto* websiteDataManager = webkit_website_data_manager_new(
                     "local-storage-directory", wpeStoragePath,
                     "disk-cache-directory", wpeDiskCachePath,
                     "local-storage-quota", localStorageDatabaseQuotaInBytes,
                     "indexeddb-directory", indexedDBPath,
-                    "per-origin-storage-quota", indexedDBSizeBytes,
+                    "origin-storage-ratio", originStorageRatio,
+                    "total-storage-ratio", totalStorageRatio,
+                     nullptr);
+                g_free(indexedDBPath);
+#else
+                auto* websiteDataManager = webkit_website_data_manager_new(
+                    "local-storage-directory", wpeStoragePath,
+                    "disk-cache-directory", wpeDiskCachePath,
+                    "local-storage-quota", localStorageDatabaseQuotaInBytes,
                      nullptr);
+#endif
                 g_free(wpeStoragePath);
                 g_free(wpeDiskCachePath);
-                g_free(indexedDBPath);
 
 #if HAS_MEMORY_PRESSURE_SETTINGS_API
                 if ((_config.Memory.IsSet() == true) && (_config.Memory.WebProcessSettings.IsSet() == true)) {