Push drawPath() call into PlatformContextSkia to avoid juggling two copies of...

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()->currentPathInGlobalCoordinates();
-    SkPath path(*oldPath);
+    SkPath path = platformContext()->currentPath();
     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 248 matching lines @@
         ClipRectToCanvas(*platformContext()->canvas(), r, &r);
 
     platformContext()->drawRect(r);
 }
 
 void GraphicsContext::fillPath()
 {
     if (paintingDisabled())
         return;
 
-    SkPath path = platformContext()->currentPathInLocalCoordinates();
+    SkPath path = platformContext()->currentPath();
     if (!isPathSkiaSafe(getCTM(), path))
         return;
 
     const GraphicsContextState& state = m_common->state;
     ColorSpace colorSpace = state.fillColorSpace;
 
     if (colorSpace == SolidColorSpace && !fillColor().alpha())
         return;
 
-    platformContext()->setFillRule(state.fillRule == RULE_EVENODD ?
+    path.setFillType(state.fillRule == RULE_EVENODD ?
         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;
 
-    SkPath path = platformContext()->currentPathInLocalCoordinates();
+    SkPath path = platformContext()->currentPath();
     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