| Index: Source/platform/graphics/GraphicsContext.cpp
|
| diff --git a/Source/platform/graphics/GraphicsContext.cpp b/Source/platform/graphics/GraphicsContext.cpp
|
| index 902e2b7c02c572b40fb3acff3692427265453676..73e3d5e6ebe26a0ee8295f050630b59c985721bd 100644
|
| --- a/Source/platform/graphics/GraphicsContext.cpp
|
| +++ b/Source/platform/graphics/GraphicsContext.cpp
|
| @@ -1273,8 +1273,7 @@ void GraphicsContext::fillPath(const Path& pathToFill)
|
| SkPath& path = const_cast<SkPath&>(pathToFill.skPath());
|
| SkPath::FillType previousFillType = path.getFillType();
|
|
|
| - SkPath::FillType temporaryFillType =
|
| - immutableState()->fillRule() == RULE_EVENODD ? SkPath::kEvenOdd_FillType : SkPath::kWinding_FillType;
|
| + SkPath::FillType temporaryFillType = static_cast<SkPath::FillType>(immutableState()->fillRule());
|
| path.setFillType(temporaryFillType);
|
|
|
| drawPath(path, immutableState()->fillPaint());
|
| @@ -1465,7 +1464,7 @@ void GraphicsContext::clipPath(const Path& pathToClip, WindRule clipRule)
|
| SkPath& path = const_cast<SkPath&>(pathToClip.skPath());
|
| SkPath::FillType previousFillType = path.getFillType();
|
|
|
| - SkPath::FillType temporaryFillType = clipRule == RULE_EVENODD ? SkPath::kEvenOdd_FillType : SkPath::kWinding_FillType;
|
| + SkPath::FillType temporaryFillType = static_cast<SkPath::FillType>(clipRule);
|
| path.setFillType(temporaryFillType);
|
| clipPath(path, AntiAliased);
|
|
|
| @@ -1502,7 +1501,7 @@ void GraphicsContext::canvasClip(const Path& pathToClip, WindRule clipRule)
|
| SkPath& path = const_cast<SkPath&>(pathToClip.skPath());
|
| SkPath::FillType previousFillType = path.getFillType();
|
|
|
| - SkPath::FillType temporaryFillType = clipRule == RULE_EVENODD ? SkPath::kEvenOdd_FillType : SkPath::kWinding_FillType;
|
| + SkPath::FillType temporaryFillType = static_cast<SkPath::FillType>(clipRule);
|
| path.setFillType(temporaryFillType);
|
| clipPath(path);
|
|
|
|
|