More unused code cleaning (#1009)

* remove many unused functions

* remove XAL abstraction

platform/chromium/vapi-background.js

@@ -294,35 +294,13 @@ vAPI.tabs.replace = function(tabId, url) {
 
 /******************************************************************************/
 
-vAPI.tabs.remove = function(tabId) {
-    chrome.tabs.remove(tabId, resetLastError);
-};
-
-/******************************************************************************/
-
 vAPI.tabs.reload = function(tabId, bypassCache) {
     if ( typeof tabId !== 'number' || tabId < 0 ) { return; }
     chrome.tabs.reload(tabId, { bypassCache: bypassCache === true });
 };
 
 /******************************************************************************/
 
-vAPI.tabs.injectScript = function(tabId, details, callback) {
-    var onScriptExecuted = function() {
-        resetLastError();
-        if ( typeof callback === 'function' ) {
-            callback();
-        }
-    };
-    if ( tabId ) {
-        chrome.tabs.executeScript(tabId, details, onScriptExecuted);
-    } else {
-        chrome.tabs.executeScript(details, onScriptExecuted);
-    }
-};
-
-/******************************************************************************/
-
 // Must read: https://code.google.com/p/chromium/issues/detail?id=410868#c8
 
 // https://github.com/chrisaljoudi/uBlock/issues/19
@@ -562,50 +540,13 @@ vAPI.net = {
 /******************************************************************************/
 /******************************************************************************/
 
-vAPI.contextMenu = {
-    create: function(details, callback) {
-        this.menuId = details.id;
-        this.callback = callback;
-        chrome.contextMenus.create(details);
-        chrome.contextMenus.onClicked.addListener(this.callback);
-    },
-    remove: function() {
-        chrome.contextMenus.onClicked.removeListener(this.callback);
-        chrome.contextMenus.remove(this.menuId);
-    }
-};
-
-/******************************************************************************/
-
 vAPI.lastError = function() {
     return chrome.runtime.lastError;
 };
 
 /******************************************************************************/
 /******************************************************************************/
 
-// This is called only once, when everything has been loaded in memory after
-// the extension was launched. It can be used to inject content scripts
-// in already opened web pages, to remove whatever nuisance could make it to
-// the web pages before uBlock was ready.
-
-vAPI.onLoadAllCompleted = function() {
-};
-
-/******************************************************************************/
-/******************************************************************************/
-
-vAPI.punycodeHostname = function(hostname) {
-    return hostname;
-};
-
-vAPI.punycodeURL = function(url) {
-    return url;
-};
-
-/******************************************************************************/
-/******************************************************************************/
-
 vAPI.browserData = {};
 
 /******************************************************************************/
@@ -616,17 +557,6 @@ vAPI.browserData.clearCache = function(callback) {
     chrome.browsingData.removeCache({ since: 0 }, callback);
 };
 
-/******************************************************************************/
-
-// Not supported on Chromium
-
-vAPI.browserData.clearOrigin = function(domain, callback) {
-    // unsupported on Chromium
-    if ( typeof callback === 'function' ) {
-        callback(undefined);
-    }
-};
-
 /******************************************************************************/
 /******************************************************************************/
 

src/background.html

@@ -17,7 +17,6 @@
 <script src="js/vapi-cachestorage.js"></script>
 
 <script src="js/background.js"></script>
-<script src="js/xal.js"></script>
 <script src="js/usersettings.js"></script>
 <script src="js/liquid-dict.js"></script>
 <script src="js/matrix.js"></script>

src/js/httpsb.js

@@ -61,93 +61,6 @@
     return hn === '' ? '*' : hn;
 };
 
-µMatrix.scopeFromURL = µMatrix.hostnameFromURL;
-
-/******************************************************************************/
-
-µMatrix.evaluateURL = function(srcURL, desHostname, type) {
-    var srcHostname = this.URI.hostnameFromURI(srcURL);
-    return this.tMatrix.evaluateCellZXY(srcHostname, desHostname, type);
-};
-
-
-/******************************************************************************/
-
-// Whitelist something
-
-µMatrix.whitelistTemporarily = function(srcHostname, desHostname, type) {
-    this.tMatrix.whitelistCell(srcHostname, desHostname, type);
-};
-
-µMatrix.whitelistPermanently = function(srcHostname, desHostname, type) {
-    if ( this.pMatrix.whitelistCell(srcHostname, desHostname, type) ) {
-        this.saveMatrix();
-    }
-};
-
-/******************************************************************************/
-
-// Auto-whitelisting the `all` cell is a serious action, hence this will be
-// done only from within a scope.
-
-µMatrix.autoWhitelistAllTemporarily = function(pageURL) {
-    var srcHostname = this.URI.hostnameFromURI(pageURL);
-    if ( this.mustBlock(srcHostname, '*', '*') === false ) {
-        return false;
-    }
-    this.tMatrix.whitelistCell(srcHostname, '*', '*');
-    return true;
-};
-
-/******************************************************************************/
-
-// Blacklist something
-
-µMatrix.blacklistTemporarily = function(srcHostname, desHostname, type) {
-    this.tMatrix.blacklistCell(srcHostname, desHostname, type);
-};
-
-µMatrix.blacklistPermanently = function(srcHostname, desHostname, type) {
-    if ( this.pMatrix.blacklist(srcHostname, desHostname, type) ) {
-        this.saveMatrix();
-    }
-};
-
-/******************************************************************************/
-
-// Remove something from both black and white lists.
-
-µMatrix.graylistTemporarily = function(srcHostname, desHostname, type) {
-    this.tMatrix.graylistCell(srcHostname, desHostname, type);
-};
-
-µMatrix.graylistPermanently = function(srcHostname, desHostname, type) {
-    if ( this.pMatrix.graylistCell(srcHostname, desHostname, type) ) {
-        this.saveMatrix();
-    }
-};
-
-/******************************************************************************/
-
-// TODO: Should type be transposed by the caller or in place here? Not an
-// issue at this point but to keep in mind as this function is called
-// more and more from different places.
-
-µMatrix.filterRequest = function(fromURL, type, toURL) {
-    // Block request?
-    var srcHostname = this.hostnameFromURL(fromURL);
-    var desHostname = this.hostnameFromURL(toURL);
-
-    // If no valid hostname, use the hostname of the source.
-    // For example, this case can happen with data URI.
-    if ( desHostname === '' ) {
-        desHostname = srcHostname;
-    }
-
-    // Blocked by matrix filtering?
-    return this.mustBlock(srcHostname, desHostname, type);
-};
-
 /******************************************************************************/
 
 µMatrix.mustBlock = function(srcHostname, desHostname, type) {
@@ -160,35 +73,6 @@
 
 /******************************************************************************/
 
-// Commit temporary permissions.
-
-µMatrix.commitPermissions = function(persist) {
-    this.pMatrix.assign(this.tMatrix);
-    if ( persist ) {
-        this.saveMatrix();
-    }
-};
-
-/******************************************************************************/
-
-// Reset all rules to their default state.
-
-µMatrix.revertAllRules = function() {
-    this.tMatrix.assign(this.pMatrix);
-};
-
-/******************************************************************************/
-
-µMatrix.turnOff = function() {
-    vAPI.app.start();
-};
-
-µMatrix.turnOn = function() {
-    vAPI.app.stop();
-};
-
-/******************************************************************************/
-
 µMatrix.formatCount = function(count) {
     if ( typeof count !== 'number' ) {
         return '';

src/js/messaging.js

@@ -106,10 +106,6 @@ function onMessage(request, sender, callback) {
         µm.gotoExtensionURL(request);
         break;
 
-    case 'gotoURL':
-        µm.gotoURL(request);
-        break;
-
     case 'graylistMatrixCell':
         µm.tMatrix.graylistCell(
             request.srcHostname,
@@ -887,7 +883,7 @@ var restoreUserData = function(userData) {
 
     // If we are going to restore all, might as well wipe out clean local
     // storage
-    µm.XAL.keyvalRemoveAll(onAllRemoved);
+    vAPI.storage.clear(onAllRemoved);
 };
 
 /******************************************************************************/
@@ -896,7 +892,7 @@ var resetUserData = function() {
     var onAllRemoved = function() {
         vAPI.app.restart();
     };
-    µm.XAL.keyvalRemoveAll(onAllRemoved);
+    vAPI.storage.clear(onAllRemoved);
 };
 
 /******************************************************************************/

src/js/storage.js

@@ -41,7 +41,7 @@
 /******************************************************************************/
 
 µMatrix.saveUserSettings = function() {
-    this.XAL.keyvalSetMany(
+    vAPI.storage.set(
         this.userSettings,
         this.getBytesInUse.bind(this)
     );