0
@@ -1,3 +1,15 @@
0
+2006-12-26  Eric Seidel  <eric@webkit.org>
0
+
0
+        Reviewed by olliej.
0
+        
0
+        ASSERT while loading SVG map
0
+        http://bugs.webkit.org/show_bug.cgi?id=11987
0
+
0
+        * svg/custom/invalid-fill-hex-expected.checksum: Added.
0
+        * svg/custom/invalid-fill-hex-expected.png: Added.
0
+        * svg/custom/invalid-fill-hex-expected.txt: Added.
0
+        * svg/custom/invalid-fill-hex.svg: Added.
0
+
0
 2006-12-27  Nikolas Zimmermann  <zimmermann@kde.org>
0
 
0
         Reviewed by Oliver.
0
@@ -4117,7 +4129,7 @@ text-clip was an incorrect test, rather than an incorrect result
0
 
0
         * editing/pasteboard/emacs-cntl-y-001.html:
0
 
0
-2006-09-27  Eric Seidel  <eric@eseidel.com>
0
+2006-09-27  Eric Seidel  <eric@webkit.org>
0
 
0
         Reviewed by mitz.
0
         
0
@@ -4146,7 +4158,7 @@ text-clip was an incorrect test, rather than an incorrect result
0
         * svg/custom/viewport-update2-expected.txt: Added.
0
         * svg/custom/viewport-update2.svg: Added.
0
 
0
-2006-09-27  Eric Seidel  <eric@eseidel.com>
0
+2006-09-27  Eric Seidel  <eric@webkit.org>
0
 
0
         Reviewed by darin.
0
         
0
@@ -4185,7 +4197,7 @@ text-clip was an incorrect test, rather than an incorrect result
0
         * editing/pasteboard/emacs-cntl-y-001-expected.txt: Added.
0
         * editing/pasteboard/emacs-cntl-y-001.html: Added.
0
 
0
-2006-09-26  Eric Seidel  <eric@eseidel.com>
0
+2006-09-26  Eric Seidel  <eric@webkit.org>
0
 
0
         Reviewed by Tim H.
0
         
0
@@ -4197,7 +4209,7 @@ text-clip was an incorrect test, rather than an incorrect result
0
         * svg/hixie/viewbox/003-expected.txt: Added.
0
         * svg/hixie/viewbox/003.xml: Added.
0
 
0
-2006-09-26  Eric Seidel  <eric@eseidel.com>
0
+2006-09-26  Eric Seidel  <eric@webkit.org>
0
 
0
         Reviewed by Tim H.
0
 
0
@@ -4209,7 +4221,7 @@ text-clip was an incorrect test, rather than an incorrect result
0
         * svg/custom/createelement-expected.txt: Added.
0
         * svg/custom/createelement.svg: Added.
0
 
0
-2006-09-26  Eric Seidel  <eric@eseidel.com>
0
+2006-09-26  Eric Seidel  <eric@webkit.org>
0
 
0
         Reviewed by Tim H.
0
         
0
@@ -4228,7 +4240,7 @@ text-clip was an incorrect test, rather than an incorrect result
0
         * editing/execCommand/indent-empty-root-expected.txt: Added.
0
         * editing/execCommand/indent-empty-root.html: Added.
0
 
0
-2006-09-24  Eric Seidel  <eric@eseidel.com>
0
+2006-09-24  Eric Seidel  <eric@webkit.org>
0
 
0
         Reviewed by mjs.
0
         
0
@@ -4266,7 +4278,7 @@ text-clip was an incorrect test, rather than an incorrect result
0
         * svg/custom/viewport-clip-expected.txt: Added.
0
         * svg/custom/viewport-clip.svg: Added.
0
 
0
-2006-09-24  Eric Seidel  <eric@eseidel.com>
0
+2006-09-24  Eric Seidel  <eric@webkit.org>
0
 
0
         Reviewed by beth.
0
 
0
@@ -4278,7 +4290,7 @@ text-clip was an incorrect test, rather than an incorrect result
0
         * svg/custom/invalid-fill-expected.txt: Added.
0
         * svg/custom/invalid-fill.svg: Added.
0
 
0
-2006-09-24  Eric Seidel  <eric@eseidel.com>
0
+2006-09-24  Eric Seidel  <eric@webkit.org>
0
 
0
         Reviewed by hyatt.
0
         
0
@@ -4414,7 +4426,7 @@ text-clip was an incorrect test, rather than an incorrect result
0
         * fast/forms/file-input-direction-expected.txt: Added.
0
         * fast/forms/file-input-direction.html: Added.
0
 
0
-2006-09-20  Eric Seidel  <eric@eseidel.com>
0
+2006-09-20  Eric Seidel  <eric@webkit.org>
0
 
0
         Reviewed by hyatt.
0
         
