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

third_party/WebKit/Source/core/dom/Element.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 353 matching lines @@
 
 bool Element::hasAnimations() const
 {
     if (!hasRareData())
         return false;
 
     ElementAnimations* elementAnimations = elementRareData()->elementAnimations();
     return elementAnimations && !elementAnimations->isEmpty();
 }
 
-Node::NodeType Element::nodeType() const
+Node::NodeType Element::getNodeType() const
 {
     return ELEMENT_NODE;
 }
 
 bool Element::hasAttribute(const QualifiedName& name) const
 {
     return hasAttributeNS(name.namespaceURI(), name.localName());
 }
 
 void Element::synchronizeAllAttributes() const
@@ skipping 1123 matching lines @@
             data->intersectionObserverData()->deactivateAllIntersectionObservers(*this);
     }
 }
 
 void Element::attach(const AttachContext& context)
 {
     ASSERT(document().inStyleRecalc());
 
     // We've already been through detach when doing an attach, but we might
     // need to clear any state that's been added since then.
-    if (hasRareData() && styleChangeType() == NeedsReattachStyleChange) {
+    if (hasRareData() && getStyleChangeType() == NeedsReattachStyleChange) {
         ElementRareData* data = elementRareData();
         data->clearComputedStyle();
     }
 
     if (!isSlotOrActiveInsertionPoint())
         LayoutTreeBuilderForElement(*this, context.resolvedStyle).createLayoutObjectIfNeeded();
 
     addCallbackSelectors();
 
     if (hasRareData() && !layoutObject()) {
@@ skipping 243 matching lines @@
             layoutObject->setStyle(newStyle.get());
         } else {
             // Although no change occurred, we use the new style so that the cousin style sharing code won't get
             // fooled into believing this style is the same.
             // FIXME: We may be able to remove this hack, see discussion in
             // https://codereview.chromium.org/30453002/
             layoutObject->setStyleInternal(newStyle.get());
         }
     }
 
-    if (styleChangeType() >= SubtreeStyleChange)
+    if (getStyleChangeType() >= SubtreeStyleChange)
         return Force;
 
     if (change > Inherit || localChange > Inherit)
         return max(localChange, change);
 
     if (localChange < Inherit) {
         if (oldStyle->hasChildDependentFlags()) {
             if (childNeedsStyleRecalc())
                 return Inherit;
             newStyle->copyChildDependentFlagsFrom(*oldStyle);
@@ skipping 60 matching lines @@
 void Element::clearAnimationStyleChange()
 {
     if (!hasRareData())
         return;
     if (ElementAnimations* elementAnimations = elementRareData()->elementAnimations())
         elementAnimations->setAnimationStyleChange(false);
 }
 
 void Element::setNeedsAnimationStyleRecalc()
 {
-    if (styleChangeType() != NoStyleChange)
+    if (getStyleChangeType() != NoStyleChange)
         return;
 
     setNeedsStyleRecalc(LocalStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::Animation));
     setAnimationStyleChange(true);
 }
 
 void Element::setNeedsCompositingUpdate()
 {
     if (!document().isActive())
         return;
@@ skipping 1766 matching lines @@
 {
 #if ENABLE(OILPAN)
     if (hasRareData())
         visitor->trace(elementRareData());
     visitor->trace(m_elementData);
 #endif
     ContainerNode::trace(visitor);
 }
 
 } // namespace blink