Bug 682048 - Change B2G frame script handling to support anon/global scope (r=fabrice)

b2g/components/ErrorPage.jsm

@@ -161,7 +161,7 @@ let ErrorPage = {
     // This won't happen from dom/ipc/preload.js in non-OOP builds.
     try {
       if (Services.prefs.getBoolPref("dom.ipc.tabs.disabled") === true) {
-        mm.loadFrameScript(kErrorPageFrameScript, true);
+        mm.loadFrameScript(kErrorPageFrameScript, true, true);
       }
     } catch (e) {
       dump('Error loading ' + kErrorPageFrameScript + ' as frame script: ' + e + '\n');

b2g/components/PaymentGlue.js

@@ -143,7 +143,7 @@ PaymentUI.prototype = {
                              .frameLoader;
       let mm = frameLoader.messageManager;
       try {
-        mm.loadFrameScript(kPaymentShimFile, true);
+        mm.loadFrameScript(kPaymentShimFile, true, true);
         mm.sendAsyncMessage("Payment:LoadShim", { requestId: aRequestId });
       } catch (e) {
         if (this._debug) {

b2g/components/SignInToWebsite.jsm

@@ -287,7 +287,7 @@ Pipe.prototype = {
             let frameLoader = frame.QueryInterface(Ci.nsIFrameLoaderOwner).frameLoader;
             mm = frameLoader.messageManager;
             try {
-              mm.loadFrameScript(kIdentityShimFile, true);
+              mm.loadFrameScript(kIdentityShimFile, true, true);
               log("Loaded shim", kIdentityShimFile);
             } catch (e) {
               log("Error loading", kIdentityShimFile, "as a frame script:", e);

dom/inputmethod/Keyboard.jsm

@@ -85,7 +85,7 @@ this.Keyboard = {
     // won't happen from dom/ipc/preload.js
     try {
       if (Services.prefs.getBoolPref("dom.ipc.tabs.disabled") === true) {
-        mm.loadFrameScript(kFormsFrameScript, true);
+        mm.loadFrameScript(kFormsFrameScript, true, true);
       }
     } catch (e) {
       dump('Error loading ' + kFormsFrameScript + ' as frame script: ' + e + '\n');

testing/marionette/marionette-frame-manager.js

@@ -126,7 +126,7 @@ FrameManager.prototype = {
     // and set the frame's ChromeMessageSender as the active message manager the server will listen to
     this.addMessageManagerListeners(mm);
     logger.info("frame-manager load script: " + mm.toString());
-    mm.loadFrameScript(FRAME_SCRIPT, true);
+    mm.loadFrameScript(FRAME_SCRIPT, true, true);
     let aFrame = new MarionetteRemoteFrame(message.json.win, message.json.frame);
     aFrame.messageManager = Cu.getWeakReference(mm);
     remoteFrames.push(aFrame);

testing/marionette/marionette-server.js

@@ -2449,7 +2449,7 @@ BrowserObj.prototype = {
    *        frame to load the script in
    */
   loadFrameScript: function BO_loadFrameScript(script, frame) {
-    frame.window.messageManager.loadFrameScript(script, true);
+    frame.window.messageManager.loadFrameScript(script, true, true);
     Services.prefs.setBoolPref("marionette.contentListener", true);
   },