Changeset 38439 in webkit

Timestamp:

Nov 15, 2008 8:35:22 PM (15 years ago)

Author:

Darin Adler

Message:

2008-11-15 Darin Adler <Darin Adler>

Reviewed by Dan Bernstein.

• fix just-introduced crash in the svg/custom/svg-fonts-in-html.html test

This gets rid of the crash. It restores the behavior of the CG case from before Dirk
Shulze removed the platorm-dependent code, but perhaps it should be changed further
in the future so that the default for no style is "no stroke". I think the patch is
fine for fill.

• svg/graphics/SVGPaintServerSolid.cpp: (WebCore::SVGPaintServerSolid::setup): Added null checks for svgStyle. (WebCore::SVGPaintServerSolid::renderPath): Added null checks for style and svgStyle.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• svg/graphics/SVGPaintServerSolid.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-11-15  Darin Adler  <darin@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        - fix just-introduced crash in the svg/custom/svg-fonts-in-html.html test
+
+        This gets rid of the crash. It restores the behavior of the CG case from before Dirk
+        Shulze removed the platorm-dependent code, but perhaps it should be changed further
+        in the future so that the default for no style is "no stroke". I think the patch is
+        fine for fill.
+
+        * svg/graphics/SVGPaintServerSolid.cpp:
+        (WebCore::SVGPaintServerSolid::setup): Added null checks for svgStyle.
+        (WebCore::SVGPaintServerSolid::renderPath): Added null checks for style and svgStyle.
+
 2008-11-15  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/WebCore/svg/graphics/SVGPaintServerSolid.cpp

@@ -64 +64 @@
 {
     RenderStyle* style = object ? object->style() : 0;
-    const SVGRenderStyle* svgStyle = object ? object->style()->svgStyle() : 0;
+    const SVGRenderStyle* svgStyle = style ? style->svgStyle() : 0;
 
     if ((type & ApplyToFillTargetType) && (!style || svgStyle->hasFill())) {
-        context->setAlpha(svgStyle->fillOpacity());
+        context->setAlpha(style ? svgStyle->fillOpacity() : 1);
         context->setFillColor(color().rgb());
-        context->setFillRule(svgStyle->fillRule());
+        context->setFillRule(style ? svgStyle->fillRule() : RULE_NONZERO);
 
         if (isPaintingText)
@@ -76 +76 @@
 
     if ((type & ApplyToStrokeTargetType) && (!style || svgStyle->hasStroke())) {
-        context->setAlpha(svgStyle->strokeOpacity());
+        context->setAlpha(style ? svgStyle->strokeOpacity() : 1);
         context->setStrokeColor(color().rgb());
 
@@ -91 +91 @@
 void SVGPaintServerSolid::renderPath(GraphicsContext*& context, const RenderObject* path, SVGPaintTargetType type) const
 {
-    const SVGRenderStyle* svgStyle = path->style()->svgStyle();
+    const SVGRenderStyle* svgStyle = path ? path->style()->svgStyle() : 0;
 
-    if ((type & ApplyToFillTargetType) && svgStyle->hasFill())
+    if ((type & ApplyToFillTargetType) && (!svgStyle || svgStyle->hasFill()))
         context->fillPath();
 
-    if ((type & ApplyToStrokeTargetType) && svgStyle->hasStroke())
+    if ((type & ApplyToStrokeTargetType) && (!svgStyle || svgStyle->hasStroke()))
         context->strokePath();
 }