0
@@ -4429,7 +4441,7 @@ text-clip was an incorrect test, rather than an incorrect result
0
         * svg/W3C-SVG-1.1/painting-marker-02-f-expected.png:
0
         * svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt:
0
 
0
-2006-09-19  Eric Seidel  <eric@eseidel.com>
0
+2006-09-19  Eric Seidel  <eric@webkit.org>
0
 
0
         Reviewed by adele.
0
         
0
@@ -4461,7 +4473,7 @@ text-clip was an incorrect test, rather than an incorrect result
0
         * svg/custom/non-opaque-filters-expected.txt:
0
         * svg/custom/text-filter-expected.txt:
0
 
0
-2006-09-19  Eric Seidel  <eric@eseidel.com>
0
+2006-09-19  Eric Seidel  <eric@webkit.org>
0
 
0
         Reviewed by adele.
0
 
0
@@ -4511,13 +4523,13 @@ text-clip was an incorrect test, rather than an incorrect result
0
         * fast/forms/input-appearance-height-expected.txt:
0
         * fast/forms/input-value-expected.txt:
0
 
0
-2006-09-17  Eric Seidel  <eric@eseidel.com>
0
+2006-09-17  Eric Seidel  <eric@webkit.org>
0
 
0
         Reviewed by hyatt.
0
 
0
         * fast/js/window-properties.html: make work in Firefox (hangs IE)
0
 
0
-2006-09-17  Eric Seidel  <eric@eseidel.com>
0
+2006-09-17  Eric Seidel  <eric@webkit.org>
0
 
0
         Add a textual dump of the window object property tree.
0
 
0
@@ -5542,7 +5554,7 @@ text-clip was an incorrect test, rather than an incorrect result
0
 
0
         * svg/W3C-SVG-1.1/struct-dom-06-b-expected.txt:
0
 
0
-2006-08-26  Eric Seidel  <eric@eseidel.com>
0
+2006-08-26  Eric Seidel  <eric@webkit.org>
0
 
0
         Reviewed by hyatt.
0
         
0
@@ -6182,7 +6194,7 @@ text-clip was an incorrect test, rather than an incorrect result
0
         * fast/forms/onselect-selectall-expected.txt: Added.
0
         * fast/forms/onselect-selectall.html: Added.
0
 
0
-2006-08-14  Eric Seidel  <eric@eseidel.com>
0
+2006-08-14  Eric Seidel  <eric@webkit.org>
0
 
0
         Reviewed by mjs.
0
         
0
@@ -6259,7 +6271,7 @@ text-clip was an incorrect test, rather than an incorrect result
0
         * svg/custom/text-filter-expected.txt:
0
         * svg/custom/tref-update-expected.txt:
0
 
0
-2006-08-14  Eric Seidel  <eric@eseidel.com>
0
+2006-08-14  Eric Seidel  <eric@webkit.org>
0
 
0
         Reviewed by darin and mjs.
0
         
0
@@ -6327,7 +6339,7 @@ text-clip was an incorrect test, rather than an incorrect result
0
         * tables/mozilla/bugs/bug24200-expected.txt: Ditto.
0
         * tables/mozilla/bugs/bug4527-expected.txt: Ditto.
0
 
0
-2006-08-11  Eric Seidel  <eric@eseidel.com>
0
+2006-08-11  Eric Seidel  <eric@webkit.org>
0
 
0
         Reviewed by andersca.
0
         
0
@@ -6693,7 +6705,7 @@ text-clip was an incorrect test, rather than an incorrect result
0
         * svg/W3C-SVG-1.1/struct-dom-06-b-expected.png:
0
         * svg/W3C-SVG-1.1/struct-dom-06-b-expected.txt:
0
 
0
-2006-07-27  Eric Seidel  <eric@eseidel.com>
0
+2006-07-27  Eric Seidel  <eric@webkit.org>
0
 
0
         Reviewed by darin.
0
         
0
@@ -6793,7 +6805,7 @@ text-clip was an incorrect test, rather than an incorrect result
0
         * fast/encoding/denormalised-voiced-japanese-chars-expected.txt: Added.
0
         * fast/encoding/denormalised-voiced-japanese-chars.html: Added.
0
 
0
-2006-07-27  Eric Seidel  <eric@eseidel.com>
0
+2006-07-27  Eric Seidel  <eric@webkit.org>
0
 
0
         Reviewed by ap.
0
         
0
@@ -6831,7 +6843,7 @@ text-clip was an incorrect test, rather than an incorrect result
0
         * svg/custom/invalid-viewbox2-expected.txt: Added.
0
         * svg/custom/invalid-viewbox2.svg: Added.
0
 
0
-2006-07-27  Eric Seidel  <eric@eseidel.com>
0
+2006-07-27  Eric Seidel  <eric@webkit.org>
0
 
0
         Reviewed by ap.
0
         
0
@@ -10859,7 +10871,7 @@ text-clip was an incorrect test, rather than an incorrect result
0
         * tables/mozilla_expected_failures/bugs/bug32205-1-expected.txt:
0
         * tables/mozilla_expected_failures/bugs/bug65372-expected.txt:
0
 
0
-2006-05-25  Eric Seidel  <eric@eseidel.com>
0
+2006-05-25  Eric Seidel  <eric@webkit.org>
0
 
0
         Reviewed by andersca.
0
 

0
@@ -1,5 +1,11 @@
0
 2006-12-26  Eric Seidel  <eric@webkit.org>
0
 
0
+        Reviewed by olliej.
0
+
0
+        * svg/svg.pltsuite: re-enable word-iso.svg after fixing http://bugs.webkit.org/show_bug.cgi?id=11987
0
+
0
+2006-12-26  Eric Seidel  <eric@webkit.org>
0
+
0
         Reviewed by bradee-oh.
0
         
0
         Add new PageLoadTests directory (this one)

0
@@ -15,5 +15,5 @@ file:///WEBKIT_PATH/PageLoadTests/svg/files/francobollo_gnome_ezechi_02.svg
0
 file:///WEBKIT_PATH/PageLoadTests/svg/files/gearflowers.svg
0
 file:///WEBKIT_PATH/PageLoadTests/svg/files/hereGear4.svg
0
 file:///WEBKIT_PATH/PageLoadTests/svg/files/mtsthelens.svg
0
-file:///WEBKIT_PATH/PageLoadTests/svg/files/world-iso.svg-disabled
0
+file:///WEBKIT_PATH/PageLoadTests/svg/files/world-iso.svg
0
 file:///WEBKIT_PATH/PageLoadTests/svg/files/worldcup.svg

0
@@ -1,5 +1,20 @@
0
 2006-12-26  Eric Seidel  <eric@webkit.org>
0
 
0
+        Reviewed by olliej.
0
+
0
+        ASSERT while loading SVG map
0
+        http://bugs.webkit.org/show_bug.cgi?id=11987
0
+
0
+        * ksvg2/css/SVGCSSParser.cpp: remove a few .impl() calls previously missed.
0
+        (WebCore::CSSParser::parseSVGValue):
0
+        (WebCore::CSSParser::parseSVGPaint):
0
+        (WebCore::CSSParser::parseSVGColor):
0
+        * ksvg2/misc/KCanvasRenderingStyle.cpp: handle invalid colors
0
+        (WebCore::KSVGPainterFactory::fillPaintServer):
0
+        (WebCore::KSVGPainterFactory::strokePaintServer):
0
+
0
+2006-12-26  Eric Seidel  <eric@webkit.org>
0
+
0
         Reviewed by ggaren.
0
 
0
         No test cases changed.

0
@@ -216,7 +216,7 @@ bool CSSParser::parseSVGValue(int propId, bool important)
0
             else if (id == SVGCSS_VAL_CURRENTCOLOR)
0
                 parsedValue = new SVGPaint(SVGPaint::SVG_PAINTTYPE_CURRENTCOLOR);
0
             else if (value->unit == CSSPrimitiveValue::CSS_URI)
0
-                parsedValue = new SVGPaint(SVGPaint::SVG_PAINTTYPE_URI, domString(value->string).impl());
0
+                parsedValue = new SVGPaint(SVGPaint::SVG_PAINTTYPE_URI, domString(value->string));
0
             else
0
                 parsedValue = parseSVGPaint();
0
 
0
@@ -228,7 +228,7 @@ bool CSSParser::parseSVGValue(int propId, bool important)
0
     case CSS_PROP_COLOR:                // <color> | inherit
0
         if ((id >= CSS_VAL_AQUA && id <= CSS_VAL_WINDOWTEXT) ||
0
            (id >= SVGCSS_VAL_ALICEBLUE && id <= SVGCSS_VAL_YELLOWGREEN))
0
-            parsedValue = new SVGColor(domString(value->string).impl());
0
+            parsedValue = new SVGColor(domString(value->string));
0
         else
0
             parsedValue = parseSVGColor();
0
 
0
@@ -241,7 +241,7 @@ bool CSSParser::parseSVGValue(int propId, bool important)
0
     case SVGCSS_PROP_LIGHTING_COLOR:
0
         if ((id >= CSS_VAL_AQUA && id <= CSS_VAL_WINDOWTEXT) ||
0
            (id >= SVGCSS_VAL_ALICEBLUE && id <= SVGCSS_VAL_YELLOWGREEN))
0
-            parsedValue = new SVGColor(domString(value->string).impl());
0
+            parsedValue = new SVGColor(domString(value->string));
0
         else if (id == SVGCSS_VAL_CURRENTCOLOR)
0
             parsedValue = new SVGColor(SVGColor::SVG_COLORTYPE_CURRENTCOLOR);
