Drop fillRule state from GraphicsContext

Source/platform/graphics/GraphicsContext.cpp

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2013 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 1096 matching lines @@
     ASSERT(m_canvas);
 
     m_canvas->drawRRect(rrect, paint);
 }
 
 void GraphicsContext::fillPath(const Path& pathToFill)
 {
     if (contextDisabled() || pathToFill.isEmpty())
         return;
 
-    // Use const_cast and temporarily modify the fill type instead of copying the path.
-    SkPath& path = const_cast<SkPath&>(pathToFill.skPath());
-    SkPath::FillType previousFillType = path.getFillType();
-
-    SkPath::FillType temporaryFillType = WebCoreWindRuleToSkFillType(immutableState()->fillRule());
-    path.setFillType(temporaryFillType);
-
-    drawPath(path, immutableState()->fillPaint());
-
-    path.setFillType(previousFillType);
+    drawPath(pathToFill.skPath(), immutableState()->fillPaint());
 }
 
 void GraphicsContext::fillRect(const FloatRect& rect)
 {
     if (contextDisabled())
         return;
 
     drawRect(rect, immutableState()->fillPaint());
 }
 
@@ skipping 323 matching lines @@
 {
     setMatrix(affineTransformToSkMatrix(affine));
 }
 
 void GraphicsContext::fillRectWithRoundedHole(const FloatRect& rect, const FloatRoundedRect& roundedHoleRect, const Color& color)
 {
     if (contextDisabled())
         return;
 
     Path path;
+    path.setWindRule(RULE_EVENODD);
     path.addRect(rect);
 
     if (!roundedHoleRect.radii().isZero())
         path.addRoundedRect(roundedHoleRect);
     else
         path.addRect(roundedHoleRect.rect());
 
-    WindRule oldFillRule = immutableState()->fillRule();
-    Color oldFillColor = fillColor();
+    SkPaint paint(immutableState()->fillPaint());
+    paint.setColor(color.rgb());
 
-    setFillRule(RULE_EVENODD);
-    setFillColor(color);
-
-    fillPath(path);
-
-    setFillRule(oldFillRule);
-    setFillColor(oldFillColor);
+    drawPath(path.skPath(), paint);
 }
 
 void GraphicsContext::clearRect(const FloatRect& rect)
 {
     if (contextDisabled())
         return;
 
     SkRect r = rect;
     SkPaint paint(immutableState()->fillPaint());
     paint.setXfermodeMode(SkXfermode::kClear_Mode);
@@ skipping 222 matching lines @@
         // being returned from computeInterpolationQuality.
         resampling = InterpolationLow;
     }
     resampling = limitInterpolationQuality(this, resampling);
     paint->setFilterQuality(static_cast<SkFilterQuality>(resampling));
 
     return initialSaveCount;
 }
 
 } // namespace blink