зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1288475 - Split webconsole utils.js into separate client and server parts;r=MattN,tromey
MozReview-Commit-ID: HlpiRvuMF1H --HG-- rename : devtools/shared/webconsole/utils.js => devtools/client/webconsole/utils.js rename : devtools/shared/webconsole/utils.js => devtools/server/actors/utils/webconsole-utils.js rename : devtools/shared/webconsole/worker-utils.js => devtools/server/actors/utils/webconsole-worker-utils.js extra : rebase_source : 6f1b2afba2c3cf3e3d17f839c11bf15e89a2f69d
This commit is contained in:
Родитель
385e2c626e
Коммит
5a0322040e
|
@ -91,7 +91,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "ShortcutUtils",
|
|||
XPCOMUtils.defineLazyModuleGetter(this, "Reflect",
|
||||
"resource://gre/modules/reflect.jsm");
|
||||
|
||||
var WebConsoleUtils = require("devtools/shared/webconsole/utils").Utils;
|
||||
var WebConsoleUtils = require("devtools/client/webconsole/utils").Utils;
|
||||
|
||||
/**
|
||||
* The scratchpad object handles the Scratchpad window functionality.
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
"use strict";
|
||||
|
||||
var WebConsoleUtils = require("devtools/shared/webconsole/utils").Utils;
|
||||
var WebConsoleUtils = require("devtools/client/webconsole/utils").Utils;
|
||||
var DEVTOOLS_CHROME_ENABLED = "devtools.chrome.enabled";
|
||||
|
||||
function test()
|
||||
|
|
|
@ -27,7 +27,7 @@ loader.lazyGetter(this, "toolboxStrings", function () {
|
|||
|
||||
loader.lazyRequireGetter(this, "gcliInit", "devtools/shared/gcli/commands/index");
|
||||
loader.lazyRequireGetter(this, "util", "gcli/util/util");
|
||||
loader.lazyRequireGetter(this, "ConsoleServiceListener", "devtools/shared/webconsole/utils", true);
|
||||
loader.lazyRequireGetter(this, "ConsoleServiceListener", "devtools/server/actors/utils/webconsole-utils", true);
|
||||
loader.lazyRequireGetter(this, "gDevTools", "devtools/client/framework/devtools", true);
|
||||
loader.lazyRequireGetter(this, "gDevToolsBrowser", "devtools/client/framework/devtools-browser", true);
|
||||
loader.lazyRequireGetter(this, "nodeConstants", "devtools/shared/dom-node-constants", true);
|
||||
|
|
|
@ -38,7 +38,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "clipboardHelper",
|
|||
|
||||
Object.defineProperty(this, "WebConsoleUtils", {
|
||||
get: function () {
|
||||
return require("devtools/shared/webconsole/utils").Utils;
|
||||
return require("devtools/client/webconsole/utils").Utils;
|
||||
},
|
||||
configurable: true,
|
||||
enumerable: true
|
||||
|
|
|
@ -17,7 +17,7 @@ var {LocalizationHelper} = require("devtools/client/shared/l10n");
|
|||
|
||||
Object.defineProperty(this, "WebConsoleUtils", {
|
||||
get: function () {
|
||||
return require("devtools/shared/webconsole/utils").Utils;
|
||||
return require("devtools/client/webconsole/utils").Utils;
|
||||
},
|
||||
configurable: true,
|
||||
enumerable: true
|
||||
|
|
|
@ -24,7 +24,7 @@ const XHTML_NS = "http://www.w3.org/1999/xhtml";
|
|||
const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
|
||||
const STRINGS_URI = "chrome://devtools/locale/webconsole.properties";
|
||||
|
||||
const WebConsoleUtils = require("devtools/shared/webconsole/utils").Utils;
|
||||
const WebConsoleUtils = require("devtools/client/webconsole/utils").Utils;
|
||||
const { getSourceNames } = require("devtools/client/shared/source-utils");
|
||||
const {Task} = require("devtools/shared/task");
|
||||
const l10n = new WebConsoleUtils.L10n(STRINGS_URI);
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
const {Cc, Ci, Cu} = require("chrome");
|
||||
|
||||
var WebConsoleUtils = require("devtools/shared/webconsole/utils").Utils;
|
||||
var WebConsoleUtils = require("devtools/client/webconsole/utils").Utils;
|
||||
var { extend } = require("sdk/core/heritage");
|
||||
var {TargetFactory} = require("devtools/client/framework/target");
|
||||
var {Tools} = require("devtools/client/definitions");
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
const {Ci} = require("chrome");
|
||||
|
||||
const {Utils: WebConsoleUtils} =
|
||||
require("devtools/shared/webconsole/utils");
|
||||
require("devtools/client/webconsole/utils");
|
||||
const promise = require("promise");
|
||||
const Debugger = require("Debugger");
|
||||
const Services = require("Services");
|
||||
|
|
|
@ -17,5 +17,6 @@ DevToolsModules(
|
|||
'hudservice.js',
|
||||
'jsterm.js',
|
||||
'panel.js',
|
||||
'utils.js',
|
||||
'webconsole.js',
|
||||
)
|
||||
|
|
|
@ -17,7 +17,7 @@ const {
|
|||
LEVELS,
|
||||
SEVERITY_LOG,
|
||||
} = require("../constants");
|
||||
const WebConsoleUtils = require("devtools/shared/webconsole/utils").Utils;
|
||||
const WebConsoleUtils = require("devtools/client/webconsole/utils").Utils;
|
||||
const STRINGS_URI = "chrome://devtools/locale/webconsole.properties";
|
||||
const l10n = new WebConsoleUtils.L10n(STRINGS_URI);
|
||||
const { ConsoleMessage } = require("../types");
|
||||
|
|
|
@ -10,7 +10,7 @@ const TEST_URI = "data:text/html;charset=utf-8,<p>test for bug 642615";
|
|||
XPCOMUtils.defineLazyServiceGetter(this, "clipboardHelper",
|
||||
"@mozilla.org/widget/clipboardhelper;1",
|
||||
"nsIClipboardHelper");
|
||||
var WebConsoleUtils = require("devtools/shared/webconsole/utils").Utils;
|
||||
var WebConsoleUtils = require("devtools/client/webconsole/utils").Utils;
|
||||
|
||||
add_task(function* () {
|
||||
yield loadTab(TEST_URI);
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
// shared-head.js handles imports, constants, and utility functions
|
||||
Services.scriptloader.loadSubScript("chrome://mochitests/content/browser/devtools/client/framework/test/shared-head.js", this);
|
||||
|
||||
var {Utils: WebConsoleUtils} = require("devtools/shared/webconsole/utils");
|
||||
var {Utils: WebConsoleUtils} = require("devtools/client/webconsole/utils");
|
||||
var {Messages} = require("devtools/client/webconsole/console-output");
|
||||
const asyncStorage = require("devtools/shared/async-storage");
|
||||
const HUDService = require("devtools/client/webconsole/hudservice");
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
const {Cc, Ci, Cu} = require("chrome");
|
||||
|
||||
const {Utils: WebConsoleUtils, CONSOLE_WORKER_IDS} =
|
||||
require("devtools/shared/webconsole/utils");
|
||||
require("devtools/client/webconsole/utils");
|
||||
const { getSourceNames } = require("devtools/client/shared/source-utils");
|
||||
const BrowserLoaderModule = {};
|
||||
Cu.import("resource://devtools/client/shared/browser-loader.js", BrowserLoaderModule);
|
||||
|
|
|
@ -9,7 +9,7 @@ var Services = require("Services");
|
|||
var { ActorPool } = require("devtools/server/actors/common");
|
||||
var { TabSources } = require("./utils/TabSources");
|
||||
var makeDebugger = require("./utils/make-debugger");
|
||||
var { ConsoleAPIListener } = require("devtools/shared/webconsole/utils");
|
||||
var { ConsoleAPIListener } = require("devtools/server/actors/utils/webconsole-utils");
|
||||
var DevToolsUtils = require("devtools/shared/DevToolsUtils");
|
||||
var { assert, update } = DevToolsUtils;
|
||||
|
||||
|
|
|
@ -12,5 +12,7 @@ DevToolsModules(
|
|||
'map-uri-to-addon-id.js',
|
||||
'stack.js',
|
||||
'TabSources.js',
|
||||
'walker-search.js'
|
||||
'walker-search.js',
|
||||
'webconsole-utils.js',
|
||||
'webconsole-worker-utils.js',
|
||||
)
|
||||
|
|
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
@ -33,9 +33,9 @@ for (let name of ["WebConsoleUtils", "ConsoleServiceListener",
|
|||
prop = "Utils";
|
||||
}
|
||||
if (isWorker) {
|
||||
return require("devtools/shared/webconsole/worker-utils")[prop];
|
||||
return require("devtools/server/actors/utils/webconsole-worker-utils")[prop];
|
||||
} else {
|
||||
return require("devtools/shared/webconsole/utils")[prop];
|
||||
return require("devtools/server/actors/utils/webconsole-utils")[prop];
|
||||
}
|
||||
}.bind(null, name),
|
||||
configurable: true,
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
"use strict";
|
||||
|
||||
const { console, ConsoleAPI } = require("resource://gre/modules/Console.jsm");
|
||||
const { ConsoleAPIListener } = require("devtools/shared/webconsole/utils");
|
||||
const { ConsoleAPIListener } = require("devtools/server/actors/utils/webconsole-utils");
|
||||
const Services = require("Services");
|
||||
|
||||
var seenMessages = 0;
|
||||
|
|
|
@ -15,6 +15,4 @@ DevToolsModules(
|
|||
'network-monitor.js',
|
||||
'server-logger-monitor.js',
|
||||
'server-logger.js',
|
||||
'utils.js',
|
||||
'worker-utils.js',
|
||||
)
|
||||
|
|
|
@ -15,7 +15,7 @@ var {console} = Cu.import("resource://gre/modules/Console.jsm", {});
|
|||
|
||||
var {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
|
||||
var Services = require("Services");
|
||||
var WebConsoleUtils = require("devtools/shared/webconsole/utils").Utils;
|
||||
var WebConsoleUtils = require("devtools/client/webconsole/utils").Utils;
|
||||
var {Task} = require("devtools/shared/task");
|
||||
|
||||
var ConsoleAPIStorage = Cc["@mozilla.org/consoleAPI-storage;1"]
|
||||
|
@ -24,7 +24,7 @@ var {DebuggerServer} = require("devtools/server/main");
|
|||
var {DebuggerClient, ObjectClient} = require("devtools/shared/client/main");
|
||||
|
||||
var {ConsoleServiceListener, ConsoleAPIListener} =
|
||||
require("devtools/shared/webconsole/utils");
|
||||
require("devtools/server/actors/utils/webconsole-utils");
|
||||
|
||||
function initCommon()
|
||||
{
|
||||
|
|
|
@ -18,7 +18,7 @@ SimpleTest.waitForExplicitFinish();
|
|||
let gState;
|
||||
let tests;
|
||||
|
||||
let {WebConsoleCommands} = require("devtools/shared/webconsole/utils");
|
||||
let {WebConsoleCommands} = require("devtools/server/actors/utils/webconsole-utils");
|
||||
|
||||
function evaluateJS(input) {
|
||||
return new Promise((resolve) => gState.client.evaluateJS(input, resolve));
|
||||
|
|
|
@ -21,10 +21,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "gScriptSecurityManager",
|
|||
"@mozilla.org/scriptsecuritymanager;1",
|
||||
"nsIScriptSecurityManager");
|
||||
XPCOMUtils.defineLazyGetter(this, "WebConsoleUtils", () => {
|
||||
return this.devtools.require("devtools/shared/webconsole/utils").Utils;
|
||||
});
|
||||
XPCOMUtils.defineLazyGetter(this, "l10n", () => {
|
||||
return new this.WebConsoleUtils.L10n(STRINGS_URI);
|
||||
return this.devtools.require("devtools/server/actors/utils/webconsole-utils").Utils;
|
||||
});
|
||||
|
||||
this.InsecurePasswordUtils = {
|
||||
|
@ -34,7 +31,8 @@ this.InsecurePasswordUtils = {
|
|||
let category = "Insecure Password Field";
|
||||
// All web console messages are warnings for now.
|
||||
let flag = Ci.nsIScriptError.warningFlag;
|
||||
let message = l10n.getStr(messageTag);
|
||||
let bundle = Services.strings.createBundle(STRINGS_URI);
|
||||
let message = bundle.GetStringFromName(messageTag);
|
||||
let consoleMsg = Cc["@mozilla.org/scripterror;1"].createInstance(Ci.nsIScriptError);
|
||||
consoleMsg.initWithWindowID(message, domDoc.location.href, 0, 0, 0, flag, category, windowId);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче