Rename enums/functions that collide in chromium style in core/style/

third_party/WebKit/Source/core/style/BasicShapes.cpp

Index: third_party/WebKit/Source/core/style/BasicShapes.cpp
diff --git a/third_party/WebKit/Source/core/style/BasicShapes.cpp b/third_party/WebKit/Source/core/style/BasicShapes.cpp
index 2d8b279e2ff668e7ec2b72b6e87e6c559e02b3ba..674c35ff78f20e5f7e9d6fc5137c49d0de1aff3f 100644
--- a/third_party/WebKit/Source/core/style/BasicShapes.cpp
+++ b/third_party/WebKit/Source/core/style/BasicShapes.cpp
@@ -47,7 +47,7 @@ bool BasicShape::canBlend(const BasicShape* other) const
     // Just polygons with same number of vertices can be animated.
     if (type() == BasicShape::BasicShapePolygonType
         && (toBasicShapePolygon(this)->values().size() != toBasicShapePolygon(other)->values().size()
-        || toBasicShapePolygon(this)->windRule() != toBasicShapePolygon(other)->windRule()))
+        || toBasicShapePolygon(this)->getWindRule() != toBasicShapePolygon(other)->getWindRule()))
         return false;
 
     // Circles with keywords for radii or center coordinates cannot be animated.
@@ -201,7 +201,7 @@ PassRefPtr<BasicShape> BasicShapePolygon::blend(const BasicShape* other, double
     if (!length)
         return result.release();
 
-    result->setWindRule(o->windRule());
+    result->setWindRule(o->getWindRule());
 
     for (size_t i = 0; i < length; i = i + 2) {
         result->appendPoint(m_values.at(i).blend(o->values().at(i), progress, ValueRangeAll),