fix https://bugs.chromium.org/p/project-zero/issues/detail?id=1225&de…

…sc=6#c10
gorhill · Apr 1, 2017 · 85255cf · 85255cf
1 parent 9a99a06
commit 85255cf
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/platform/chromium/vapi-common.js b/platform/chromium/vapi-common.js
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
-    µMatrix - a browser extension to block requests.
-    Copyright (C) 2014 The µBlock authors
+    uMatrix - a browser extension to block requests.
+    Copyright (C) 2014-2017 The uMatrix/uBlock Origin authors
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,18 +21,21 @@
 
 // For background page or non-background pages
 
-/* global self */
+'use strict';
 
 /******************************************************************************/
 /******************************************************************************/
 
 (function() {
 
-'use strict';
-
 /******************************************************************************/
 
-var vAPI = self.vAPI = self.vAPI || {};
+// https://bugs.chromium.org/p/project-zero/issues/detail?id=1225&desc=6#c10
+if ( !self.vAPI || !self.vAPI.uMatrix ) {
+    self.vAPI = { uMatrix: true };
+}
+
+var vAPI = self.vAPI;
 var chrome = self.chrome;
 
 /******************************************************************************/

diff --git a/platform/firefox/vapi-common.js b/platform/firefox/vapi-common.js
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
-    µBlock - a browser extension to block requests.
-    Copyright (C) 2014 The µBlock authors
+    uMatrix - a browser extension to block requests.
+    Copyright (C) 2014-2017 The uMatrix/uBlock Origin authors
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,20 +23,25 @@
 
 // For background page or non-background pages
 
+'use strict';
+
 /******************************************************************************/
 
 (function() {
 
-'use strict';
-
 /******************************************************************************/
 
 const {Services} = Components.utils.import(
     'resource://gre/modules/Services.jsm',
     null
 );
 
-var vAPI = self.vAPI = self.vAPI || {};
+// https://bugs.chromium.org/p/project-zero/issues/detail?id=1225&desc=6#c10
+if ( !self.vAPI || !self.vAPI.uMatrix ) {
+    self.vAPI = { uMatrix: true };
+}
+
+var vAPI = self.vAPI;
 
 /******************************************************************************/