Bug 1235781 - Fix per platform css and browser css rule for eyedropper. r=bgrins

devtools/client/eyedropper/eyedropper.xul

@@ -9,7 +9,10 @@
 <?xml-stylesheet href="chrome://devtools/skin/common.css"?>
 <?xml-stylesheet href="chrome://devtools/skin/eyedropper.css" type="text/css"?>
 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        no-theme="true">
+  <script type="application/javascript;version=1.8"
+          src="chrome://devtools/content/shared/theme-switching.js"/>
   <commandset id="eyedropper-commandset">
     <command id="eyedropper-cmd-close"
              oncommand="void(0);"/>

devtools/client/shared/theme-switching.js

@@ -5,6 +5,25 @@
 (function() {
   const SCROLLBARS_URL = "chrome://devtools/skin/floating-scrollbars-light.css";
   let documentElement = document.documentElement;
+
+  let os;
+  let platform = navigator.platform;
+  if (platform.startsWith("Win")) {
+    os = "win";
+  } else if (platform.startsWith("Mac")) {
+    os = "mac";
+  } else {
+    os = "linux";
+  }
+
+  documentElement.setAttribute("platform", os);
+
+  // no-theme attributes allows to just est the platform attribute
+  // to have per-platform CSS working correctly.
+  if (documentElement.getAttribute("no-theme") === "true") {
+    return;
+  }
+
   let devtoolsStyleSheets = new WeakMap();
 
   function forceStyle() {
@@ -144,17 +163,6 @@
   const {require} = Components.utils.import("resource://devtools/shared/Loader.jsm", {});
   const StylesheetUtils = require("sdk/stylesheet/utils");
 
-  let os;
-  let platform = navigator.platform;
-  if (platform.startsWith("Win")) {
-    os = "win";
-  } else if (platform.startsWith("Mac")) {
-    os = "mac";
-  } else {
-    os = "linux";
-  }
-  documentElement.setAttribute("platform", os);
-
   if (documentElement.hasAttribute("force-theme")) {
     switchTheme(documentElement.getAttribute("force-theme"));
   } else {

devtools/client/themes/common.css

@@ -215,17 +215,6 @@
   background: transparent;
 }
 
-/* Eyedropper Widget */
-
-.devtools-eyedropper-panel {
-  pointer-events: none;
-  -moz-appearance: none;
-  width: 156px;
-  height: 120px;
-  background-color: transparent;
-  border: none;
-}
-
 /* links to source code, like displaying `myfile.js:45` */
 
 .devtools-source-link {

devtools/client/themes/devtools-browser.css

@@ -13,3 +13,15 @@
   min-width: 465px;
 }
 
+/* Eyedropper Widget */
+/* <panel> added to mainPopupSet */
+
+.devtools-eyedropper-panel {
+  pointer-events: none;
+  -moz-appearance: none;
+  width: 156px;
+  height: 120px;
+  background-color: transparent;
+  border: none;
+}
+