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

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

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 1210 matching lines @@
     // FIXME: This should depend on locale.
     DEFINE_STATIC_LOCAL(AtomicString, hyphenMinusString, (&hyphenMinusCharacter, 1));
     DEFINE_STATIC_LOCAL(AtomicString, hyphenString, (&hyphenCharacter, 1));
     const SimpleFontData* primaryFont = font().primaryFont();
     ASSERT(primaryFont);
     return primaryFont->glyphForCharacter(hyphenCharacter) ? hyphenString : hyphenMinusString;
 }
 
 const AtomicString& ComputedStyle::textEmphasisMarkString() const
 {
-    switch (textEmphasisMark()) {
+    switch (getTextEmphasisMark()) {
     case TextEmphasisMarkNone:
         return nullAtom;
     case TextEmphasisMarkCustom:
         return textEmphasisCustomMark();
     case TextEmphasisMarkDot: {
         DEFINE_STATIC_LOCAL(AtomicString, filledDotString, (&bulletCharacter, 1));
         DEFINE_STATIC_LOCAL(AtomicString, openDotString, (&whiteBulletCharacter, 1));
-        return textEmphasisFill() == TextEmphasisFillFilled ? filledDotString : openDotString;
+        return getTextEmphasisFill() == TextEmphasisFillFilled ? filledDotString : openDotString;
     }
     case TextEmphasisMarkCircle: {
         DEFINE_STATIC_LOCAL(AtomicString, filledCircleString, (&blackCircleCharacter, 1));
         DEFINE_STATIC_LOCAL(AtomicString, openCircleString, (&whiteCircleCharacter, 1));
-        return textEmphasisFill() == TextEmphasisFillFilled ? filledCircleString : openCircleString;
+        return getTextEmphasisFill() == TextEmphasisFillFilled ? filledCircleString : openCircleString;
     }
     case TextEmphasisMarkDoubleCircle: {
         DEFINE_STATIC_LOCAL(AtomicString, filledDoubleCircleString, (&fisheyeCharacter, 1));
         DEFINE_STATIC_LOCAL(AtomicString, openDoubleCircleString, (&bullseyeCharacter, 1));
-        return textEmphasisFill() == TextEmphasisFillFilled ? filledDoubleCircleString : openDoubleCircleString;
+        return getTextEmphasisFill() == TextEmphasisFillFilled ? filledDoubleCircleString : openDoubleCircleString;
     }
     case TextEmphasisMarkTriangle: {
         DEFINE_STATIC_LOCAL(AtomicString, filledTriangleString, (&blackUpPointingTriangleCharacter, 1));
         DEFINE_STATIC_LOCAL(AtomicString, openTriangleString, (&whiteUpPointingTriangleCharacter, 1));
-        return textEmphasisFill() == TextEmphasisFillFilled ? filledTriangleString : openTriangleString;
+        return getTextEmphasisFill() == TextEmphasisFillFilled ? filledTriangleString : openTriangleString;
     }
     case TextEmphasisMarkSesame: {
         DEFINE_STATIC_LOCAL(AtomicString, filledSesameString, (&sesameDotCharacter, 1));
         DEFINE_STATIC_LOCAL(AtomicString, openSesameString, (&whiteSesameDotCharacter, 1));
-        return textEmphasisFill() == TextEmphasisFillFilled ? filledSesameString : openSesameString;
+        return getTextEmphasisFill() == TextEmphasisFillFilled ? filledSesameString : openSesameString;
     }
     case TextEmphasisMarkAuto:
         ASSERT_NOT_REACHED();
         return nullAtom;
     }
 
     ASSERT_NOT_REACHED();
     return nullAtom;
 }
 
@@ skipping 179 matching lines @@
     if (inherited_flags.m_textUnderline) {
         inherited_flags.m_textUnderline = false;
         list->append(AppliedTextDecoration(TextDecorationUnderline));
     }
 
     list->append(decoration);
 }
 
 void ComputedStyle::applyTextDecorations()
 {
-    if (textDecoration() == TextDecorationNone)
+    if (getTextDecoration() == TextDecorationNone)
         return;
 
-    TextDecorationStyle style = textDecorationStyle();
+    TextDecorationStyle style = getTextDecorationStyle();
     StyleColor styleColor = decorationColorIncludingFallback(insideLink() == InsideVisitedLink);
 
-    int decorations = textDecoration();
+    int decorations = getTextDecoration();
 
     if (decorations & TextDecorationUnderline) {
         // To save memory, we don't use AppliedTextDecoration objects in the
         // common case of a single simple underline.
         AppliedTextDecoration underline(TextDecorationUnderline, style, styleColor);
 
         if (!rareInheritedData->appliedTextDecorations && underline.isSimpleUnderline())
             inherited_flags.m_textUnderline = true;
         else
             addAppliedTextDecoration(underline);
@@ skipping 122 matching lines @@
     // does to return black. This behavior matches what Firefox 4 does as well.
     if (colorProperty == CSSPropertyBackgroundColor && visitedColor == Color::transparent)
         return unvisitedColor;
 
     // Take the alpha from the unvisited color, but get the RGB values from the visited color.
     return Color(visitedColor.red(), visitedColor.green(), visitedColor.blue(), unvisitedColor.alpha());
 }
 
 const BorderValue& ComputedStyle::borderBefore() const
 {
-    switch (writingMode()) {
+    switch (getWritingMode()) {
     case TopToBottomWritingMode:
         return borderTop();
     case LeftToRightWritingMode:
         return borderLeft();
     case RightToLeftWritingMode:
         return borderRight();
     }
     ASSERT_NOT_REACHED();
     return borderTop();
 }
 
 const BorderValue& ComputedStyle::borderAfter() const
 {
-    switch (writingMode()) {
+    switch (getWritingMode()) {
     case TopToBottomWritingMode:
         return borderBottom();
     case LeftToRightWritingMode:
         return borderRight();
     case RightToLeftWritingMode:
         return borderLeft();
     }
     ASSERT_NOT_REACHED();
     return borderBottom();
 }
 
 const BorderValue& ComputedStyle::borderStart() const
 {
     if (isHorizontalWritingMode())
         return isLeftToRightDirection() ? borderLeft() : borderRight();
     return isLeftToRightDirection() ? borderTop() : borderBottom();
 }
 
 const BorderValue& ComputedStyle::borderEnd() const
 {
     if (isHorizontalWritingMode())
         return isLeftToRightDirection() ? borderRight() : borderLeft();
     return isLeftToRightDirection() ? borderBottom() : borderTop();
 }
 
 int ComputedStyle::borderBeforeWidth() const
 {
-    switch (writingMode()) {
+    switch (getWritingMode()) {
     case TopToBottomWritingMode:
         return borderTopWidth();
     case LeftToRightWritingMode:
         return borderLeftWidth();
     case RightToLeftWritingMode:
         return borderRightWidth();
     }
     ASSERT_NOT_REACHED();
     return borderTopWidth();
 }
 
 int ComputedStyle::borderAfterWidth() const
 {
-    switch (writingMode()) {
+    switch (getWritingMode()) {
     case TopToBottomWritingMode:
         return borderBottomWidth();
     case LeftToRightWritingMode:
         return borderRightWidth();
     case RightToLeftWritingMode:
         return borderLeftWidth();
     }
     ASSERT_NOT_REACHED();
     return borderBottomWidth();
 }
@@ skipping 66 matching lines @@
     return std::max(0, outlineWidth() + outlineOffset());
 }
 
 bool ComputedStyle::columnRuleEquivalent(const ComputedStyle* otherStyle) const
 {
     return columnRuleStyle() == otherStyle->columnRuleStyle()
         && columnRuleWidth() == otherStyle->columnRuleWidth()
         && visitedDependentColor(CSSPropertyColumnRuleColor) == otherStyle->visitedDependentColor(CSSPropertyColumnRuleColor);
 }
 
-TextEmphasisMark ComputedStyle::textEmphasisMark() const
+TextEmphasisMark ComputedStyle::getTextEmphasisMark() const
 {
     TextEmphasisMark mark = static_cast<TextEmphasisMark>(rareInheritedData->textEmphasisMark);
     if (mark != TextEmphasisMarkAuto)
         return mark;
 
     if (isHorizontalWritingMode())
         return TextEmphasisMarkDot;
 
     return TextEmphasisMarkSesame;
 }
@@ skipping 119 matching lines @@
     if (!shadowList)
         return false;
     for (size_t i = shadowList->shadows().size(); i--; ) {
         if (shadowList->shadows()[i].color().isCurrentColor())
             return true;
     }
     return false;
 }
 
 } // namespace blink