Removing WindRule.h completely

Source/platform/graphics/Path.cpp

 /*
  * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
  *                     2006 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 50 matching lines @@
     return *this;
 }
 
 bool Path::operator==(const Path& other) const
 {
     return m_path == other.m_path;
 }
 
 bool Path::contains(const FloatPoint& point, WindRule rule) const
 {
-    return SkPathContainsPoint(m_path, point, rule == RULE_NONZERO ? SkPath::kWinding_FillType : SkPath::kEvenOdd_FillType);
+    return SkPathContainsPoint(m_path, point, static_cast<SkPath::FillType>(rule));
 }
 
 bool Path::strokeContains(const FloatPoint& point, const StrokeData& strokeData) const
 {
     SkPaint paint;
     strokeData.setupPaint(&paint);
     SkPath strokePath;
     paint.getFillPath(m_path, &strokePath);
 
     return SkPathContainsPoint(strokePath, point, SkPath::kWinding_FillType);
@@ skipping 181 matching lines @@
         return result;
     }
 
     // FIXME: Why does this return quietNaN? Other ports return 0,0.
     float quietNaN = std::numeric_limits<float>::quiet_NaN();
     return FloatPoint(quietNaN, quietNaN);
 }
 
 WindRule Path::windRule() const
 {
-    return m_path.getFillType() == SkPath::kEvenOdd_FillType
-        ? RULE_EVENODD
-        : RULE_NONZERO;
+    return static_cast<WindRule>(m_path.getFillType());

[f(malita), 2014/08/07 15:40:17]

Note that WindRule <-> FillType is not a bijection (the former has 2 values, the
latter has 4), so casting from FillType to WindRule is not safe in general.

Let's leave this conversion as before.

 }
 
 void Path::setWindRule(const WindRule rule)
 {
-    m_path.setFillType(rule == RULE_EVENODD
-        ? SkPath::kEvenOdd_FillType
-        : SkPath::kWinding_FillType);
+    m_path.setFillType(static_cast<SkPath::FillType>(rule));
 }
 
 void Path::moveTo(const FloatPoint& point)
 {
     m_path.moveTo(point.data());
 }
 
 void Path::addLineTo(const FloatPoint& point)
 {
     m_path.lineTo(point.data());
@@ skipping 206 matching lines @@
 
 #if ENABLE(ASSERT)
 bool ellipseIsRenderable(float startAngle, float endAngle)
 {
     return (std::abs(endAngle - startAngle) < twoPiFloat)
         || WebCoreFloatNearlyEqual(std::abs(endAngle - startAngle), twoPiFloat);
 }
 #endif
 
 }