0
         else // TODO : svgcolor (iccColor)
0
@@ -384,7 +384,7 @@ CSSValue* CSSParser::parseSVGPaint()
0
         g = max(0, min(255, g));
0
         b = max(0, min(255, b));
0
         
0
-        return new SVGPaint(SVGPaint::SVG_PAINTTYPE_RGBCOLOR, String(), String::format("rgb(%d, %d, %d)", r, g, b).impl());
0
+        return new SVGPaint(SVGPaint::SVG_PAINTTYPE_RGBCOLOR, String(), String::format("rgb(%d, %d, %d)", r, g, b));
0
     }
0
     else
0
         return 0;
0
@@ -396,12 +396,11 @@ CSSValue* CSSParser::parseSVGColor()
0
 {
0
     Value* value = valueList->current();
0
     if (!strict && value->unit == CSSPrimitiveValue::CSS_NUMBER && value->fValue >= 0. && value->fValue < 1000000.)
0
-        return new SVGColor(String::format("%06d", (int)(value->fValue+.5)).impl());
0
-    else if (value->unit == CSSPrimitiveValue::CSS_RGBCOLOR) {
0
-        String str = "#" + domString(value->string);
0
-        return new SVGColor(str.impl());
0
-    } else if (value->unit == CSSPrimitiveValue::CSS_IDENT || (!strict && value->unit == CSSPrimitiveValue::CSS_DIMENSION))
0
-        return new SVGColor(domString(value->string).impl());
0
+        return new SVGColor(String::format("%06d", (int)(value->fValue+.5)));
0
+    else if (value->unit == CSSPrimitiveValue::CSS_RGBCOLOR)
0
+        return new SVGColor("#" + domString(value->string));
0
+    else if (value->unit == CSSPrimitiveValue::CSS_IDENT || (!strict && value->unit == CSSPrimitiveValue::CSS_DIMENSION))
0
+        return new SVGColor(domString(value->string));
0
     else if (value->unit == Value::Function && value->function->args != 0 && domString(value->function->name).lower() == "rgb(") {
0
         ValueList* args = value->function->args;
0
         Value* v = args->current();
0
@@ -426,7 +425,7 @@ CSSValue* CSSParser::parseSVGColor()
0
         g = max(0, min(255, g));
0
         b = max(0, min(255, b));
0
         
0
-        return new SVGColor(String::format("rgb(%d, %d, %d)", r, g, b).impl());
0
+        return new SVGColor(String::format("rgb(%d, %d, %d)", r, g, b));
0
     }
0
     else
0
         return 0;

0
@@ -59,11 +59,6 @@ SVGPaintServer* KSVGPainterFactory::fillPaintServer(const RenderStyle* style, co
0
         fillPaintServer = getPaintServerById(item->document(), AtomicString(fill->uri().substring(1)));
0
         if (fillPaintServer && item->isRenderPath())
0
             fillPaintServer->addClient(static_cast<const RenderPath*>(item));
0
-        if (!fillPaintServer) {
0
-            // default value (black), see bug 11017
0
-            fillPaintServer = sharedSolidPaintServer();
0
-            static_cast<SVGPaintServerSolid*>(fillPaintServer)->setColor(Color::black);
0
-        }
0
     } else {
0
         fillPaintServer = sharedSolidPaintServer();
0
         SVGPaintServerSolid* fillPaintServerSolid = static_cast<SVGPaintServerSolid*>(fillPaintServer);
0
@@ -71,6 +66,14 @@ SVGPaintServer* KSVGPainterFactory::fillPaintServer(const RenderStyle* style, co
0
             fillPaintServerSolid->setColor(style->color());
0
         else
0
             fillPaintServerSolid->setColor(fill->color());
0
+        // FIXME: Ideally invalid colors would never get set on the RenderStyle and this could turn into an ASSERT
0
+        if (!fillPaintServerSolid->color().isValid())
0
+            fillPaintServer = 0;
0
+    }
0
+    if (!fillPaintServer) {
0
+        // default value (black), see bug 11017
0
+        fillPaintServer = sharedSolidPaintServer();
0
+        static_cast<SVGPaintServerSolid*>(fillPaintServer)->setColor(Color::black);
0
     }
0
     return fillPaintServer;
0
 }
0
@@ -94,6 +97,9 @@ SVGPaintServer* KSVGPainterFactory::strokePaintServer(const RenderStyle* style,
0
             strokePaintServerSolid->setColor(style->color());
0
         else
0
             strokePaintServerSolid->setColor(stroke->color());
0
+        // FIXME: Ideally invalid colors would never get set on the RenderStyle and this could turn into an ASSERT
0
+        if (!strokePaintServerSolid->color().isValid())
0
+            strokePaintServer = 0;
0
     }
0
 
0
     return strokePaintServer;