DevTools: follow up to r361550, fix the color picker background and allow for themed stylesheet mar…

third_party/WebKit/Source/devtools/front_end/ui/UIUtils.js

 /*
  * Copyright (C) 2011 Google Inc.  All rights reserved.
  * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com).
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
@@ skipping 1521 matching lines @@
     },
 
     /**
      * @param {!Document} document
      */
     applyTheme: function(document)
     {
         if (!this._hasTheme())
             return;
 
+        if (this._themeName === "dark" || this._themeName === "bw" || this._themeName === "nostalgie")
+            document.body.classList.add("-theme-with-dark-background");
+
         var styleSheets = document.styleSheets;
         var result = [];
         for (var i = 0; i < styleSheets.length; ++i)
             result.push(this._patchForTheme(styleSheets[i].href, styleSheets[i]));
         result.push("/*# sourceURL=inspector_theme.css */");
 
         var styleElement = createElement("style");
         styleElement.type = "text/css";
         styleElement.textContent = result.join("\n");
         document.head.appendChild(styleElement);
@@ skipping 71 matching lines @@
     {
         if (!this._themableProperties.has(name))
             return;
 
         var value = style.getPropertyValue(name);
         if (!value || value === "none" || value === "inherit" || value === "initial" || value === "transparent")
             return;
         if (name === "background-image" && value.indexOf("gradient") === -1)
             return;
 
+        if (selectorText.indexOf("-theme-") !== -1)
+            return;
+
         var isSelection = selectorText.indexOf("select") !== -1 || selectorText.indexOf("execution") !== -1;
-        var isSyntax = selectorText.indexOf("cm-") === -1 && selectorText.indexOf("webkit-") === -1;
         var isBackground = name.indexOf("background") === 0 || name.indexOf("border") === 0;
         var isForeground = name.indexOf("background") === -1;
 
         var colorRegex = /((?:rgb|hsl)a?\([^)]+\)|#[0-9a-fA-F]{6}|#[0-9a-fA-F]{3}|\b\w+\b(?!-))/g;
         output.push(name);
         output.push(":");
         var items = value.replace(colorRegex, "\0$1\0").split("\0");
         for (var i = 0; i < items.length; ++i)
-            output.push(this._patchColor(items[i], isSelection, isSyntax, isBackground, isForeground));
+            output.push(this._patchColor(items[i], isSelection, isBackground, isForeground));
         if (style.getPropertyPriority(name))
             output.push(" !important");
         output.push(";");
     },
 
     /**
      * @param {string} text
      * @param {boolean} isSelection
-     * @param {boolean} isSyntax
      * @param {boolean} isBackground
      * @param {boolean} isForeground
      * @return {string}
      */
-    _patchColor: function(text, isSelection, isSyntax, isBackground, isForeground)
+    _patchColor: function(text, isSelection, isBackground, isForeground)
     {
         var color = WebInspector.Color.parse(text);
         if (!color)
             return text;
 
         var hsla = color.hsla();
 
-        this._patchHSLA(hsla, isSelection, isSyntax, isBackground, isForeground);
+        this._patchHSLA(hsla, isSelection, isBackground, isForeground);
 
         var rgba = [];
         WebInspector.Color.hsl2rgb(hsla, rgba);
         var outColor = new WebInspector.Color(rgba, color.format());
         var outText = outColor.asString(null);
         if (!outText)
             outText = outColor.asString(outColor.hasAlpha() ? WebInspector.Color.Format.RGBA : WebInspector.Color.Format.RGB);
         return outText || text;
     },
 
     /**
      * @param {!Array<number>} hsla
      * @param {boolean} isSelection
-     * @param {boolean} isSyntax
      * @param {boolean} isBackground
      * @param {boolean} isForeground
      */
-    _patchHSLA: function(hsla, isSelection, isSyntax, isBackground, isForeground)
+    _patchHSLA: function(hsla, isSelection, isBackground, isForeground)
     {
         var hue = hsla[0];
         var sat = hsla[1];
         var lit = hsla[2];
         var alpha = hsla[3]
         var isSelectionBlue = isSelection && hue > 0.57 && hue < 0.68;
 
         switch (this._themeName) {
         case "dark":
             if (isSelectionBlue)
@@ skipping 21 matching lines @@
                 sat = 0.82;
             }
             break;
         case "blue":
             if (sat < 0.17) {
                 hue = 0.66;
                 sat = 0.82;
             }
             break;
         case "bw":
-            if (isSelectionBlue)
-                hue = 27 / 360;
-
             lit = 1 - lit;
             if (lit > 0.98 && isForeground)
                 lit = 0.98;
 
-            if (!isSyntax) {
-                if (lit > 0.8)
-                    lit = 1;
-                if (lit < 0.2)
-                    lit = 0;
-                sat = 0;
-            }
+            if (lit > 0.8)
+                lit = 1;
+            if (lit < 0.2)
+                lit = 0;
+            sat = 0;
+
             break;
         case "nostalgie":
             lit = 1 - lit;
 
             if (isSelectionBlue) {
                 hue = 0.5;
                 lit -= 0.1;
                 break;
             }
 
@@ skipping 18 matching lines @@
         }
         hsla[0] = Number.constrain(hue, 0, 1);
         hsla[1] = Number.constrain(sat, 0, 1);
         hsla[2] = Number.constrain(lit, 0, 1);
         hsla[3] = Number.constrain(alpha, 0, 1);
     }
 }
 
 /** @type {!WebInspector.ThemeSupport} */
 WebInspector.themeSupport;