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

Back out 1fd1596ffb9f:b5b8f25b9f1d (bug 682048) for b2g mochitest-5 timeouts in test_innerWidthHeight_script.html

Browse Source 
CLOSED TREE
This commit is contained in:
Phil Ringnalda 2013-11-24 10:32:52 -08:00
parent a147287a80
commit 3e65c02e51
23 changed files with 20 additions and 66 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, true);
mm.loadFrameScript(kErrorPageFrameScript, 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, true);
mm.loadFrameScript(kPaymentShimFile, 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, true);
mm.loadFrameScript(kIdentityShimFile, true);
log("Loaded shim", kIdentityShimFile);
} catch (e) {
log("Error loading", kIdentityShimFile, "as a frame script:", e);

2
browser/base/content/test/social/social_crash_content_helper.js
View File

@ -1,8 +1,6 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
let Cu = Components.utils;
// Ideally we would use CrashTestUtils.jsm, but that's only available for
// xpcshell tests - so we just copy a ctypes crasher from it.
Cu.import("resource://gre/modules/ctypes.jsm");

1
browser/components/tabview/content.js
View File

@ -5,7 +5,6 @@
"use strict";
let Cu = Components.utils;
let Ci = Components.interfaces;
Cu.import("resource:///modules/tabview/utils.jsm");

5
browser/metro/base/content/Util.js
View File

@ -2,9 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
let Cc = Components.classes;
let Ci = Components.interfaces;
Components.utils.import("resource:///modules/ContentUtil.jsm");
let Util = {
@ -411,5 +408,3 @@ Util.Timeout.prototype = {
Util[name] = copy;
}
}
this.Util = Util;

1
browser/metro/base/content/bindings/browser.js
View File

@ -664,7 +664,6 @@ let ContentScroll = {
isRoot: isRoot });
}
};
this.ContentScroll = ContentScroll;
ContentScroll.init();

4
browser/metro/base/content/contenthandlers/ConsoleAPIObserver.js
View File

@ -2,9 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
let Ci = Components.interfaces;
let Cc = Components.classes;
dump("### ConsoleAPIObserver.js loaded\n");
/*
@ -119,7 +116,6 @@ var ConsoleAPIObserver = {
return aSourceURL;
}
};
this.ConsoleAPIObserver = ConsoleAPIObserver;
ConsoleAPIObserver.init();

17
browser/metro/base/content/contenthandlers/Content.js
View File

@ -37,13 +37,13 @@ XPCOMUtils.defineLazyServiceGetter(this, "gFocusManager",
XPCOMUtils.defineLazyServiceGetter(this, "gDOMUtils",
"@mozilla.org/inspector/dom-utils;1", "inIDOMUtils");
this.XULDocument = Ci.nsIDOMXULDocument;
this.HTMLHtmlElement = Ci.nsIDOMHTMLHtmlElement;
this.HTMLIFrameElement = Ci.nsIDOMHTMLIFrameElement;
this.HTMLFrameElement = Ci.nsIDOMHTMLFrameElement;
this.HTMLFrameSetElement = Ci.nsIDOMHTMLFrameSetElement;
this.HTMLSelectElement = Ci.nsIDOMHTMLSelectElement;
this.HTMLOptionElement = Ci.nsIDOMHTMLOptionElement;
let XULDocument = Ci.nsIDOMXULDocument;
let HTMLHtmlElement = Ci.nsIDOMHTMLHtmlElement;
let HTMLIFrameElement = Ci.nsIDOMHTMLIFrameElement;
let HTMLFrameElement = Ci.nsIDOMHTMLFrameElement;
let HTMLFrameSetElement = Ci.nsIDOMHTMLFrameSetElement;
let HTMLSelectElement = Ci.nsIDOMHTMLSelectElement;
let HTMLOptionElement = Ci.nsIDOMHTMLOptionElement;
const kReferenceDpi = 240; // standard "pixel" size used in some preferences
@ -82,7 +82,6 @@ function getBoundingContentRect(aElement) {
return new Rect(r.left + offset.x, r.top + offset.y, r.width, r.height);
}
this.getBoundingContentRect = getBoundingContentRect;
/*
* getOverflowContentBoundingRect
@ -109,7 +108,6 @@ function getOverflowContentBoundingRect(aElement) {
return r;
}
this.getOverflowContentBoundingRect = getOverflowContentBoundingRect;
/*
* Content
@ -628,6 +626,5 @@ var FormSubmitObserver = {
return this;
}
};
this.Content = Content;
FormSubmitObserver.init();

6
browser/metro/base/content/contenthandlers/ContextMenuHandler.js
View File

@ -2,10 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
let Ci = Components.interfaces;
let Cc = Components.classes;
this.kXLinkNamespace = "http://www.w3.org/1999/xlink";
const kXLinkNamespace = "http://www.w3.org/1999/xlink";
dump("### ContextMenuHandler.js loaded\n");
@ -386,6 +383,5 @@ var ContextMenuHandler = {
this._types = this._types.filter(function(type) type.name != aName);
}
};
this.ContextMenuHandler = ContextMenuHandler;
ContextMenuHandler.init();

4
browser/metro/base/content/contenthandlers/FindHandler.js
View File

@ -2,9 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
let Ci = Components.interfaces;
let Cc = Components.classes;
dump("### FindHandler.js loaded\n");
var FindHandler = {
@ -86,6 +83,5 @@ var FindHandler = {
timer.once(0);
}
};
this.FindHandler = FindHandler;
FindHandler.init();

3
browser/metro/base/content/contenthandlers/FormHelper.js
View File

@ -576,7 +576,6 @@ FormAssistant.prototype = {
return result;
}
};
this.FormAssistant = FormAssistant;
/******************************************************************************
@ -705,7 +704,6 @@ SelectWrapper.prototype = {
}, 0);
}
};
this.SelectWrapper = SelectWrapper;
// bug 559792
@ -763,4 +761,3 @@ MenulistWrapper.prototype = {
}, 0);
}
};
this.MenulistWrapper = MenulistWrapper;

4
browser/metro/base/content/contenthandlers/SelectionHandler.js
View File

@ -2,9 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
let Ci = Components.interfaces;
let Cc = Components.classes;
dump("### SelectionHandler.js loaded\n");
var SelectionHandler = {
@ -654,7 +651,6 @@ var SelectionHandler = {
}
},
};
this.SelectionHandler = SelectionHandler;
SelectionHandler.__proto__ = new SelectionPrototype();
SelectionHandler.init();

12
browser/metro/base/content/library/SelectionPrototype.js
View File

@ -3,20 +3,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
let Ci = Components.interfaces;
let Cc = Components.classes;
/*
* SelectionPrototype - common base class used by both chrome and content selection logic.
*/
// selection node parameters for various apis
this.kSelectionNodeAnchor = 1;
this.kSelectionNodeFocus = 2;
const kSelectionNodeAnchor = 1;
const kSelectionNodeFocus = 2;
// selection type property constants
this.kChromeSelector = 1;
this.kContentSelector = 2;
const kChromeSelector = 1;
const kContentSelector = 2;
dump("### SelectionPrototype.js loaded\n");
@ -954,4 +951,3 @@ SelectionPrototype.prototype = {
this._setDebugRect(rect, aColor, true);
},
};
this.SelectionPrototype = SelectionPrototype;

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, true);
mm.loadFrameScript(kFormsFrameScript, 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, true);
mm.loadFrameScript(FRAME_SCRIPT, true);
let aFrame = new MarionetteRemoteFrame(message.json.win, message.json.frame);
aFrame.messageManager = Cu.getWeakReference(mm);
remoteFrames.push(aFrame);

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

