actually parse hex argb not just rgb

Author: hjanetzek

csscolorparser.cpp

@@ -259,11 +259,18 @@ std::vector<std::string> split(const std::string& s, char delim) {
 }
 
 Color CSSColorParser::parse(const std::string& css_str) {
+    int length = css_str.length();
+
+    if (length == 0) {
+        return {};
+     }
 
     // #abc and #abc123 syntax.
-    if (css_str.length() && css_str.front() == '#') {
-        if (css_str.length() == 4) {
-            int64_t iv = parseInt(css_str.c_str()+1, 16);  // TODO(deanm): Stricter parsing.
+    if (css_str.front() == '#') {
+        const char* str = css_str.c_str()+1;
+
+        if (length == 4) { // rgb
+            int64_t iv = parseInt(str, 16);  // TODO(deanm): Stricter parsing.
             if (!(iv >= 0 && iv <= 0xfff)) {
                 return {};
             } else {
@@ -274,8 +281,8 @@ Color CSSColorParser::parse(const std::string& css_str) {
                     1
                 };
             }
-        } else if (css_str.length() == 7) {
-            int64_t iv = parseInt(css_str.c_str()+1, 16);  // TODO(deanm): Stricter parsing.
+        } else if (length == 7) { // rrggbb
+            int64_t iv = parseInt(str, 16);
             if (!(iv >= 0 && iv <= 0xffffff)) {
                 return {};  // Covers NaN.
             } else {
@@ -286,8 +293,31 @@ Color CSSColorParser::parse(const std::string& css_str) {
                     1
                 };
             }
+        } else if (length == 5) { // argb
+            int64_t iv = parseInt(str, 16);
+            if (!(iv >= 0 && iv <= 0xffff)) {
+                return {};
+            } else {
+                return {
+                    static_cast<uint8_t>(((iv & 0xf00) >> 4) | ((iv & 0xf00) >> 8)),
+                    static_cast<uint8_t>((iv & 0xf0) | ((iv & 0xf0) >> 4)),
+                    static_cast<uint8_t>((iv & 0xf) | ((iv & 0xf) << 4)),
+                    static_cast<uint8_t>((iv & 0xf000) >> 12) / 255.0f,
+                };
+            }
+        } else if (length == 9) { // aarrggbb
+            int64_t iv = parseInt(str, 16);
+            if (!(iv >= 0 && iv <= 0xffffffff)) {
+                return {};  // Covers NaN.
+            } else {
+                return {
+                    static_cast<uint8_t>((iv & 0xff0000) >> 16),
+                    static_cast<uint8_t>((iv & 0xff00) >> 8),
+                    static_cast<uint8_t>(iv & 0xff),
+                    static_cast<uint8_t>((iv & 0xff000000) >> 24) / 255.0f,
+                };
+            }
         }
-
         return {};
     }