wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bill McCloskey 2013-11-23 21:32:39 -08:00
parent 2a25d0d593
commit 9ea89791a7
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/components/ErrorPage.jsm
View File

@ -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');

2
b2g/components/PaymentGlue.js
View File

@ -131,7 +131,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) {

2
b2g/components/SignInToWebsite.jsm
View File

@ -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);

2
dom/inputmethod/Keyboard.jsm
View File

@ -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');

2
testing/marionette/marionette-frame-manager.js
View File

@ -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);

2
testing/marionette/marionette-server.js
View File

@ -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);
},