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

third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.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 132 matching lines @@
 {
     if (Shape* shape = m_shape.get())
         return *shape;
 
     TemporaryChange<bool> isInComputingShape(m_isComputingShape, true);
 
     const ComputedStyle& style = *m_layoutBox.style();
     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();
     float margin = floatValueForLength(m_layoutBox.style()->shapeMargin(), maximumValue.toFloat());
 
     float shapeImageThreshold = style.shapeImageThreshold();
     ASSERT(style.shapeOutside());
     const ShapeValue& shapeValue = *style.shapeOutside();
 
     switch (shapeValue.type()) {
@@ skipping 38 matching lines @@
 
     ASSERT_NOT_REACHED();
     return layoutBox.borderAndPaddingBefore();
 }
 
 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;
     }
 
     ASSERT_NOT_REACHED();
     return LayoutUnit();
 }
 
 inline LayoutUnit borderStartWithStyleForWritingMode(const LayoutBox& layoutBox, const ComputedStyle* style)
 {
     if (style->isHorizontalWritingMode()) {
@@ skipping 120 matching lines @@
 }
 
 FloatSize ShapeOutsideInfo::shapeToLayoutObjectSize(FloatSize size) const
 {
     if (!m_layoutBox.style()->isHorizontalWritingMode())
         return size.transposedSize();
     return size;
 }
 
 } // namespace blink