Store very large HTML as a blob #3434

Author: piroor

webextensions/common/constants.js

@@ -237,12 +237,14 @@ export const kWINDOW_STATE_SUBPANEL_HEIGHT = 'subpanel-height';
 export const kWINDOW_STATE_SUBPANEL_EFFECTIVE_HEIGHT = 'subpanel-effective-height';
 export const kWINDOW_STATE_CACHED_TABS     = 'cached-tabs';
 export const kWINDOW_STATE_CACHED_SIDEBAR  = 'cached-sidebar-contents';
+export const kWINDOW_STATE_CACHED_SIDEBAR_CONTENTS  = 'cached-sidebar-contents:contents';
 export const kWINDOW_STATE_CACHED_SIDEBAR_TABS_DIRTY = 'cached-sidebar-contents:tabs-dirty';
 export const kWINDOW_STATE_CACHED_SIDEBAR_COLLAPSED_DIRTY = 'cached-sidebar-contents:collapsed-dirty';
 
 export const kCACHE_KEYS = [
   kWINDOW_STATE_CACHED_TABS,
   kWINDOW_STATE_CACHED_SIDEBAR,
+  kWINDOW_STATE_CACHED_SIDEBAR_CONTENTS,
   kWINDOW_STATE_CACHED_SIDEBAR_TABS_DIRTY,
   kWINDOW_STATE_CACHED_SIDEBAR_COLLAPSED_DIRTY,
 ];

webextensions/sidebar/sidebar-cache.js

@@ -84,6 +84,7 @@ async function preload(tab) {
   mTargetWindow = tab.windowId;
   const cache = await MetricsData.addAsync('preload: reading window cache', Promise.all([
     getWindowCache(Constants.kWINDOW_STATE_CACHED_SIDEBAR),
+    getWindowCache(Constants.kWINDOW_STATE_CACHED_SIDEBAR_CONTENTS),
     getWindowCache(Constants.kWINDOW_STATE_CACHED_SIDEBAR_TABS_DIRTY),
     getWindowCache(Constants.kWINDOW_STATE_CACHED_SIDEBAR_COLLAPSED_DIRTY),
   ]).catch(ApiTabs.createErrorSuppressor()));
@@ -95,6 +96,7 @@ export async function getEffectiveWindowCache(options = {}) {
   log('getEffectiveWindowCache: start');
   cancelReservedUpdateCachedTabbar(); // prevent to break cache before loading
   let cache;
+  let cachedContents;
   let cachedSignature;
   let actualSignature;
   await Promise.all([
@@ -107,12 +109,19 @@ export async function getEffectiveWindowCache(options = {}) {
       //   [cache, const tabsDirty, const collapsedDirty] = await Promise.all([
       let tabsDirty, collapsedDirty;
       const preloadedCache = mPreloadedCaches.get(`window${mLastWindowCacheOwner.windowId}`);
-      [cache, tabsDirty, collapsedDirty] = preloadedCache || await MetricsData.addAsync('getEffectiveWindowCache: reading window cache', Promise.all([
+      [cache, cachedContents, tabsDirty, collapsedDirty] = preloadedCache || await MetricsData.addAsync('getEffectiveWindowCache: reading window cache', Promise.all([
         getWindowCache(Constants.kWINDOW_STATE_CACHED_SIDEBAR),
+        getWindowCache(Constants.kWINDOW_STATE_CACHED_SIDEBAR_CONTENTS),
         getWindowCache(Constants.kWINDOW_STATE_CACHED_SIDEBAR_TABS_DIRTY),
         getWindowCache(Constants.kWINDOW_STATE_CACHED_SIDEBAR_COLLAPSED_DIRTY)
       ]));
       mPreloadedCaches.clear();
+      if (cache && cache.tabbar && cachedContents) {
+        const contents = await cachedContents.text();
+        const versionPart = contents.match(/^version=(\d+)\n/);
+        if (versionPart && versionPart[1] == cache.version)
+          cache.tabbar.contents = contents.replace(/^version=(\d+)\n/, '');
+      }
       cachedSignature = cache && cache.signature;
       log(`getEffectiveWindowCache: got from the owner `, mLastWindowCacheOwner, {
         cachedSignature, cache, tabsDirty, collapsedDirty
@@ -449,6 +458,7 @@ async function updateWindowCache(key, value) {
 function clearWindowCache() {
   log('clearWindowCache ', { stack: configs.debug && new Error().stack });
   updateWindowCache(Constants.kWINDOW_STATE_CACHED_SIDEBAR);
+  updateWindowCache(Constants.kWINDOW_STATE_CACHED_SIDEBAR_CONTENTS);
   updateWindowCache(Constants.kWINDOW_STATE_CACHED_SIDEBAR_TABS_DIRTY);
   updateWindowCache(Constants.kWINDOW_STATE_CACHED_SIDEBAR_COLLAPSED_DIRTY);
 }
@@ -526,13 +536,16 @@ async function updateCachedTabbar() {
   updateWindowCache(Constants.kWINDOW_STATE_CACHED_SIDEBAR, {
     version: kCONTENTS_VERSION,
     tabbar: {
-      contents:        SidebarTabs.wholeContainer.innerHTML,
       style:           mTabBar.getAttribute('style'),
       pinnedTabsCount: Tab.getPinnedTabs(mTargetWindow).length
     },
     indent: Indent.getCacheInfo(),
     signature
   });
+  updateWindowCache(
+    Constants.kWINDOW_STATE_CACHED_SIDEBAR_CONTENTS,
+    new Blob([`version=${kCONTENTS_VERSION}\n${SidebarTabs.wholeContainer.innerHTML}`])
+  );
 }