Bug 918305 - Move css-color.js in /toolkit/ r=paul

browser/devtools/markupview/markup-view.js

@@ -17,7 +17,7 @@ const COLLAPSE_DATA_URL_LENGTH = 60;
 const {UndoStack} = require("devtools/shared/undo");
 const {editableField, InplaceEditor} = require("devtools/shared/inplace-editor");
 const {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
-const {colorUtils} = require("devtools/shared/css-color");
+const {colorUtils} = require("devtools/css-color");
 const promise = require("sdk/core/promise");
 
 Cu.import("resource://gre/modules/devtools/LayoutHelpers.jsm");

browser/devtools/shared/test/browser_css_color.js

@@ -6,7 +6,7 @@ const COLOR_UNIT_PREF = "devtools.defaultColorUnit";
 let origColorUnit;
 let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
 let {Loader} = Cu.import("resource://gre/modules/commonjs/toolkit/loader.js", {});
-let {colorUtils} = devtools.require("devtools/shared/css-color");
+let {colorUtils} = devtools.require("devtools/css-color");
 
 function test() {
   waitForExplicitFinish();

browser/devtools/styleinspector/computed-view.js

@@ -11,7 +11,7 @@ let {CssLogic} = require("devtools/styleinspector/css-logic");
 let {ELEMENT_STYLE} = require("devtools/server/actors/styles");
 let promise = require("sdk/core/promise");
 let {EventEmitter} = require("devtools/shared/event-emitter");
-let {colorUtils} = require("devtools/shared/css-color");
+let {colorUtils} = require("devtools/css-color");
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/PluralForm.jsm");

browser/devtools/styleinspector/rule-view.js

@@ -12,7 +12,7 @@ const promise = require("sdk/core/promise");
 let {CssLogic} = require("devtools/styleinspector/css-logic");
 let {InplaceEditor, editableField, editableItem} = require("devtools/shared/inplace-editor");
 let {ELEMENT_STYLE, PSEUDO_ELEMENTS} = require("devtools/server/actors/styles");
-let {colorUtils} = require("devtools/shared/css-color");
+let {colorUtils} = require("devtools/css-color");
 let {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
 
 Cu.import("resource://gre/modules/Services.jsm");

modules/libpref/src/init/all.js

@@ -487,6 +487,9 @@ pref("devtools.debugger.enable-content-actors", true);
 // Block tools from seeing / interacting with certified apps
 pref("devtools.debugger.forbid-certified-apps", true);
 
+// DevTools default color unit
+pref("devtools.defaultColorUnit", "hex");
+
 // view source
 pref("view_source.syntax_highlight", true);
 pref("view_source.wrap_long_lines", false);

toolkit/devtools/Loader.jsm

@@ -57,6 +57,7 @@ var BuiltinProvider = {
         "devtools/toolkit/webconsole": "resource://gre/modules/devtools/toolkit/webconsole",
         "devtools/app-actor-front": "resource://gre/modules/devtools/app-actor-front.js",
         "devtools/styleinspector/css-logic": "resource://gre/modules/devtools/styleinspector/css-logic",
+        "devtools/css-color": "resource://gre/modules/devtools/css-color",
         "devtools/client": "resource://gre/modules/devtools/client",
 
         "escodegen/escodegen": "resource://gre/modules/devtools/escodegen/escodegen",

toolkit/devtools/css-color.js

@@ -35,7 +35,7 @@ let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
  *
  * Usage:
  *   let {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
- *   let {colorUtils} = devtools.require("devtools/shared/css-color");
+ *   let {colorUtils} = devtools.require("devtools/css-color");
  *
  *   color.authored === "red"
  *   color.hasAlpha === false

toolkit/devtools/styleinspector/css-logic.js

@@ -51,7 +51,7 @@ const RX_PSEUDO = /\s*:?:([\w-]+)(\(?\)?)\s*/g;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
-let {colorUtils} = require("devtools/shared/css-color");
+let {colorUtils} = require("devtools/css-color");
 
 function CssLogic()
 {