Changeset 6730 in webkit

Timestamp:

May 28, 2004, 2:40:42 PM (21 years ago)

Author:

rjw

Message:

setStrokeColor and setFillColor now support
old school web color string, oswcs+alpha, gray, gray+alpha,
rgba, and cmyka.

Reviewed by jay-lo.

• khtml/css/cssparser.cpp: (CSSParser::parseColor): (CSSParser::parseColorFromValue):
• khtml/css/cssparser.h: Made parseColor static public class method
• khtml/ecma/kjs_html.cpp: (KJS::Context2DFunction::tryCall):

Location:

trunk/WebCore

Files:

• ChangeLog-2005-08-23 (modified) (1 diff)
• khtml/css/cssparser.cpp (modified) (2 diffs)
• khtml/css/cssparser.h (modified) (2 diffs)
• khtml/ecma/kjs_html.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog-2005-08-23

@@ +1 @@
+2004-05-28  Richard Williamson   <rjw@apple.com>
+
+        setStrokeColor and setFillColor now support
+        old school web color string, oswcs+alpha, gray, gray+alpha,
+        rgba, and cmyka.
+
+        Reviewed by jay-lo.
+
+        * khtml/css/cssparser.cpp:
+        (CSSParser::parseColor):
+        (CSSParser::parseColorFromValue):
+        * khtml/css/cssparser.h: Made parseColor static public class method
+        * khtml/ecma/kjs_html.cpp:
+        (KJS::Context2DFunction::tryCall):
+
 2004-05-28  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/khtml/css/cssparser.cpp

@@ -1663 +1663 @@
 
 
-static bool parseColor(const QString &name, QRgb& rgb)
+bool CSSParser::parseColor(const QString &name, QRgb& rgb)
 {
     int len = name.length();
@@ -1715 +1715 @@
         QString str;
         str.sprintf( "%06d", (int)(value->fValue+.5) );
-        if (!::parseColor( str, c ))
+        if (!CSSParser::parseColor( str, c ))
             return 0;
     } else if ( value->unit == CSSPrimitiveValue::CSS_RGBCOLOR ||
                 value->unit == CSSPrimitiveValue::CSS_IDENT ||
                 value->unit == CSSPrimitiveValue::CSS_DIMENSION ) {
-        if (!::parseColor( qString( value->string ), c))
+        if (!CSSParser::parseColor( qString( value->string ), c))
             return 0;
     }

trunk/WebCore/khtml/css/cssparser.h

@@ -25 +25 @@
 
 #include <qstring.h>
+#include <qcolor.h>
 #include <dom/dom_string.h>
 #include "xml/dom_atomicstring.h"
@@ -132 +133 @@
         CSSPrimitiveValueImpl *parseColorFromValue(Value* val);
 
+        static bool parseColor(const QString &name, QRgb& rgb);
+
         // CSS3 Parsing Routines (for properties specific to CSS3)
         bool parseShadow(int propId, bool important);

trunk/WebCore/khtml/ecma/kjs_html.cpp

@@ -52 +52 @@
 
 #include <kdebug.h>
+
+#include "cssparser.h"
 
 #include "qcolor.h"