@ -260,7 +260,7 @@ function deleteSession(msg) {
if (isB2G) {
content.removeEventListener("mozbrowsershowmodalprompt", modalHandler, false);
}
elementManager.reset();
this.elementManager.reset();
// reset frame to the top-most frame
curFrame = content;
curFrame.focus();

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, true);
frame.window.messageManager.loadFrameScript(script, true);
Services.prefs.setBoolPref("marionette.contentListener", true);
},

3
testing/specialpowers/content/MozillaLogger.js
View File

@ -116,6 +116,3 @@ MozillaFileLogger.prototype = {
}
};
this.MozillaLogger = MozillaLogger;
this.SpecialPowersLogger = SpecialPowersLogger;
this.MozillaFileLogger = MozillaFileLogger;

2
testing/specialpowers/content/specialpowers.js
View File

@ -139,5 +139,3 @@ SpecialPowersManager.prototype = {
};
var specialpowersmanager = new SpecialPowersManager();
this.SpecialPowers = SpecialPowers;

4
testing/specialpowers/content/specialpowersAPI.js
View File

@ -1645,7 +1645,3 @@ SpecialPowersAPI.prototype = {
this._sendSyncMessage('SPObserverService', msg);
},
};
this.SpecialPowersAPI = SpecialPowersAPI;
this.bindDOMWindowUtils = bindDOMWindowUtils;
this.getRawComponents = getRawComponents;

2
toolkit/components/thumbnails/test/thumbnails_crash_content_helper.js
View File

@ -1,8 +1,6 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
let Cu = Components.utils;
// Ideally we would use CrashTestUtils.jsm, but that's only available for
// xpcshell tests - so we just copy a ctypes crasher from it.
Cu.import("resource://gre/modules/ctypes.jsm");

2
toolkit/mozapps/extensions/addonManager.js
View File

@ -44,7 +44,7 @@ function amManager() {
messageManager.addMessageListener(MSG_INSTALL_ENABLED, this);
messageManager.addMessageListener(MSG_INSTALL_ADDONS, this);
messageManager.loadFrameScript(CHILD_SCRIPT, true);
messageManager.loadFrameScript(CHILD_SCRIPT, true, true);
}
amManager.prototype = {