Revert of Devtools Color: Basic support for #RRGGBBAA and #RGBA

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

Index: third_party/WebKit/Source/devtools/front_end/ui/ColorSwatch.js
diff --git a/third_party/WebKit/Source/devtools/front_end/ui/ColorSwatch.js b/third_party/WebKit/Source/devtools/front_end/ui/ColorSwatch.js
index 7fe3f201d98d9d66835626677f29eae88589621a..f35a7cfb36048d9d1e676fc5c6e7d5f093b973cc 100644
--- a/third_party/WebKit/Source/devtools/front_end/ui/ColorSwatch.js
+++ b/third_party/WebKit/Source/devtools/front_end/ui/ColorSwatch.js
@@ -142,20 +142,22 @@ WebInspector.ColorSwatch._nextColorFormat = function(color, curFormat)
     case cf.HSLA:
         if (color.nickname())
             return cf.Nickname;
-        return color.detectHEXFormat();
+        if (!color.hasAlpha())
+            return color.canBeShortHex() ? cf.ShortHEX : cf.HEX;
+        else
+            return cf.Original;
 
     case cf.ShortHEX:
         return cf.HEX;
 
-    case cf.ShortHEXA:
-        return cf.HEXA;
-
-    case cf.HEXA:
     case cf.HEX:
         return cf.Original;
 
     case cf.Nickname:
-        return color.detectHEXFormat();
+        if (!color.hasAlpha())
+            return color.canBeShortHex() ? cf.ShortHEX : cf.HEX;
+        else
+            return cf.Original;
 
     default:
         return cf.RGBA;