@@ -3385 +3387 @@
         }
         case Context2D::SetStrokeColor: {
-            if (args.size() < 1 || args.size() > 2) {
-                Object err = Error::create(exec,SyntaxError);
-                exec->setException(err);
-                return err;
+            // string arg = named color
+            // string arg, number arg = named color, alpha
+            // number arg = gray color
+            // number arg, number arg = gray color, alpha
+            // 4 args (string or number) = r, g, b, a
+            // 5 args (string or number) = c, m, y, k, a
+            int numArgs = args.size();
+            switch (numArgs) {
+                case 1: {
+                    if (args[0].type() == StringType) {
+                        QRgb rgb = 0;
+                        DOM::CSSParser::parseColor(args[0].toString(exec).qstring(), rgb);
+                        QColor color(rgb);
+                        CGContextSetRGBStrokeColor(drawingContext, color.red(), color.green(), color.blue(), 1.);
+                    }
+                    else {
+                        float g = (float)args[0].toNumber(exec);
+                        CGContextSetGrayStrokeColor(drawingContext, g, 1.);
+                    }
+                }
+                break;
+                case 2: {
+                    float a = args[1].toNumber(exec);
+                    if (args[0].type() == StringType) {
+                        QRgb rgb = 0;
+                        DOM::CSSParser::parseColor(args[0].toString(exec).qstring(), rgb);
+                        QColor color(rgb);
+                        CGContextSetRGBStrokeColor(drawingContext, color.red(), color.green(), color.blue(), a);
+                    }
+                    else {
+                        float g = (float)args[0].toNumber(exec);
+                        CGContextSetGrayStrokeColor(drawingContext, g, a);
+                    }
+                }
+                break;
+                case 4: {
+                    float r = (float)args[0].toNumber(exec);
+                    float g = (float)args[1].toNumber(exec);
+                    float b = (float)args[2].toNumber(exec);
+                    float a = (float)args[3].toNumber(exec);
+                    CGContextSetRGBStrokeColor(drawingContext, r, g, b, a);
+                }
+                break;
+                case 5: {
+                    float c = (float)args[0].toNumber(exec);
+                    float m = (float)args[1].toNumber(exec);
+                    float y = (float)args[2].toNumber(exec);
+                    float k = (float)args[3].toNumber(exec);
+                    float a = (float)args[4].toNumber(exec);
+                    CGContextSetCMYKStrokeColor(drawingContext, c, m, y, k, a);
+                }
+                default: {
+                    Object err = Error::create(exec,SyntaxError);
+                    exec->setException(err);
+                    return err;
+                }
             }
-            QColor color;
-            if (args.size() > 0)
-                color = QColor(args[0].toString(exec).ascii());
-            float alpha;
-            if (args.size() > 1)
-                alpha = (float)args[1].toNumber(exec);
-            else
-                alpha = 1.;
-            CGContextSetRGBStrokeColor(drawingContext, color.red(), color.green(), color.blue(), alpha);
             break;
         }
         case Context2D::SetFillColor: {
-            if (args.size() < 1 || args.size() > 2) {
-                Object err = Error::create(exec,SyntaxError);
-                exec->setException(err);
-                return err;
+            // string arg = named color
+            // string arg, number arg = named color, alpha
+            // number arg = gray color
+            // number arg, number arg = gray color, alpha
+            // 4 args (string or number) = r, g, b, a
+            // 5 args (string or number) = c, m, y, k, a
+            int numArgs = args.size();
+            switch (numArgs) {
+                case 1: {
+                    if (args[0].type() == StringType) {
+                        QRgb rgb = 0;
+                        DOM::CSSParser::parseColor(args[0].toString(exec).qstring(), rgb);
+                        QColor color(rgb);
+                        CGContextSetRGBFillColor(drawingContext, color.red(), color.green(), color.blue(), 1.);
+                    }
+                    else {
+                        float g = (float)args[0].toNumber(exec);
+                        CGContextSetGrayFillColor(drawingContext, g, 1.);
+                    }
+                }
+                break;
+                case 2: {
+                    float a = args[1].toNumber(exec);
+                    if (args[0].type() == StringType) {
+                        QRgb rgb = 0;
+                        DOM::CSSParser::parseColor(args[0].toString(exec).qstring(), rgb);
+                        QColor color(rgb);
+                        CGContextSetRGBFillColor(drawingContext, color.red(), color.green(), color.blue(), a);
+                    }
+                    else {
+                        float g = (float)args[0].toNumber(exec);
+                        CGContextSetGrayFillColor(drawingContext, g, a);
+                    }
+                }
+                break;
+                case 4: {
+                    float r = (float)args[0].toNumber(exec);
+                    float g = (float)args[1].toNumber(exec);
+                    float b = (float)args[2].toNumber(exec);
+                    float a = (float)args[3].toNumber(exec);
+                    CGContextSetRGBFillColor(drawingContext, r, g, b, a);
+                }
+                break;
+                case 5: {
+                    float c = (float)args[0].toNumber(exec);
+                    float m = (float)args[1].toNumber(exec);
+                    float y = (float)args[2].toNumber(exec);
+                    float k = (float)args[3].toNumber(exec);
+                    float a = (float)args[4].toNumber(exec);
+                    CGContextSetCMYKStrokeColor(drawingContext, c, m, y, k, a);
+                }
+                default: {
+                    Object err = Error::create(exec,SyntaxError);
+                    exec->setException(err);
+                    return err;
+                }
             }
-            QColor color;
-            if (args.size() > 0)
-                color = QColor(args[0].toString(exec).ascii());
-            float alpha;
-            if (args.size() > 1)
-                alpha = (float)args[1].toNumber(exec);
-            else
-                alpha = 1.;
-            CGContextSetRGBFillColor(drawingContext, color.red(), color.green(), color.blue(), alpha);
             break;
         }