[mv3] Re-work specific cosmetic filtering-related content scripts

To minimize delay to First Contentful Paint. The idea is to avoid
complex data structures such as Map in order to speed up first content
script execution. Use stringified arrays where practical and
instanciate those arrays from their stringified representation only
when there are actual cosmetic filters to apply.

Related commit:
6039ef2b6d

Author: gorhill

platform/mv3/extension/js/scripting/css-procedural.js

@@ -30,42 +30,47 @@ self.proceduralImports = undefined;
 
 /******************************************************************************/
 
-const selectors = [];
-const exceptions = [];
-
-const lookupHostname = (hostname, details, out) => {
-    let seqi = details.hostnamesMap.get(hostname);
-    if ( seqi === undefined ) { return; }
-    const { argsList, argsSeqs } = details;
-    for (;;) {
-        const argi = argsSeqs[seqi++];
-        const done = argi > 0;
-        out.push(...JSON.parse(argsList[done ? argi : -argi]));
-        if ( done ) { break; }
+const isolatedAPI = self.isolatedAPI;
+const selectors = new Set();
+const exceptions = new Set();
+
+const lookupHostname = (hostname, details) => {
+    const listref = isolatedAPI.binarySearch(details.hostnames, hostname);
+    if ( listref === -1 ) { return; }
+    if ( Array.isArray(details.selectorLists) === false ) {
+        details.selectorLists = details.selectorLists.split(';');
+        details.selectorListRefs = JSON.parse(`[${details.selectorListRefs}]`);
+    }
+    const ilist = details.selectorListRefs[listref];
+    const list = JSON.parse(`[${details.selectorLists[ilist]}]`);
+    for ( const iselector of list ) {
+        if ( iselector >= 0 ) {
+            selectors.add(details.selectors[iselector]);
+        } else {
+            exceptions.add(details.selectors[~iselector]);
+        }
     }
 };
 
 const lookupAll = hostname => {
     for ( const details of proceduralImports ) {
-        lookupHostname(hostname, details, selectors);
-        const matches = [];
-        lookupHostname(`~${hostname}`, details, matches);
-        if ( matches.length === 0 ) { continue; }
-        exceptions.push(...matches.map(a => JSON.stringify(a)));
+        lookupHostname(hostname, details);
     }
 };
 
-self.isolatedAPI.forEachHostname(lookupAll, {
+isolatedAPI.forEachHostname(lookupAll, {
     hasEntities: proceduralImports.some(a => a.hasEntities)
 });
+
 proceduralImports.length = 0;
 
-if ( selectors.length === 0 ) { return; }
+for ( const selector of exceptions ) {
+    selectors.delete(selector);
+}
+
+if ( selectors.size === 0 ) { return; }
 
-const exceptedSelectors = exceptions.length !== 0
-    ? selectors.filter(a => exceptions.includes(JSON.stringify(a)) === false)
-    : selectors;
-if ( exceptedSelectors.length === 0 ) { return; }
+const exceptedSelectors = Array.from(selectors).map(a => JSON.parse(a));
 
 const declaratives = exceptedSelectors.filter(a => a.cssable);
 if ( declaratives.length !== 0 ) {

platform/mv3/extension/js/scripting/css-specific.js

@@ -30,42 +30,48 @@ self.specificImports = undefined;
 
 /******************************************************************************/
 
-const selectors = [];
-const exceptions = [];
-
-const lookupHostname = (hostname, details, out) => {
-    let seqi = details.hostnamesMap.get(hostname);
-    if ( seqi === undefined ) { return; }
-    const { argsList, argsSeqs } = details;
-    for (;;) {
-        const argi = argsSeqs[seqi++];
-        const done = argi > 0;
-        out.push(...argsList[done ? argi : -argi].split('\n'));
-        if ( done ) { break; }
+const isolatedAPI = self.isolatedAPI;
+const selectors = new Set();
+const exceptions = new Set();
+
+const lookupHostname = (hostname, details) => {
+    const listref = isolatedAPI.binarySearch(details.hostnames, hostname);
+    if ( listref === -1 ) { return; }
+    if ( Array.isArray(details.selectorLists) === false ) {
+        details.selectorLists = details.selectorLists.split(';');
+        details.selectorListRefs = JSON.parse(`[${details.selectorListRefs}]`);
+    }
+    const ilist = details.selectorListRefs[listref];
+    const list = JSON.parse(`[${details.selectorLists[ilist]}]`);
+    for ( const iselector of list ) {
+        if ( iselector >= 0 ) {
+            selectors.add(details.selectors[iselector]);
+        } else {
+            exceptions.add(details.selectors[~iselector]);
+        }
     }
 };
 
 const lookupAll = hostname => {
     for ( const details of specificImports ) {
-        lookupHostname(hostname, details, selectors);
-        lookupHostname(`~${hostname}`, details, exceptions);
+        lookupHostname(hostname, details);
     }
 };
 
-self.isolatedAPI.forEachHostname(lookupAll, {
+isolatedAPI.forEachHostname(lookupAll, {
     hasEntities: specificImports.some(a => a.hasEntities)
 });
 
 specificImports.length = 0;
 
-if ( selectors.length === 0 ) { return; }
+for ( const selector of exceptions ) {
+    selectors.delete(selector);
+}
 
-const exceptedSelectors = exceptions.length !== 0
-    ? selectors.filter(a => exceptions.includes(a) === false)
-    : selectors;
-if ( exceptedSelectors.length === 0 ) { return; }
+if ( selectors.size === 0 ) { return; }
 
-self.cssAPI.insert(`${exceptedSelectors.join(',')}{display:none!important;}`);
+const css = `${Array.from(selectors).join(',\n')}{display:none!important;}`;
+self.cssAPI.insert(css);
 
 /******************************************************************************/
 

platform/mv3/extension/js/scripting/isolated-api.js

@@ -73,6 +73,28 @@
             if ( r !== undefined ) { return r; }
         }
     };
+
+    isolatedAPI.binarySearch = (sorted, target) => {
+        let l = 0, i = 0, d = 0;
+        let r = sorted.length;
+        let candidate;
+        while ( l < r ) {
+            i = l + r >>> 1;
+            candidate = sorted[i];
+            d = target.length - candidate.length;
+            if ( d === 0 ) {
+                if ( target === candidate ) { return i; }
+                d = target < candidate ? -1 : 1;
+            }
+            if ( d < 0 ) {
+                r = i;
+            } else {
+                l = i + 1;
+            }
+        }
+        return -1;
+    };
+
 })(self.isolatedAPI);
 
 /******************************************************************************/