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

Backed out changeset 65338f03492b (bug 990065) and changeset 8c3b772518f2 (bug 990057) for B2G desktop mochitest failures.

Browse Source 
CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2014-04-01 13:18:52 -04:00
parent aeba623bb6
commit bda8515798
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
b2g/installer/package-manifest.in
View File

@ -784,10 +784,6 @@ bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
@BINPATH@/components/HelperAppDialog.js
@BINPATH@/components/DownloadsUI.js
#ifndef MOZ_WIDGET_GONK
@BINPATH@/components/SimulatorScreen.js
#endif
#ifdef MOZ_SERVICES_FXACCOUNTS
@BINPATH@/components/FxAccountsUIGlue.js
@BINPATH@/components/services_fxaccounts.xpt

6
b2g/simulator/lib/main.js
View File

@ -6,7 +6,7 @@
const { Cc, Ci, Cu } = require("chrome");
const { SimulatorProcess } = require("./simulator-process");
const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
const { Promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
const Self = require("sdk/self");
const System = require("sdk/system");
const { Simulator } = Cu.import("resource://gre/modules/devtools/Simulator.jsm");
@ -23,12 +23,12 @@ function launch({ port }) {
process.remoteDebuggerPort = port;
process.run();
return promise.resolve();
return Promise.resolve();
}
function close() {
if (!process) {
return promise.resolve();
return Promise.resolve();
}
let p = process;
process = null;

6
b2g/simulator/lib/simulator-process.js
View File

@ -17,7 +17,7 @@ const Runtime = require("sdk/system/runtime");
const Self = require("sdk/self");
const URL = require("sdk/url");
const Subprocess = require("subprocess");
const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
const { Promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
const { rootURI: ROOT_URI } = require('@loader/options');
const PROFILE_URL = ROOT_URI + "profile/";
@ -112,7 +112,7 @@ exports.SimulatorProcess = Class({
// request a b2g instance kill
kill: function() {
let deferred = promise.defer();
let deferred = Promise.defer();
if (this.process) {
this.once("exit", (exitCode) => {
this.shuttingDown = false;
@ -125,7 +125,7 @@ exports.SimulatorProcess = Class({
}
return deferred.promise;
} else {
return promise.resolve(undefined);
return Promise.resolve(undefined);
}
},