Set tab restrictions status across all frames.

Author: hackademix

src/bg/RequestGuard.js

@@ -318,7 +318,7 @@ var RequestGuard = (() => {
           }
           capabilities = perms.capabilities;
         } else {
-          if (!isMainFrame && type === "sub_frame") {
+          if (isMainFrame || type === "sub_frame") {
             await Settings.enforceTabRestrictions(tabId);
           }
         }

src/content/staticNS.js

@@ -52,24 +52,20 @@
       // mess with it, though, so we wrap it around auto-hiding accessors
 
       if (this.config.MARKER = MARKER) {
+        let splitter = `${MARKER},`;
+        this.getWindowName = () => window.name.split(splitter).pop();
 
         let tabInfoRx = new RegExp(`^${MARKER}\\[([^]*?)\\]${MARKER},`);
-        let name = window.name;
-        try {
-          name = top.name;
-        } catch(e) {
-          // won't work cross-origin
-        }
-        let tabInfoMatch = name.match(tabInfoRx);
+
+        let tabInfoMatch = window.name.match(tabInfoRx);
         if (tabInfoMatch) {
           try {
             this.config.tabInfo = JSON.parse(tabInfoMatch[1]);
           } catch (e) {
             error(e);
           }
         }
-        let splitter = `${MARKER},`;
-        this.getWindowName = () => window.name.split(splitter).pop();
+
         Reflect.defineProperty(window.wrappedJSObject, "name", {
           get: exportFunction(() => this.getWindowName(), window.wrappedJSObject),
           set: exportFunction(value => {