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

third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

 /*
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2011 Sencha, Inc. All rights reserved.
  * Copyright (C) 2015 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ skipping 809 matching lines @@
                     return nullptr;
                 }
                 return cssValuePool().createIdentifierValue(valueId);
             }
             return CSSCubicBezierTimingFunctionValue::create(bezierTimingFunction->x1(), bezierTimingFunction->y1(), bezierTimingFunction->x2(), bezierTimingFunction->y2());
         }
 
     case TimingFunction::StepsFunction:
         {
             const StepsTimingFunction* stepsTimingFunction = toStepsTimingFunction(timingFunction);
-            StepsTimingFunction::StepAtPosition position = stepsTimingFunction->stepAtPosition();
+            StepsTimingFunction::StepAtPosition position = stepsTimingFunction->getStepAtPosition();
             int steps = stepsTimingFunction->numberOfSteps();
             ASSERT(position == StepsTimingFunction::Start || position == StepsTimingFunction::End);
 
             if (steps > 1)
                 return CSSStepsTimingFunctionValue::create(steps, position);
             CSSValueID valueId = position == StepsTimingFunction::Start ? CSSValueStepStart : CSSValueStepEnd;
             return cssValuePool().createIdentifierValue(valueId);
         }
 
     default:
@@ skipping 407 matching lines @@
             filterValue->append(cssValuePool().createValue(toBasicComponentTransferFilterOperation(filterOperation)->amount(), CSSPrimitiveValue::UnitType::Number));
             break;
         case FilterOperation::BLUR:
             filterValue = CSSFunctionValue::create(CSSValueBlur);
             filterValue->append(zoomAdjustedPixelValue(toBlurFilterOperation(filterOperation)->stdDeviation().value(), style));
             break;
         case FilterOperation::DROP_SHADOW: {
             DropShadowFilterOperation* dropShadowOperation = toDropShadowFilterOperation(filterOperation);
             filterValue = CSSFunctionValue::create(CSSValueDropShadow);
             // We want our computed style to look like that of a text shadow (has neither spread nor inset style).
-            ShadowData shadow(dropShadowOperation->location(), dropShadowOperation->stdDeviation(), 0, Normal, StyleColor(dropShadowOperation->color()));
+            ShadowData shadow(dropShadowOperation->location(), dropShadowOperation->stdDeviation(), 0, Normal, StyleColor(dropShadowOperation->getColor()));
             filterValue->append(valueForShadowData(shadow, style, false));
             break;
         }
         default:
             ASSERT_NOT_REACHED();
             break;
         }
         list->append(filterValue.release());
     }
 
@@ skipping 812 matching lines @@
         return cssValuePool().createValue(style.wordBreak());
     case CSSPropertyWordSpacing:
         return zoomAdjustedPixelValue(style.wordSpacing(), style);
     case CSSPropertyWordWrap:
         return cssValuePool().createValue(style.overflowWrap());
     case CSSPropertyWebkitLineBreak:
         return cssValuePool().createValue(style.getLineBreak());
     case CSSPropertyResize:
         return cssValuePool().createValue(style.resize());
     case CSSPropertyFontKerning:
-        return cssValuePool().createValue(style.fontDescription().kerning());
+        return cssValuePool().createValue(style.fontDescription().getKerning());
     case CSSPropertyWebkitFontSmoothing:
         return cssValuePool().createValue(style.fontDescription().fontSmoothing());
     case CSSPropertyFontVariantLigatures: {
         FontDescription::LigaturesState commonLigaturesState = style.fontDescription().commonLigaturesState();
         FontDescription::LigaturesState discretionaryLigaturesState = style.fontDescription().discretionaryLigaturesState();
         FontDescription::LigaturesState historicalLigaturesState = style.fontDescription().historicalLigaturesState();
         FontDescription::LigaturesState contextualLigaturesState = style.fontDescription().contextualLigaturesState();
         if (commonLigaturesState == FontDescription::NormalLigaturesState && discretionaryLigaturesState == FontDescription::NormalLigaturesState
             && historicalLigaturesState == FontDescription::NormalLigaturesState && contextualLigaturesState == FontDescription::NormalLigaturesState)
             return cssValuePool().createIdentifierValue(CSSValueNormal);
@@ skipping 648 matching lines @@
     case CSSPropertyAll:
         return nullptr;
     default:
         break;
     }
     ASSERT_NOT_REACHED();
     return nullptr;
 }
 
 } // namespace blink