blink: Rename enums and functions to not collide with chromium style.

This fixes collisions in core/css/.

R=esprehn@chromium.org, pdr
BUG=582312

Review URL: https://codereview.chromium.org/1729013002

Cr-Commit-Position: refs/heads/master@{#377432}

37 files changed, 90 insertions, 90 deletions

diff --git a/third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp
index 70300df..eb51dfd 100644
--- a/third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp
+++ b/third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp
@@ -69,7 +69,7 @@ PassOwnPtr<InterpolableValue> CSSColorInterpolationType::createInterpolableColor
 {
     if (color.isCurrentColor())
         return createInterpolableColorForIndex(Currentcolor);
-    return createInterpolableColor(color.color());
+    return createInterpolableColor(color.getColor());
 }
 
 PassOwnPtr<InterpolableValue> CSSColorInterpolationType::maybeCreateInterpolableColor(const CSSValue& value)
@@ -112,7 +112,7 @@ Color CSSColorInterpolationType::resolveInterpolableColor(const InterpolableValu
             currentStyleColor = currentColorGetter(CSSPropertyWebkitTextFillColor, *state.style());
         if (currentStyleColor.isCurrentColor())
             currentStyleColor = currentColorGetter(CSSPropertyColor, *state.style());
-        addPremultipliedColor(red, green, blue, alpha, currentcolorFraction, currentStyleColor.color());
+        addPremultipliedColor(red, green, blue, alpha, currentcolorFraction, currentStyleColor.getColor());
     }
     const TextLinkColors& colors = state.document().textLinkColors();
     if (double webkitActivelinkFraction = toInterpolableNumber(list.get(WebkitActivelink))->value())
diff --git a/third_party/WebKit/Source/core/css/CSSFontFace.cpp b/third_party/WebKit/Source/core/css/CSSFontFace.cpp
index eb1cc2b..b464c6a 100644
--- a/third_party/WebKit/Source/core/css/CSSFontFace.cpp
+++ b/third_party/WebKit/Source/core/css/CSSFontFace.cpp
@@ -63,7 +63,7 @@ void CSSFontFace::fontLoaded(RemoteFontFaceSource* source)
     if (loadStatus() == FontFace::Loading) {
         if (source->isValid()) {
             setLoadStatus(FontFace::Loaded);
-        } else if (source->displayPeriod() == RemoteFontFaceSource::FailurePeriod) {
+        } else if (source->getDisplayPeriod() == RemoteFontFaceSource::FailurePeriod) {
             m_sources.clear();
             setLoadStatus(FontFace::Error);
         } else {
@@ -166,7 +166,7 @@ void CSSFontFace::load(const FontDescription& fontDescription)
     setLoadStatus(FontFace::Error);
 }
 
-void CSSFontFace::setLoadStatus(FontFace::LoadStatus newStatus)
+void CSSFontFace::setLoadStatus(FontFace::LoadStatusType newStatus)
 {
     ASSERT(m_fontFace);
     if (newStatus == FontFace::Error)
diff --git a/third_party/WebKit/Source/core/css/CSSFontFace.h b/third_party/WebKit/Source/core/css/CSSFontFace.h
index 90b3b80..662b2e0 100644
--- a/third_party/WebKit/Source/core/css/CSSFontFace.h
+++ b/third_party/WebKit/Source/core/css/CSSFontFace.h
@@ -108,7 +108,7 @@ public:
         Vector<UnicodeRange> m_ranges; // If empty, represents the whole code space.
     };
 
-    FontFace::LoadStatus loadStatus() const { return m_fontFace->loadStatus(); }
+    FontFace::LoadStatusType loadStatus() const { return m_fontFace->loadStatus(); }
     bool maybeScheduleFontLoad(const FontDescription&, UChar32);
     bool maybeScheduleFontLoad(const FontDescription&, const FontDataRange&);
     void load();
@@ -119,7 +119,7 @@ public:
     DECLARE_TRACE();
 
 private:
-    void setLoadStatus(FontFace::LoadStatus);
+    void setLoadStatus(FontFace::LoadStatusType);
 
     UnicodeRangeSet m_ranges;
     RawPtrWillBeMember<CSSSegmentedFontFace> m_segmentedFontFace;
diff --git a/third_party/WebKit/Source/core/css/CSSImageGeneratorValue.cpp b/third_party/WebKit/Source/core/css/CSSImageGeneratorValue.cpp
index e97f3d1..df434dd 100644
--- a/third_party/WebKit/Source/core/css/CSSImageGeneratorValue.cpp
+++ b/third_party/WebKit/Source/core/css/CSSImageGeneratorValue.cpp
@@ -127,7 +127,7 @@ void CSSImageGeneratorValue::putImage(const IntSize& size, PassRefPtr<Image> ima
 
 PassRefPtr<Image> CSSImageGeneratorValue::image(const LayoutObject* layoutObject, const IntSize& size)
 {
-    switch (classType()) {
+    switch (getClassType()) {
     case CrossfadeClass:
         return toCSSCrossfadeValue(this)->image(layoutObject, size);
     case LinearGradientClass:
@@ -142,7 +142,7 @@ PassRefPtr<Image> CSSImageGeneratorValue::image(const LayoutObject* layoutObject
 
 bool CSSImageGeneratorValue::isFixedSize() const
 {
-    switch (classType()) {
+    switch (getClassType()) {
     case CrossfadeClass:
         return toCSSCrossfadeValue(this)->isFixedSize();
     case LinearGradientClass:
@@ -157,7 +157,7 @@ bool CSSImageGeneratorValue::isFixedSize() const
 
 IntSize CSSImageGeneratorValue::fixedSize(const LayoutObject* layoutObject)
 {
-    switch (classType()) {
+    switch (getClassType()) {
     case CrossfadeClass:
         return toCSSCrossfadeValue(this)->fixedSize(layoutObject);
     case LinearGradientClass:
@@ -172,7 +172,7 @@ IntSize CSSImageGeneratorValue::fixedSize(const LayoutObject* layoutObject)
 
 bool CSSImageGeneratorValue::isPending() const
 {
-    switch (classType()) {
+    switch (getClassType()) {
     case CrossfadeClass:
         return toCSSCrossfadeValue(this)->isPending();
     case LinearGradientClass:
@@ -187,7 +187,7 @@ bool CSSImageGeneratorValue::isPending() const
 
 bool CSSImageGeneratorValue::knownToBeOpaque(const LayoutObject* layoutObject) const
 {
-    switch (classType()) {
+    switch (getClassType()) {
     case CrossfadeClass:
         return toCSSCrossfadeValue(this)->knownToBeOpaque(layoutObject);
     case LinearGradientClass:
@@ -202,7 +202,7 @@ bool CSSImageGeneratorValue::knownToBeOpaque(const LayoutObject* layoutObject) c
 
 void CSSImageGeneratorValue::loadSubimages(Document* document)
 {
-    switch (classType()) {
+    switch (getClassType()) {
     case CrossfadeClass:
         toCSSCrossfadeValue(this)->loadSubimages(document);
         break;
diff --git a/third_party/WebKit/Source/core/css/CSSPropertySourceData.h b/third_party/WebKit/Source/core/css/CSSPropertySourceData.h
index 3817beb..50440f8 100644
--- a/third_party/WebKit/Source/core/css/CSSPropertySourceData.h
+++ b/third_party/WebKit/Source/core/css/CSSPropertySourceData.h
@@ -133,12 +133,12 @@ using RuleSourceDataList = WillBeHeapVector<RefPtrWillBeMember<CSSRuleSourceData
 using SelectorRangeList = WillBeHeapVector<SourceRange>;
 
 struct CSSRuleSourceData : public RefCountedWillBeGarbageCollected<CSSRuleSourceData> {
-    static PassRefPtrWillBeRawPtr<CSSRuleSourceData> create(StyleRule::Type type)
+    static PassRefPtrWillBeRawPtr<CSSRuleSourceData> create(StyleRule::RuleType type)
     {
         return adoptRefWillBeNoop(new CSSRuleSourceData(type));
     }
 
-    CSSRuleSourceData(StyleRule::Type type)
+    CSSRuleSourceData(StyleRule::RuleType type)
         : type(type)
     {
         if (type == StyleRule::Style || type == StyleRule::FontFace || type == StyleRule::Page || type == StyleRule::Keyframe)
@@ -149,7 +149,7 @@ struct CSSRuleSourceData : public RefCountedWillBeGarbageCollected<CSSRuleSource
 
     DECLARE_TRACE();
 
-    StyleRule::Type type;
+    StyleRule::RuleType type;
 
     // Range of the selector list in the enclosing source.
     SourceRange ruleHeaderRange;
diff --git a/third_party/WebKit/Source/core/css/CSSValue.cpp b/third_party/WebKit/Source/core/css/CSSValue.cpp
index 7a30048..4f3dd60 100644
--- a/third_party/WebKit/Source/core/css/CSSValue.cpp
+++ b/third_party/WebKit/Source/core/css/CSSValue.cpp
@@ -77,13 +77,13 @@ bool CSSValue::hasFailedOrCanceledSubresources() const
 {
     if (isValueList())
         return toCSSValueList(this)->hasFailedOrCanceledSubresources();
-    if (classType() == FontFaceSrcClass)
+    if (getClassType() == FontFaceSrcClass)
         return toCSSFontFaceSrcValue(this)->hasFailedOrCanceledSubresources();
-    if (classType() == ImageClass)
+    if (getClassType() == ImageClass)
         return toCSSImageValue(this)->hasFailedOrCanceledSubresources();
-    if (classType() == CrossfadeClass)
+    if (getClassType() == CrossfadeClass)
         return toCSSCrossfadeValue(this)->hasFailedOrCanceledSubresources();
-    if (classType() == ImageSetClass)
+    if (getClassType() == ImageSetClass)
         return toCSSImageSetValue(this)->hasFailedOrCanceledSubresources();
 
     return false;
@@ -98,7 +98,7 @@ inline static bool compareCSSValues(const CSSValue& first, const CSSValue& secon
 bool CSSValue::equals(const CSSValue& other) const
 {
     if (m_classType == other.m_classType) {
-        switch (classType()) {
+        switch (getClassType()) {
         case BasicShapeCircleClass:
             return compareCSSValues<CSSBasicShapeCircleValue>(*this, other);
         case BasicShapeEllipseClass:
@@ -184,7 +184,7 @@ bool CSSValue::equals(const CSSValue& other) const
 
 String CSSValue::cssText() const
 {
-    switch (classType()) {
+    switch (getClassType()) {
     case BasicShapeCircleClass:
         return toCSSBasicShapeCircleValue(this)->customCSSText();
     case BasicShapeEllipseClass:
@@ -268,7 +268,7 @@ String CSSValue::cssText() const
 
 void CSSValue::destroy()
 {
-    switch (classType()) {
+    switch (getClassType()) {
     case BasicShapeCircleClass:
         delete toCSSBasicShapeCircleValue(this);
         return;
@@ -389,7 +389,7 @@ void CSSValue::destroy()
 
 void CSSValue::finalizeGarbageCollectedObject()
 {
-    switch (classType()) {
+    switch (getClassType()) {
     case BasicShapeCircleClass:
         toCSSBasicShapeCircleValue(this)->~CSSBasicShapeCircleValue();
         return;
@@ -510,7 +510,7 @@ void CSSValue::finalizeGarbageCollectedObject()
 
 DEFINE_TRACE(CSSValue)
 {
-    switch (classType()) {
+    switch (getClassType()) {
     case BasicShapeCircleClass:
         toCSSBasicShapeCircleValue(this)->traceAfterDispatch(visitor);
         return;
diff --git a/third_party/WebKit/Source/core/css/CSSValue.h b/third_party/WebKit/Source/core/css/CSSValue.h
index 69c3d0a..e5d7588 100644
--- a/third_party/WebKit/Source/core/css/CSSValue.h
+++ b/third_party/WebKit/Source/core/css/CSSValue.h
@@ -191,7 +191,7 @@ protected:
         SlashSeparator
     };
 
-    ClassType classType() const { return static_cast<ClassType>(m_classType); }
+    ClassType getClassType() const { return static_cast<ClassType>(m_classType); }
 
     explicit CSSValue(ClassType classType)
         : m_primitiveUnitType(0)
diff --git a/third_party/WebKit/Source/core/css/ElementRuleCollector.cpp b/third_party/WebKit/Source/core/css/ElementRuleCollector.cpp
index db7f630..177cc70 100644
--- a/third_party/WebKit/Source/core/css/ElementRuleCollector.cpp
+++ b/third_party/WebKit/Source/core/css/ElementRuleCollector.cpp
@@ -285,7 +285,7 @@ void ElementRuleCollector::sortAndTransferMatchedRules()
     // Now transfer the set of matched rules over to our list of declarations.
     for (unsigned i = 0; i < m_matchedRules.size(); i++) {
         const RuleData* ruleData = m_matchedRules[i].ruleData();
-        m_result.addMatchedProperties(&ruleData->rule()->properties(), ruleData->linkMatchType(), ruleData->propertyWhitelistType(m_matchingUARules));
+        m_result.addMatchedProperties(&ruleData->rule()->properties(), ruleData->linkMatchType(), ruleData->propertyWhitelist(m_matchingUARules));
     }
 }
 
diff --git a/third_party/WebKit/Source/core/css/FontFace.cpp b/third_party/WebKit/Source/core/css/FontFace.cpp
index 11a1c2a..3c49e50 100644
--- a/third_party/WebKit/Source/core/css/FontFace.cpp
+++ b/third_party/WebKit/Source/core/css/FontFace.cpp
@@ -327,7 +327,7 @@ String FontFace::status() const
     return emptyString();
 }
 
-void FontFace::setLoadStatus(LoadStatus status)
+void FontFace::setLoadStatus(LoadStatusType status)
 {
     m_status = status;
     ASSERT(m_status != Error || m_error);
diff --git a/third_party/WebKit/Source/core/css/FontFace.h b/third_party/WebKit/Source/core/css/FontFace.h
index ce45e44..d243d62 100644
--- a/third_party/WebKit/Source/core/css/FontFace.h
+++ b/third_party/WebKit/Source/core/css/FontFace.h
@@ -60,7 +60,7 @@ class FontFace : public RefCountedWillBeGarbageCollectedFinalized<FontFace>, pub
     DEFINE_WRAPPERTYPEINFO();
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(FontFace);
 public:
-    enum LoadStatus { Unloaded, Loading, Loaded, Error };
+    enum LoadStatusType { Unloaded, Loading, Loaded, Error };
 
     static PassRefPtrWillBeRawPtr<FontFace> create(ExecutionContext*, const AtomicString& family, StringOrArrayBufferOrArrayBufferView&, const FontFaceDescriptors&);
     static PassRefPtrWillBeRawPtr<FontFace> create(Document*, const StyleRuleFontFace*);
@@ -89,8 +89,8 @@ public:
 
     ScriptPromise load(ScriptState*);
 
-    LoadStatus loadStatus() const { return m_status; }
-    void setLoadStatus(LoadStatus);
+    LoadStatusType loadStatus() const { return m_status; }
+    void setLoadStatus(LoadStatusType);
     void setError(DOMException* = nullptr);
     DOMException* error() const { return m_error; }
     FontTraits traits() const;
@@ -140,7 +140,7 @@ private:
     RefPtrWillBeMember<CSSValue> m_variant;
     RefPtrWillBeMember<CSSValue> m_featureSettings;
     RefPtrWillBeMember<CSSValue> m_display;
-    LoadStatus m_status;
+    LoadStatusType m_status;
     PersistentWillBeMember<DOMException> m_error;
 
     PersistentWillBeMember<LoadedProperty> m_loadedProperty;
diff --git a/third_party/WebKit/Source/core/css/MediaQuery.cpp b/third_party/WebKit/Source/core/css/MediaQuery.cpp
index faa0e20..07552af 100644
--- a/third_party/WebKit/Source/core/css/MediaQuery.cpp
+++ b/third_party/WebKit/Source/core/css/MediaQuery.cpp
@@ -79,13 +79,13 @@ PassOwnPtrWillBeRawPtr<MediaQuery> MediaQuery::createNotAll()
     return adoptPtrWillBeNoop(new MediaQuery(MediaQuery::Not, MediaTypeNames::all, ExpressionHeapVector()));
 }
 
-PassOwnPtrWillBeRawPtr<MediaQuery> MediaQuery::create(Restrictor restrictor, String mediaType, ExpressionHeapVector expressions)
+PassOwnPtrWillBeRawPtr<MediaQuery> MediaQuery::create(RestrictorType restrictor, String mediaType, ExpressionHeapVector expressions)
 {
     return adoptPtrWillBeNoop(new MediaQuery(restrictor, std::move(mediaType), std::move(expressions)));
 }
 
-MediaQuery::MediaQuery(Restrictor r, String mediaType, ExpressionHeapVector expressions)
-    : m_restrictor(r)
+MediaQuery::MediaQuery(RestrictorType restrictor, String mediaType, ExpressionHeapVector expressions)
+    : m_restrictor(restrictor)
     , m_mediaType(attemptStaticStringCreation(mediaType.lower()))
     , m_expressions(std::move(expressions))
 {
diff --git a/third_party/WebKit/Source/core/css/MediaQuery.h b/third_party/WebKit/Source/core/css/MediaQuery.h
index d5f9b11..2820d2d 100644
--- a/third_party/WebKit/Source/core/css/MediaQuery.h
+++ b/third_party/WebKit/Source/core/css/MediaQuery.h
@@ -45,16 +45,16 @@ using ExpressionHeapVector = WillBeHeapVector<OwnPtrWillBeMember<MediaQueryExp>>
 class CORE_EXPORT MediaQuery : public NoBaseWillBeGarbageCollectedFinalized<MediaQuery> {
     USING_FAST_MALLOC_WILL_BE_REMOVED(MediaQuery);
 public:
-    enum Restrictor {
+    enum RestrictorType {
         Only, Not, None
     };
 
-    static PassOwnPtrWillBeRawPtr<MediaQuery> create(Restrictor, String mediaType, ExpressionHeapVector);
+    static PassOwnPtrWillBeRawPtr<MediaQuery> create(RestrictorType, String mediaType, ExpressionHeapVector);
     static PassOwnPtrWillBeRawPtr<MediaQuery> createNotAll();
 
     ~MediaQuery();
 
-    Restrictor restrictor() const { return m_restrictor; }
+    RestrictorType restrictor() const { return m_restrictor; }
     const ExpressionHeapVector& expressions() const { return m_expressions; }
     const String& mediaType() const { return m_mediaType; }
     bool operator==(const MediaQuery& other) const;
@@ -65,12 +65,12 @@ public:
     DECLARE_TRACE();
 
 private:
-    MediaQuery(Restrictor, String mediaType, ExpressionHeapVector);
+    MediaQuery(RestrictorType, String mediaType, ExpressionHeapVector);
     MediaQuery(const MediaQuery&);
 
     MediaQuery& operator=(const MediaQuery&) = delete;
 
-    Restrictor m_restrictor;
+    RestrictorType m_restrictor;
     String m_mediaType;
     ExpressionHeapVector m_expressions;
     String m_serializationCache;
diff --git a/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp b/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp
index acf6704..2fbde7b 100644
--- a/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp
+++ b/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp
@@ -115,7 +115,7 @@ bool MediaQueryEvaluator::mediaTypeMatch(const String& mediaTypeToMatch) const
         || equalIgnoringCase(mediaTypeToMatch, mediaType());
 }
 
-static bool applyRestrictor(MediaQuery::Restrictor r, bool value)
+static bool applyRestrictor(MediaQuery::RestrictorType r, bool value)
 {
     return r == MediaQuery::Not ? !value : value;
 }
diff --git a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.h b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.h
index 219836e..c9102ff 100644
--- a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.h
+++ b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.h
@@ -34,7 +34,7 @@ public:
     bool isLoading() const override;
     bool isLoaded() const override;
     bool isValid() const override;
-    DisplayPeriod displayPeriod() const { return m_period; }
+    DisplayPeriod getDisplayPeriod() const { return m_period; }
 
     void beginLoadIfNeeded() override;
 
diff --git a/third_party/WebKit/Source/core/css/RuleSet.cpp b/third_party/WebKit/Source/core/css/RuleSet.cpp
index ba97888..d33cf2b 100644
--- a/third_party/WebKit/Source/core/css/RuleSet.cpp
+++ b/third_party/WebKit/Source/core/css/RuleSet.cpp
@@ -115,7 +115,7 @@ RuleData::RuleData(StyleRule* rule, unsigned selectorIndex, unsigned position, A
     , m_containsUncommonAttributeSelector(blink::containsUncommonAttributeSelector(selector()))
     , m_linkMatchType(selector().computeLinkMatchType())
     , m_hasDocumentSecurityOrigin(addRuleFlags & RuleHasDocumentSecurityOrigin)
-    , m_propertyWhitelistType(determinePropertyWhitelistType(addRuleFlags, selector()))
+    , m_propertyWhitelist(determinePropertyWhitelistType(addRuleFlags, selector()))
 {
     SelectorFilter::collectIdentifierHashes(selector(), m_descendantSelectorIdentifierHashes, maximumIdentifierCount);
 }
diff --git a/third_party/WebKit/Source/core/css/RuleSet.h b/third_party/WebKit/Source/core/css/RuleSet.h
index 12dd72a..7f74542 100644
--- a/third_party/WebKit/Source/core/css/RuleSet.h
+++ b/third_party/WebKit/Source/core/css/RuleSet.h
@@ -86,7 +86,7 @@ public:
     unsigned specificity() const { return m_specificity; }
     unsigned linkMatchType() const { return m_linkMatchType; }
     bool hasDocumentSecurityOrigin() const { return m_hasDocumentSecurityOrigin; }
-    PropertyWhitelistType propertyWhitelistType(bool isMatchingUARules = false) const { return isMatchingUARules ? PropertyWhitelistNone : static_cast<PropertyWhitelistType>(m_propertyWhitelistType); }
+    PropertyWhitelistType propertyWhitelist(bool isMatchingUARules = false) const { return isMatchingUARules ? PropertyWhitelistNone : static_cast<PropertyWhitelistType>(m_propertyWhitelist); }
     // Try to balance between memory usage (there can be lots of RuleData objects) and good filtering performance.
     static const unsigned maximumIdentifierCount = 4;
     const unsigned* descendantSelectorIdentifierHashes() const { return m_descendantSelectorIdentifierHashes; }
@@ -104,7 +104,7 @@ private:
     unsigned m_containsUncommonAttributeSelector : 1;
     unsigned m_linkMatchType : 2; //  CSSSelector::LinkMatchMask
     unsigned m_hasDocumentSecurityOrigin : 1;
-    unsigned m_propertyWhitelistType : 2;
+    unsigned m_propertyWhitelist : 2;
     // Use plain array instead of a Vector to minimize memory overhead.
     unsigned m_descendantSelectorIdentifierHashes[maximumIdentifierCount];
 };
diff --git a/third_party/WebKit/Source/core/css/StyleColor.h b/third_party/WebKit/Source/core/css/StyleColor.h
index c3cb0bc..0bd696d 100644
--- a/third_party/WebKit/Source/core/css/StyleColor.h
+++ b/third_party/WebKit/Source/core/css/StyleColor.h
@@ -45,7 +45,7 @@ public:
     static StyleColor currentColor() { return StyleColor(); }
 
     bool isCurrentColor() const { return m_currentColor; }
-    Color color() const { ASSERT(!isCurrentColor()); return m_color; }
+    Color getColor() const { ASSERT(!isCurrentColor()); return m_color; }
 
     Color resolve(Color currentColor) const { return m_currentColor ? currentColor : m_color; }
 
@@ -60,7 +60,7 @@ inline bool operator==(const StyleColor& a, const StyleColor& b)
 {
     if (a.isCurrentColor() || b.isCurrentColor())
         return a.isCurrentColor() && b.isCurrentColor();
-    return a.color() == b.color();
+    return a.getColor() == b.getColor();
 }
 
 inline bool operator!=(const StyleColor& a, const StyleColor& b)
diff --git a/third_party/WebKit/Source/core/css/StyleRule.cpp b/third_party/WebKit/Source/core/css/StyleRule.cpp
index 7ff3eff..636f2cb 100644
--- a/third_party/WebKit/Source/core/css/StyleRule.cpp
+++ b/third_party/WebKit/Source/core/css/StyleRule.cpp
@@ -341,7 +341,7 @@ DEFINE_TRACE_AFTER_DISPATCH(StyleRuleFontFace)
     StyleRuleBase::traceAfterDispatch(visitor);
 }
 
-StyleRuleGroup::StyleRuleGroup(Type type, WillBeHeapVector<RefPtrWillBeMember<StyleRuleBase>>& adoptRule)
+StyleRuleGroup::StyleRuleGroup(RuleType type, WillBeHeapVector<RefPtrWillBeMember<StyleRuleBase>>& adoptRule)
     : StyleRuleBase(type)
 {
     m_childRules.swap(adoptRule);
diff --git a/third_party/WebKit/Source/core/css/StyleRule.h b/third_party/WebKit/Source/core/css/StyleRule.h
index a631def..4f46bea 100644
--- a/third_party/WebKit/Source/core/css/StyleRule.h
+++ b/third_party/WebKit/Source/core/css/StyleRule.h
@@ -37,7 +37,7 @@ class CSSStyleSheet;
 class CORE_EXPORT StyleRuleBase : public RefCountedWillBeGarbageCollectedFinalized<StyleRuleBase> {
     USING_FAST_MALLOC_WITH_TYPE_NAME_WILL_BE_REMOVED(blink::StyleRuleBase);
 public:
-    enum Type {
+    enum RuleType {
         Charset,
         Style,
         Import,
@@ -51,7 +51,7 @@ public:
         Viewport,
     };
 
-    Type type() const { return static_cast<Type>(m_type); }
+    RuleType type() const { return static_cast<RuleType>(m_type); }
 
     bool isCharsetRule() const { return type() == Charset; }
     bool isFontFaceRule() const { return type() == FontFace; }
@@ -90,7 +90,7 @@ public:
     ~StyleRuleBase() { }
 
 protected:
-    StyleRuleBase(Type type) : m_type(type) { }
+    StyleRuleBase(RuleType type) : m_type(type) { }
     StyleRuleBase(const StyleRuleBase& o) : m_type(o.m_type) { }
 
 private:
@@ -193,7 +193,7 @@ public:
     DECLARE_TRACE_AFTER_DISPATCH();
 
 protected:
-    StyleRuleGroup(Type, WillBeHeapVector<RefPtrWillBeMember<StyleRuleBase>>& adoptRule);
+    StyleRuleGroup(RuleType, WillBeHeapVector<RefPtrWillBeMember<StyleRuleBase>>& adoptRule);
     StyleRuleGroup(const StyleRuleGroup&);
 
 private:
diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserImpl.cpp b/third_party/WebKit/Source/core/css/parser/CSSParserImpl.cpp
index 7c76bf1..b20276b 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSParserImpl.cpp
+++ b/third_party/WebKit/Source/core/css/parser/CSSParserImpl.cpp
@@ -41,7 +41,7 @@ CSSParserImpl::CSSParserImpl(const CSSParserContext& context, StyleSheetContents
 bool CSSParserImpl::parseValue(MutableStylePropertySet* declaration, CSSPropertyID unresolvedProperty, const String& string, bool important, const CSSParserContext& context)
 {
     CSSParserImpl parser(context);
-    StyleRule::Type ruleType = StyleRule::Style;
+    StyleRule::RuleType ruleType = StyleRule::Style;
     if (declaration->cssParserMode() == CSSViewportRuleMode)
         ruleType = StyleRule::Viewport;
     CSSTokenizer::Scope scope(string);
@@ -114,7 +114,7 @@ PassRefPtrWillBeRawPtr<ImmutableStylePropertySet> CSSParserImpl::parseInlineStyl
 bool CSSParserImpl::parseDeclarationList(MutableStylePropertySet* declaration, const String& string, const CSSParserContext& context)
 {
     CSSParserImpl parser(context);
-    StyleRule::Type ruleType = StyleRule::Style;
+    StyleRule::RuleType ruleType = StyleRule::Style;
     if (declaration->cssParserMode() == CSSViewportRuleMode)
         ruleType = StyleRule::Viewport;
     CSSTokenizer::Scope scope(string);
@@ -652,7 +652,7 @@ PassRefPtrWillBeRawPtr<StyleRule> CSSParserImpl::consumeStyleRule(CSSParserToken
     return StyleRule::create(std::move(selectorList), createStylePropertySet(m_parsedProperties, m_context.mode()));
 }
 
-void CSSParserImpl::consumeDeclarationList(CSSParserTokenRange range, StyleRule::Type ruleType)
+void CSSParserImpl::consumeDeclarationList(CSSParserTokenRange range, StyleRule::RuleType ruleType)
 {
     ASSERT(m_parsedProperties.isEmpty());
 
@@ -702,7 +702,7 @@ void CSSParserImpl::consumeDeclarationList(CSSParserTokenRange range, StyleRule:
     }
 }
 
-void CSSParserImpl::consumeDeclaration(CSSParserTokenRange range, StyleRule::Type ruleType)
+void CSSParserImpl::consumeDeclaration(CSSParserTokenRange range, StyleRule::RuleType ruleType)
 {
     CSSParserTokenRange rangeCopy = range; // For inspector callbacks
 
@@ -755,7 +755,7 @@ void CSSParserImpl::consumeVariableValue(CSSParserTokenRange range, const Atomic
         m_parsedProperties.append(CSSProperty(CSSPropertyVariable, value.release(), important));
 }
 
-void CSSParserImpl::consumeDeclarationValue(CSSParserTokenRange range, CSSPropertyID unresolvedProperty, bool important, StyleRule::Type ruleType)
+void CSSParserImpl::consumeDeclarationValue(CSSParserTokenRange range, CSSPropertyID unresolvedProperty, bool important, StyleRule::RuleType ruleType)
 {
     CSSPropertyParser::parseValue(unresolvedProperty, important, range, m_context, m_parsedProperties, ruleType);
 }
diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserImpl.h b/third_party/WebKit/Source/core/css/parser/CSSParserImpl.h
index 75246ac..882cbb4 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSParserImpl.h
+++ b/third_party/WebKit/Source/core/css/parser/CSSParserImpl.h
@@ -97,9 +97,9 @@ private:
     PassRefPtrWillBeRawPtr<StyleRuleKeyframe> consumeKeyframeStyleRule(CSSParserTokenRange prelude, CSSParserTokenRange block);
     PassRefPtrWillBeRawPtr<StyleRule> consumeStyleRule(CSSParserTokenRange prelude, CSSParserTokenRange block);
 
-    void consumeDeclarationList(CSSParserTokenRange, StyleRule::Type);
-    void consumeDeclaration(CSSParserTokenRange, StyleRule::Type);
-    void consumeDeclarationValue(CSSParserTokenRange, CSSPropertyID, bool important, StyleRule::Type);
+    void consumeDeclarationList(CSSParserTokenRange, StyleRule::RuleType);
+    void consumeDeclaration(CSSParserTokenRange, StyleRule::RuleType);
+    void consumeDeclarationValue(CSSParserTokenRange, CSSPropertyID, bool important, StyleRule::RuleType);
     void consumeVariableValue(CSSParserTokenRange, const AtomicString& propertyName, bool important);
 
     static PassOwnPtr<Vector<double>> consumeKeyframeKeyList(CSSParserTokenRange);
diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserObserver.h b/third_party/WebKit/Source/core/css/parser/CSSParserObserver.h
index 7d49565..784bbe9 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSParserObserver.h
+++ b/third_party/WebKit/Source/core/css/parser/CSSParserObserver.h
@@ -35,7 +35,7 @@ class CSSParserTokenRange;
 class CSSParserObserver {
     STACK_ALLOCATED();
 public:
-    virtual void startRuleHeader(StyleRule::Type, unsigned offset) = 0;
+    virtual void startRuleHeader(StyleRule::RuleType, unsigned offset) = 0;
     virtual void endRuleHeader(unsigned offset) = 0;
     virtual void observeSelector(unsigned startOffset, unsigned endOffset) = 0;
     virtual void startRuleBody(unsigned offset) = 0;
diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserToken.h b/third_party/WebKit/Source/core/css/parser/CSSParserToken.h
index 811db85..9ee58f4 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSParserToken.h
+++ b/third_party/WebKit/Source/core/css/parser/CSSParserToken.h
@@ -135,8 +135,8 @@ public:
     NumericSign numericSign() const;
     NumericValueType numericValueType() const;
     double numericValue() const;
-    HashTokenType hashTokenType() const { ASSERT(m_type == HashToken); return m_hashTokenType; }
-    BlockType blockType() const { return static_cast<BlockType>(m_blockType); }
+    HashTokenType getHashTokenType() const { ASSERT(m_type == HashToken); return m_hashTokenType; }
+    BlockType getBlockType() const { return static_cast<BlockType>(m_blockType); }
     CSSPrimitiveValue::UnitType unitType() const { return static_cast<CSSPrimitiveValue::UnitType>(m_unit); }
     UChar32 unicodeRangeStart() const { ASSERT(m_type == UnicodeRangeToken); return m_unicodeRange.start; }
     UChar32 unicodeRangeEnd() const { ASSERT(m_type == UnicodeRangeToken); return m_unicodeRange.end; }
diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserTokenRange.cpp b/third_party/WebKit/Source/core/css/parser/CSSParserTokenRange.cpp
index 7381a7c..bda8767 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSParserTokenRange.cpp
+++ b/third_party/WebKit/Source/core/css/parser/CSSParserTokenRange.cpp
@@ -28,14 +28,14 @@ CSSParserTokenRange CSSParserTokenRange::makeSubRange(const CSSParserToken* firs
 
 CSSParserTokenRange CSSParserTokenRange::consumeBlock()
 {
-    ASSERT(peek().blockType() == CSSParserToken::BlockStart);
+    ASSERT(peek().getBlockType() == CSSParserToken::BlockStart);
     const CSSParserToken* start = &peek() + 1;
     unsigned nestingLevel = 0;
     do {
         const CSSParserToken& token = consume();
-        if (token.blockType() == CSSParserToken::BlockStart)
+        if (token.getBlockType() == CSSParserToken::BlockStart)
             nestingLevel++;
-        else if (token.blockType() == CSSParserToken::BlockEnd)
+        else if (token.getBlockType() == CSSParserToken::BlockEnd)
             nestingLevel--;
     } while (nestingLevel && m_first < m_last);
 
@@ -51,9 +51,9 @@ void CSSParserTokenRange::consumeComponentValue()
     unsigned nestingLevel = 0;
     do {
         const CSSParserToken& token = consume();
-        if (token.blockType() == CSSParserToken::BlockStart)
+        if (token.getBlockType() == CSSParserToken::BlockStart)
             nestingLevel++;
-        else if (token.blockType() == CSSParserToken::BlockEnd)
+        else if (token.getBlockType() == CSSParserToken::BlockEnd)
             nestingLevel--;
     } while (nestingLevel && m_first < m_last);
 }
diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
index 25cc988..50f616a 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
+++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
@@ -67,7 +67,7 @@ static bool hasInvalidNumericValues(const CSSParserTokenRange& range)
 
 bool CSSPropertyParser::parseValue(CSSPropertyID unresolvedProperty, bool important,
     const CSSParserTokenRange& range, const CSSParserContext& context,
-    WillBeHeapVector<CSSProperty, 256>& parsedProperties, StyleRule::Type ruleType)
+    WillBeHeapVector<CSSProperty, 256>& parsedProperties, StyleRule::RuleType ruleType)
 {
     if (hasInvalidNumericValues(range))
         return false;
diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h
index a406cea..674bd11 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h
+++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h
@@ -76,7 +76,7 @@ public:
 
     static bool parseValue(CSSPropertyID, bool important,
         const CSSParserTokenRange&, const CSSParserContext&,
-        WillBeHeapVector<CSSProperty, 256>&, StyleRule::Type);
+        WillBeHeapVector<CSSProperty, 256>&, StyleRule::RuleType);
 
     static bool isSystemColor(CSSValueID);
     static bool isColorKeyword(CSSValueID);
diff --git a/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp
index 105b5e4..7d106a5 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp
+++ b/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp
@@ -380,7 +380,7 @@ bool CSSSelectorParser::consumeName(CSSParserTokenRange& range, AtomicString& na
 PassOwnPtr<CSSParserSelector> CSSSelectorParser::consumeId(CSSParserTokenRange& range)
 {
     ASSERT(range.peek().type() == HashToken);
-    if (range.peek().hashTokenType() != HashTokenId)
+    if (range.peek().getHashTokenType() != HashTokenId)
         return nullptr;
     OwnPtr<CSSParserSelector> selector = CSSParserSelector::create();
     selector->setMatch(CSSSelector::Id);
diff --git a/third_party/WebKit/Source/core/css/parser/CSSTokenizerTest.cpp b/third_party/WebKit/Source/core/css/parser/CSSTokenizerTest.cpp
index a96db8a..5532fb0 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSTokenizerTest.cpp
+++ b/third_party/WebKit/Source/core/css/parser/CSSTokenizerTest.cpp
@@ -49,7 +49,7 @@ void compareTokens(const CSSParserToken& expected, const CSSParserToken& actual)
         break;
     case HashToken:
         ASSERT_EQ(String(expected.value()), String(actual.value()));
-        ASSERT_EQ(expected.hashTokenType(), actual.hashTokenType());
+        ASSERT_EQ(expected.getHashTokenType(), actual.getHashTokenType());
         break;
     default:
         break;
diff --git a/third_party/WebKit/Source/core/css/parser/CSSVariableParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSVariableParser.cpp
index 297ff31..f025509 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSVariableParser.cpp
+++ b/third_party/WebKit/Source/core/css/parser/CSSVariableParser.cpp
@@ -29,7 +29,7 @@ bool isValidVariableReference(CSSParserTokenRange);
 bool classifyBlock(CSSParserTokenRange range, bool& hasReferences, bool isTopLevelBlock = true)
 {
     while (!range.atEnd()) {
-        if (range.peek().blockType() == CSSParserToken::BlockStart) {
+        if (range.peek().getBlockType() == CSSParserToken::BlockStart) {
             const CSSParserToken& token = range.peek();
             CSSParserTokenRange block = range.consumeBlock();
             if (token.functionId() == CSSValueVar) {
@@ -43,7 +43,7 @@ bool classifyBlock(CSSParserTokenRange range, bool& hasReferences, bool isTopLev
             continue;
         }
 
-        ASSERT(range.peek().blockType() != CSSParserToken::BlockEnd);
+        ASSERT(range.peek().getBlockType() != CSSParserToken::BlockEnd);
 
         const CSSParserToken& token = range.consume();
         switch (token.type()) {
diff --git a/third_party/WebKit/Source/core/css/parser/MediaQueryBlockWatcher.cpp b/third_party/WebKit/Source/core/css/parser/MediaQueryBlockWatcher.cpp
index 1ee384b..7494712 100644
--- a/third_party/WebKit/Source/core/css/parser/MediaQueryBlockWatcher.cpp
+++ b/third_party/WebKit/Source/core/css/parser/MediaQueryBlockWatcher.cpp
@@ -15,9 +15,9 @@ MediaQueryBlockWatcher::MediaQueryBlockWatcher()
 
 void MediaQueryBlockWatcher::handleToken(const CSSParserToken& token)
 {
-    if (token.blockType() == CSSParserToken::BlockStart) {
+    if (token.getBlockType() == CSSParserToken::BlockStart) {
         ++m_blockLevel;
-    } else if (token.blockType() == CSSParserToken::BlockEnd) {
+    } else if (token.getBlockType() == CSSParserToken::BlockEnd) {
         ASSERT(m_blockLevel);
         --m_blockLevel;
     }
diff --git a/third_party/WebKit/Source/core/css/parser/MediaQueryParser.cpp b/third_party/WebKit/Source/core/css/parser/MediaQueryParser.cpp
index cfb23db..5dadb44 100644
--- a/third_party/WebKit/Source/core/css/parser/MediaQueryParser.cpp
+++ b/third_party/WebKit/Source/core/css/parser/MediaQueryParser.cpp
@@ -51,7 +51,7 @@ MediaQueryParser::MediaQueryParser(ParserType parserType)
 
 MediaQueryParser::~MediaQueryParser() { }
 
-void MediaQueryParser::setStateAndRestrict(State state, MediaQuery::Restrictor restrictor)
+void MediaQueryParser::setStateAndRestrict(State state, MediaQuery::RestrictorType restrictor)
 {
     m_mediaQueryData.setRestrictor(restrictor);
     m_state = state;
@@ -188,7 +188,7 @@ void MediaQueryParser::skipUntilComma(CSSParserTokenType type, const CSSParserTo
 
 void MediaQueryParser::skipUntilBlockEnd(CSSParserTokenType type, const CSSParserToken& token)
 {
-    if (token.blockType() == CSSParserToken::BlockEnd && !m_blockWatcher.blockLevel())
+    if (token.getBlockType() == CSSParserToken::BlockEnd && !m_blockWatcher.blockLevel())
         m_state = SkipUntilComma;
 }
 
@@ -196,7 +196,7 @@ void MediaQueryParser::done(CSSParserTokenType type, const CSSParserToken& token
 
 void MediaQueryParser::handleBlocks(const CSSParserToken& token)
 {
-    if (token.blockType() == CSSParserToken::BlockStart
+    if (token.getBlockType() == CSSParserToken::BlockStart
         && (token.type() != LeftParenthesisToken || m_blockWatcher.blockLevel()))
             m_state = SkipUntilBlockEnd;
 }
diff --git a/third_party/WebKit/Source/core/css/parser/MediaQueryParser.h b/third_party/WebKit/Source/core/css/parser/MediaQueryParser.h
index 6744e7d..bb05cba 100644
--- a/third_party/WebKit/Source/core/css/parser/MediaQueryParser.h
+++ b/third_party/WebKit/Source/core/css/parser/MediaQueryParser.h
@@ -22,7 +22,7 @@ class MediaQueryData {
     STACK_ALLOCATED();
     WTF_MAKE_NONCOPYABLE(MediaQueryData);
 private:
-    MediaQuery::Restrictor m_restrictor;
+    MediaQuery::RestrictorType m_restrictor;
     String m_mediaType;
     ExpressionHeapVector m_expressions;
     String m_mediaFeature;
@@ -41,9 +41,9 @@ public:
     {
         return (m_restrictor != MediaQuery::None || m_mediaTypeSet || m_expressions.size() > 0);
     }
-    inline MediaQuery::Restrictor restrictor() { return m_restrictor; }
+    inline MediaQuery::RestrictorType restrictor() { return m_restrictor; }
 
-    inline void setRestrictor(MediaQuery::Restrictor restrictor) { m_restrictor = restrictor; }
+    inline void setRestrictor(MediaQuery::RestrictorType restrictor) { m_restrictor = restrictor; }
 
     inline void setMediaFeature(const String& str) { m_mediaFeature = str; }
 };
@@ -83,7 +83,7 @@ private:
 
     using State = void (MediaQueryParser::*)(CSSParserTokenType, const CSSParserToken&);
 
-    void setStateAndRestrict(State, MediaQuery::Restrictor);
+    void setStateAndRestrict(State, MediaQuery::RestrictorType);
     void handleBlocks(const CSSParserToken&);
 
     State m_state;
diff --git a/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp b/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp
index 21ba3a2..ace65cc 100644
--- a/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp
@@ -113,7 +113,7 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSVariableResolver::resolveVariableReferences(
     CSSParserContext context(HTMLStandardMode, nullptr);
     WillBeHeapVector<CSSProperty, 256> parsedProperties;
     // TODO(timloh): This should be CSSParser::parseSingleValue and not need a vector.
-    if (!CSSPropertyParser::parseValue(id, false, CSSParserTokenRange(tokens), context, parsedProperties, StyleRule::Type::Style))
+    if (!CSSPropertyParser::parseValue(id, false, CSSParserTokenRange(tokens), context, parsedProperties, StyleRule::RuleType::Style))
         return cssValuePool().createUnsetValue();
     ASSERT(parsedProperties.size() == 1);
     return parsedProperties[0].value();
@@ -129,7 +129,7 @@ void CSSVariableResolver::resolveAndApplyVariableReferences(StyleResolverState&
 
         WillBeHeapVector<CSSProperty, 256> parsedProperties;
 
-        if (CSSPropertyParser::parseValue(id, false, CSSParserTokenRange(tokens), context, parsedProperties, StyleRule::Type::Style)) {
+        if (CSSPropertyParser::parseValue(id, false, CSSParserTokenRange(tokens), context, parsedProperties, StyleRule::RuleType::Style)) {
             unsigned parsedPropertiesCount = parsedProperties.size();
             for (unsigned i = 0; i < parsedPropertiesCount; ++i)
                 StyleBuilder::applyProperty(parsedProperties[i].id(), state, parsedProperties[i].value());
diff --git a/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp b/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp
index df32b3d..56c8401 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp
@@ -84,7 +84,7 @@ public:
     }
 
 private:
-    void startRuleHeader(StyleRule::Type, unsigned) override;
+    void startRuleHeader(StyleRule::RuleType, unsigned) override;
     void endRuleHeader(unsigned) override;
     void observeSelector(unsigned startOffset, unsigned endOffset) override;
     void startRuleBody(unsigned) override;
@@ -110,7 +110,7 @@ private:
     unsigned m_mediaQueryExpValueRangeStart;
 };
 
-void StyleSheetHandler::startRuleHeader(StyleRule::Type type, unsigned offset)
+void StyleSheetHandler::startRuleHeader(StyleRule::RuleType type, unsigned offset)
 {
     // Pop off data for a previous invalid rule.
     if (m_currentRuleData)
diff --git a/third_party/WebKit/Source/core/paint/TextPainterTest.cpp b/third_party/WebKit/Source/core/paint/TextPainterTest.cpp
index 1321af8..0c11eb4 100644
--- a/third_party/WebKit/Source/core/paint/TextPainterTest.cpp
+++ b/third_party/WebKit/Source/core/paint/TextPainterTest.cpp
@@ -84,7 +84,7 @@ TEST_F(TextPainterTest, TextPaintingStyle_AllProperties)
     EXPECT_EQ(1, textStyle.shadow->shadows()[0].x());
     EXPECT_EQ(2, textStyle.shadow->shadows()[0].y());
     EXPECT_EQ(3, textStyle.shadow->shadows()[0].blur());
-    EXPECT_EQ(Color(255, 255, 0), textStyle.shadow->shadows()[0].color().color());
+    EXPECT_EQ(Color(255, 255, 0), textStyle.shadow->shadows()[0].color().getColor());
 }
 
 TEST_F(TextPainterTest, TextPaintingStyle_UsesTextAsClip)
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
index d0def29..ed5d4b0 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -1504,7 +1504,7 @@ StyleColor ComputedStyle::decorationColorIncludingFallback(bool visitedLink) con
     if (textStrokeWidth()) {
         // Prefer stroke color if possible, but not if it's fully transparent.
         StyleColor textStrokeStyleColor = visitedLink ? visitedLinkTextStrokeColor() : textStrokeColor();
-        if (!textStrokeStyleColor.isCurrentColor() && textStrokeStyleColor.color().alpha())
+        if (!textStrokeStyleColor.isCurrentColor() && textStrokeStyleColor.getColor().alpha())
             return textStrokeStyleColor;
     }
 
@@ -1574,7 +1574,7 @@ Color ComputedStyle::colorIncludingFallback(int colorProperty, bool visitedLink)
     }
 
     if (!result.isCurrentColor())
-        return result.color();
+        return result.getColor();
 
     // FIXME: Treating styled borders with initial color differently causes problems
     // See crbug.com/316559, crbug.com/276231
diff --git a/third_party/WebKit/Source/core/svg/SVGAnimatedColor.cpp b/third_party/WebKit/Source/core/svg/SVGAnimatedColor.cpp
index 433a895..9e24cb8 100644
--- a/third_party/WebKit/Source/core/svg/SVGAnimatedColor.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGAnimatedColor.cpp
@@ -37,7 +37,7 @@ SVGColorProperty::SVGColorProperty(const String& colorString)
 
 String SVGColorProperty::valueAsString() const
 {
-    return m_styleColor.isCurrentColor() ? "currentColor" : m_styleColor.color().serializedAsCSSComponentValue();
+    return m_styleColor.isCurrentColor() ? "currentColor" : m_styleColor.getColor().serializedAsCSSComponentValue();
 }
 
 PassRefPtrWillBeRawPtr<SVGPropertyBase> SVGColorProperty::cloneForAnimation(const String&) const