Bug 1446222 - Move CssLogic to Inspector actor dir. r=jdescottes

MozReview-Commit-ID: 8IWTgRyWXNQ

--HG--
rename : devtools/server/css-logic.js => devtools/server/actors/inspector/css-logic.js
extra : rebase_source : e88edd34f8150f15b9fb26130fd67c5c323a6d56

devtools/server/actors/highlighters/utils/markup.js

@@ -13,7 +13,7 @@ const InspectorUtils = require("InspectorUtils");
 const lazyContainer = {};
 
 loader.lazyRequireGetter(lazyContainer, "CssLogic",
-  "devtools/server/css-logic", true);
+  "devtools/server/actors/inspector/css-logic", true);
 exports.getComputedStyle = (node) =>
   lazyContainer.CssLogic.getComputedStyle(node);
 

devtools/server/actors/inspector/moz.build

@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DevToolsModules(
+  'css-logic.js',
   'document-walker.js',
   'event-parsers.js',
   'inspector.js',

devtools/server/actors/inspector/node.js

@@ -25,7 +25,7 @@ loader.lazyRequireGetter(this, "isAnonymous", "devtools/shared/layout/utils", tr
 loader.lazyRequireGetter(this, "InspectorActorUtils", "devtools/server/actors/inspector/utils");
 loader.lazyRequireGetter(this, "LongStringActor", "devtools/server/actors/string", true);
 loader.lazyRequireGetter(this, "getFontPreviewData", "devtools/server/actors/styles", true);
-loader.lazyRequireGetter(this, "CssLogic", "devtools/server/css-logic", true);
+loader.lazyRequireGetter(this, "CssLogic", "devtools/server/actors/inspector/css-logic", true);
 loader.lazyRequireGetter(this, "EventParsers", "devtools/server/actors/inspector/event-parsers", true);
 
 const EventEmitter = require("devtools/shared/event-emitter");

devtools/server/actors/layout.js

@@ -12,7 +12,7 @@ const { getStringifiableFragments } =
   require("devtools/server/actors/utils/css-grid-utils");
 
 loader.lazyRequireGetter(this, "nodeConstants", "devtools/shared/dom-node-constants");
-loader.lazyRequireGetter(this, "CssLogic", "devtools/server/css-logic", true);
+loader.lazyRequireGetter(this, "CssLogic", "devtools/server/actors/inspector/css-logic", true);
 
 /**
  * Set of actors the expose the CSS layout information to the devtools protocol clients.

devtools/server/actors/styles.js

@@ -14,7 +14,7 @@ const InspectorUtils = require("InspectorUtils");
 
 const {pageStyleSpec, styleRuleSpec, ELEMENT_STYLE} = require("devtools/shared/specs/styles");
 
-loader.lazyRequireGetter(this, "CssLogic", "devtools/server/css-logic", true);
+loader.lazyRequireGetter(this, "CssLogic", "devtools/server/actors/inspector/css-logic", true);
 loader.lazyRequireGetter(this, "SharedCssLogic", "devtools/shared/inspector/css-logic");
 loader.lazyRequireGetter(this, "getDefinedGeometryProperties",
   "devtools/server/actors/highlighters/geometry-editor", true);

devtools/server/moz.build

@@ -19,7 +19,6 @@ DevToolsModules(
     'child.js',
     'content-process-debugger-server.js',
     'content-server.jsm',
-    'css-logic.js',
     'main.js',
     'service-worker-child.js',
     'websocket-server.js',

devtools/server/tests/mochitest/test_css-logic-media-queries.html

@@ -30,7 +30,7 @@ Test that css-logic handles media-queries correctly
   window.onload = function() {
     const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
     const Services = require("Services");
-    const {CssLogic} = require("devtools/server/css-logic");
+    const {CssLogic} = require("devtools/server/actors/inspector/css-logic");
 
     SimpleTest.waitForExplicitFinish();
 

devtools/server/tests/mochitest/test_css-logic-specificity.html

@@ -14,7 +14,7 @@ Test that css-logic calculates CSS specificity properly
 
   window.onload = function() {
     const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
-    const {CssLogic, CssSelector} = require("devtools/server/css-logic");
+    const {CssLogic, CssSelector} = require("devtools/server/actors/inspector/css-logic");
     const InspectorUtils = SpecialPowers.InspectorUtils;
 
     const TEST_DATA = [

devtools/server/tests/mochitest/test_css-logic.html

@@ -13,7 +13,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
   <script type="application/javascript">
 "use strict";
 
-const {CssLogic} = require("devtools/server/css-logic");
+const {CssLogic} = require("devtools/server/actors/inspector/css-logic");
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();