Bug 1102240 - rename actors/inspector/inspector.js to inspector-actor.js;r=pbro draft
authorJulian Descottes <jdescottes@mozilla.com>
Fri, 26 Jan 2018 13:15:06 +0100
changeset 748814 3261e4b20359aa09363f5193e8411d5f7e15466e
parent 748813 82ec49987a132cdf09722a891bca1ba02ca895cb
child 748815 13e8f45da194a4de11ec59aecb8ea96a939df4e1
push id97244
push userjdescottes@mozilla.com
push dateTue, 30 Jan 2018 14:06:36 +0000
reviewerspbro
bugs1102240
milestone60.0a1
Bug 1102240 - rename actors/inspector/inspector.js to inspector-actor.js;r=pbro MozReview-Commit-ID: dfzTyhZXez
devtools/client/framework/toolbox-highlighter-utils.js
devtools/server/actors/inspector/inspector-actor.js
devtools/server/actors/inspector/inspector.js
devtools/server/actors/inspector/moz.build
devtools/server/main.js
devtools/server/tests/mochitest/test_highlighter_paused_debugger.html
devtools/shared/gcli/commands/highlight.js
devtools/shared/gcli/commands/measure.js
devtools/shared/gcli/commands/rulers.js
--- a/devtools/client/framework/toolbox-highlighter-utils.js
+++ b/devtools/client/framework/toolbox-highlighter-utils.js
@@ -211,17 +211,17 @@ exports.getHighlighterUtils = function (
   function onPickerNodeCanceled() {
     cancelPicker();
     toolbox.win.focus();
   }
 
   /**
    * Show the box model highlighter on a node in the content page.
    * The node needs to be a NodeFront, as defined by the inspector actor
-   * @see devtools/server/actors/inspector/inspector.js
+   * @see devtools/server/actors/inspector/inspector-actor.js
    * @param {NodeFront} nodeFront The node to highlight
    * @param {Object} options
    * @return A promise that resolves when the node has been highlighted
    */
   let highlightNodeFront = exported.highlightNodeFront = requireInspector(
   function* (nodeFront, options = {}) {
     if (!nodeFront) {
       return;
rename from devtools/server/actors/inspector/inspector.js
rename to devtools/server/actors/inspector/inspector-actor.js
--- a/devtools/server/actors/inspector/moz.build
+++ b/devtools/server/actors/inspector/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
 DevToolsModules(
   'document-walker.js',
-  'inspector.js',
+  'inspector-actor.js',
   'node-actor.js',
   'utils.js',
   'walker-actor.js',
 )
 
 with Files('**'):
     BUG_COMPONENT = ('Firefox', 'Developer Tools: Inspector')
--- a/devtools/server/main.js
+++ b/devtools/server/main.js
@@ -444,17 +444,17 @@ var DebuggerServer = {
    * Install tab actors.
    */
   _addTabActors() {
     this.registerModule("devtools/server/actors/webconsole", {
       prefix: "console",
       constructor: "WebConsoleActor",
       type: { tab: true }
     });
-    this.registerModule("devtools/server/actors/inspector/inspector", {
+    this.registerModule("devtools/server/actors/inspector/inspector-actor", {
       prefix: "inspector",
       constructor: "InspectorActor",
       type: { tab: true }
     });
     this.registerModule("devtools/server/actors/call-watcher", {
       prefix: "callWatcher",
       constructor: "CallWatcherActor",
       type: { tab: true }
--- a/devtools/server/tests/mochitest/test_highlighter_paused_debugger.html
+++ b/devtools/server/tests/mochitest/test_highlighter_paused_debugger.html
@@ -14,17 +14,17 @@ Test the PausedDebuggerOverlay highlight
 <script>
 "use strict";
 
 window.onload = function () {
   SimpleTest.waitForExplicitFinish();
 
   const {utils: Cu} = Components;
   const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {});
-  require("devtools/server/actors/inspector/inspector");
+  require("devtools/server/actors/inspector/inspector-actor");
   const {HighlighterEnvironment} = require("devtools/server/actors/highlighters");
   const {PausedDebuggerOverlay} = require("devtools/server/actors/highlighters/paused-debugger");
 
   const env = new HighlighterEnvironment();
   env.initFromWindow(window);
 
   const highlighter = new PausedDebuggerOverlay(env);
   const anonymousContent = highlighter.markup.content;
--- a/devtools/shared/gcli/commands/highlight.js
+++ b/devtools/shared/gcli/commands/highlight.js
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 "use strict";
 
 const l10n = require("gcli/l10n");
-require("devtools/server/actors/inspector/inspector");
+require("devtools/server/actors/inspector/inspector-actor");
 const {HighlighterEnvironment}  = require("devtools/server/actors/highlighters");
 const {BoxModelHighlighter} = require("devtools/server/actors/highlighters/box-model");
 
 const {PluralForm} = require("devtools/shared/plural-form");
 const {LocalizationHelper} = require("devtools/shared/l10n");
 const L10N = new LocalizationHelper("devtools/shared/locales/gclicommands.properties");
 
 // How many maximum nodes can be highlighted in parallel
--- a/devtools/shared/gcli/commands/measure.js
+++ b/devtools/shared/gcli/commands/measure.js
@@ -5,17 +5,17 @@
 "use strict";
 
 const EventEmitter = require("devtools/shared/event-emitter");
 
 loader.lazyRequireGetter(this, "CommandState",
   "devtools/shared/gcli/command-state", true);
 
 const l10n = require("gcli/l10n");
-require("devtools/server/actors/inspector/inspector");
+require("devtools/server/actors/inspector/inspector-actor");
 const { HighlighterEnvironment } =
   require("devtools/server/actors/highlighters");
 const { MeasuringToolHighlighter } =
   require("devtools/server/actors/highlighters/measuring-tool");
 
 const highlighters = new WeakMap();
 
 exports.items = [
--- a/devtools/shared/gcli/commands/rulers.js
+++ b/devtools/shared/gcli/commands/rulers.js
@@ -5,17 +5,17 @@
 "use strict";
 
 const EventEmitter = require("devtools/shared/event-emitter");
 
 loader.lazyRequireGetter(this, "CommandState",
   "devtools/shared/gcli/command-state", true);
 
 const l10n = require("gcli/l10n");
-require("devtools/server/actors/inspector/inspector");
+require("devtools/server/actors/inspector/inspector-actor");
 const { HighlighterEnvironment } =
   require("devtools/server/actors/highlighters");
 const { RulersHighlighter } =
   require("devtools/server/actors/highlighters/rulers");
 
 const highlighters = new WeakMap();
 
 exports.items = [