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

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

 /*
  * Copyright (C) 2012 Adobe Systems Incorporated. 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.
@@ skipping 29 matching lines @@
 
 bool BasicShape::canBlend(const BasicShape* other) const
 {
     // FIXME: Support animations between different shapes in the future.
     if (!other || !isSameType(*other))
         return false;
 
     // 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.
     if (type() == BasicShape::BasicShapeCircleType) {
         if (!toBasicShapeCircle(this)->radius().canBlend(toBasicShapeCircle(other)->radius()))
             return false;
     }
 
     // Ellipses with keywords for radii or center coordinates cannot be animated.
     if (type() != BasicShape::BasicShapeEllipseType)
@@ skipping 133 matching lines @@
 
     const BasicShapePolygon* o = toBasicShapePolygon(other);
     ASSERT(m_values.size() == o->values().size());
     ASSERT(!(m_values.size() % 2));
 
     size_t length = m_values.size();
     RefPtr<BasicShapePolygon> result = BasicShapePolygon::create();
     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),
             m_values.at(i + 1).blend(o->values().at(i + 1), progress, ValueRangeAll));
     }
 
     return result.release();
 }
 
 bool BasicShapePolygon::operator==(const BasicShape& o) const
@@ skipping 62 matching lines @@
         && m_top == other.m_top
         && m_bottom == other.m_bottom
         && m_left == other.m_left
         && m_topLeftRadius == other.m_topLeftRadius
         && m_topRightRadius == other.m_topRightRadius
         && m_bottomRightRadius == other.m_bottomRightRadius
         && m_bottomLeftRadius == other.m_bottomLeftRadius;
 }
 
 } // namespace blink