Fixing gradient problem.

third_party/WebKit/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp

 /*
  * Copyright (c) 2006, Google Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 388 matching lines @@
     SkPath path;
     path.addOval(oval, SkPath::kCCW_Direction);
     platformContext()->canvas()->clipPath(path, SkRegion::kDifference_Op);
 }
 
 void GraphicsContext::clipPath(WindRule clipRule)
 {
     if (paintingDisabled())
         return;
 
-    const SkPath* oldPath = platformContext()->currentPath();
+    const SkPath* oldPath = platformContext()->currentPathInGlobalCoordinates();
     SkPath path(*oldPath);
     path.setFillType(clipRule == RULE_EVENODD ? SkPath::kEvenOdd_FillType : SkPath::kWinding_FillType);
     platformContext()->canvas()->clipPath(path);
 }
 
 void GraphicsContext::clipToImageBuffer(const FloatRect& rect,
                                         const ImageBuffer* imageBuffer)
 {
     if (paintingDisabled())
         return;
@@ skipping 249 matching lines @@
         ClipRectToCanvas(*platformContext()->canvas(), r, &r);
 
     platformContext()->drawRect(r);
 }
 
 void GraphicsContext::fillPath()
 {
     if (paintingDisabled())
         return;
 
-    const SkPath& path = *platformContext()->currentPath();
+    SkPath path = platformContext()->currentPathInLocalCoordinates();
     if (!isPathSkiaSafe(getCTM(), path))
-      return;
+        return;
 
     const GraphicsContextState& state = m_common->state;
     ColorSpace colorSpace = state.fillColorSpace;
 
     if (colorSpace == SolidColorSpace && !fillColor().alpha())
         return;
 
     platformContext()->setFillRule(state.fillRule == RULE_EVENODD ?

[Evan Stade, 2009/01/13 00:19:18]

found the bug :(

since path is no longer a reference to the platformContext's path, you need to
change this line to

    path.setFillType(state.fillRule == RULE_EVENODD ?
        SkPath::kEvenOdd_FillType : kWinding_FillType);

*OR*

you can get totally remove |path| and create/use a drawPath(SkPaint) function in
PlatformContextSkia. I think that this is a better solution overall--there's no
reason to be messing around with a local copy of the path, and will likely lead
to similar bugs in the future. (you can change the first use of |path| as we
discussed before)

[brettw, 2009/01/13 17:44:36]

Actually, I think this current code is pretty weird. It's globally and
persistently changing the rule of the path when you fill it, which seems
counter-intuitive and weird. It seems to me this is a reason to specifically
want a local copy.

In looking into platformContext()->setFillRule, I think it should be deleted. It
looks like this is the only place it's called, and we don't keep our fill rule
in sync with the one in GraphicsContext, unlike with the other properties
(webkit doesn't call us with the value). So keeping it there is misleading as
you might think it's correct. I think the only way to get the real fill rule is
calling GraphicsContext.fillRule().

         SkPath::kEvenOdd_FillType : SkPath::kWinding_FillType);
 
     SkPaint paint;
     platformContext()->setupPaintForFilling(&paint);
 
     if (colorSpace == PatternColorSpace) {
         SkShader* pat = state.fillPattern->createPlatformPattern(getCTM());
         paint.setShader(pat);
         pat->unref();
     } else if (colorSpace == GradientColorSpace)
@@ skipping 343 matching lines @@
     if (!isPathSkiaSafe(getCTM(), path))
         return;
     platformContext()->canvas()->drawPath(path, paint);
 }
 
 void GraphicsContext::strokePath()
 {
     if (paintingDisabled())
         return;
 
-    const SkPath& path = *platformContext()->currentPath();
+    SkPath path = platformContext()->currentPathInLocalCoordinates();
     if (!isPathSkiaSafe(getCTM(), path))
         return;
 
     const GraphicsContextState& state = m_common->state;
     ColorSpace colorSpace = state.strokeColorSpace;
 
     if (colorSpace == SolidColorSpace && !strokeColor().alpha())
         return;
 
     SkPaint paint;
@@ skipping 49 matching lines @@
 void GraphicsContext::translate(float w, float h)
 {
     if (paintingDisabled())
         return;
 
     platformContext()->canvas()->translate(WebCoreFloatToSkScalar(w),
                                            WebCoreFloatToSkScalar(h));
 }
 
 }  // namespace WebCore