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

third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp

Index: third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp
diff --git a/third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp b/third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp
index b550ab161bc6762a2aff0696dc132c8cc3cc5e50..6abfec0a51061b7544f66f4f25eb2132a0a26891 100644
--- a/third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp
+++ b/third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp
@@ -150,7 +150,7 @@ const Shape& ShapeOutsideInfo::computedShape() const
     ASSERT(m_layoutBox.containingBlock());
     const ComputedStyle& containingBlockStyle = *m_layoutBox.containingBlock()->style();
 
-    WritingMode writingMode = containingBlockStyle.writingMode();
+    WritingMode writingMode = containingBlockStyle.getWritingMode();
     // Make sure contentWidth is not negative. This can happen when containing block has a vertical scrollbar and
     // its content is smaller than the scrollbar width.
     LayoutUnit maximumValue = m_layoutBox.containingBlock() ? std::max(LayoutUnit(), m_layoutBox.containingBlock()->contentWidth()) : LayoutUnit();
@@ -209,8 +209,8 @@ LayoutUnit ShapeOutsideInfo::logicalTopOffset() const
     switch (referenceBox(*m_layoutBox.style()->shapeOutside())) {
     case MarginBox: return -m_layoutBox.marginBefore(m_layoutBox.containingBlock()->style());
     case BorderBox: return LayoutUnit();
-    case PaddingBox: return borderBeforeInWritingMode(m_layoutBox, m_layoutBox.containingBlock()->style()->writingMode());
-    case ContentBox: return borderAndPaddingBeforeInWritingMode(m_layoutBox, m_layoutBox.containingBlock()->style()->writingMode());
+    case PaddingBox: return borderBeforeInWritingMode(m_layoutBox, m_layoutBox.containingBlock()->style()->getWritingMode());
+    case ContentBox: return borderAndPaddingBeforeInWritingMode(m_layoutBox, m_layoutBox.containingBlock()->style()->getWritingMode());
     case BoxMissing: break;
     }