Rename enums/functions that collide in chromium style in core/svg,xml

third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp

 /*
  * Copyright (C) 2008 Apple Inc. 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 581 matching lines @@
     return nullptr;
 }
 
 void SVGSMILElement::connectSyncBaseConditions()
 {
     if (m_syncBaseConditionsConnected)
         disconnectSyncBaseConditions();
     m_syncBaseConditionsConnected = true;
     for (unsigned n = 0; n < m_conditions.size(); ++n) {
         Condition* condition = m_conditions[n].get();
-        if (condition->type() == Condition::Syncbase) {
+        if (condition->getType() == Condition::Syncbase) {
             ASSERT(!condition->baseID().isEmpty());
             Element* element = treeScope().getElementById(AtomicString(condition->baseID()));
             if (!element || !isSVGSMILElement(*element)) {
                 condition->setSyncBase(0);
                 continue;
             }
             SVGSMILElement* svgSMILElement = toSVGSMILElement(element);
             condition->setSyncBase(svgSMILElement);
             svgSMILElement->addSyncBaseDependent(this);
         }
     }
 }
 
 void SVGSMILElement::disconnectSyncBaseConditions()
 {
     if (!m_syncBaseConditionsConnected)
         return;
     m_syncBaseConditionsConnected = false;
     for (unsigned n = 0; n < m_conditions.size(); ++n) {
         Condition* condition = m_conditions[n].get();
-        if (condition->type() == Condition::Syncbase) {
+        if (condition->getType() == Condition::Syncbase) {
             if (condition->syncBase())
                 condition->syncBase()->removeSyncBaseDependent(this);
             condition->setSyncBase(0);
         }
     }
 }
 
 void SVGSMILElement::connectEventBaseConditions()
 {
     disconnectEventBaseConditions();
     for (unsigned n = 0; n < m_conditions.size(); ++n) {
         Condition* condition = m_conditions[n].get();
-        if (condition->type() == Condition::EventBase) {
+        if (condition->getType() == Condition::EventBase) {
             ASSERT(!condition->syncBase());
             SVGElement* eventBase = eventBaseFor(*condition);
             if (!eventBase) {
                 if (!condition->baseID().isEmpty() && !document().accessSVGExtensions().isElementPendingResource(this, AtomicString(condition->baseID())))
                     document().accessSVGExtensions().addPendingResource(AtomicString(condition->baseID()), this);
                 continue;
             }
             ASSERT(!condition->eventListener());
             condition->setEventListener(ConditionEventListener::create(this, condition));
             eventBase->addEventListener(AtomicString(condition->name()), condition->eventListener(), false);
             addReferenceTo(eventBase);
         }
     }
 }
 
 void SVGSMILElement::disconnectEventBaseConditions()
 {
     for (unsigned n = 0; n < m_conditions.size(); ++n) {
         Condition* condition = m_conditions[n].get();
-        if (condition->type() == Condition::EventBase) {
+        if (condition->getType() == Condition::EventBase) {
             ASSERT(!condition->syncBase());
             if (!condition->eventListener())
                 continue;
             // Note: It's a memory optimization to try to remove our condition
             // event listener, but it's not guaranteed to work, since we have
             // no guarantee that eventBaseFor() will be able to find our condition's
             // original eventBase. So, we also have to disconnect ourselves from
             // our condition event listener, in case it later fires.
             SVGElement* eventBase = eventBaseFor(*condition);
             if (eventBase)
@@ skipping 575 matching lines @@
 
     loopBreaker->remove(this);
 }
 
 void SVGSMILElement::createInstanceTimesFromSyncbase(SVGSMILElement* syncBase)
 {
     // FIXME: To be really correct, this should handle updating exising interval by changing
     // the associated times instead of creating new ones.
     for (unsigned n = 0; n < m_conditions.size(); ++n) {
         Condition* condition = m_conditions[n].get();
-        if (condition->type() == Condition::Syncbase && condition->syncBase() == syncBase) {
+        if (condition->getType() == Condition::Syncbase && condition->syncBase() == syncBase) {
             ASSERT(condition->name() == "begin" || condition->name() == "end");
             // No nested time containers in SVG, no need for crazy time space conversions. Phew!
             SMILTime time = 0;
             if (condition->name() == "begin")
                 time = syncBase->m_interval.begin + condition->offset();
             else
                 time = syncBase->m_interval.end + condition->offset();
             if (!time.isFinite())
                 continue;
             SMILTime elapsed = this->elapsed();
             if (elapsed.isUnresolved())
                 continue;
-            if (condition->beginOrEnd() == Begin)
+            if (condition->getBeginOrEnd() == Begin)
                 addBeginTime(elapsed, time);
             else
                 addEndTime(elapsed, time);
         }
     }
 }
 
 void SVGSMILElement::addSyncBaseDependent(SVGSMILElement* animation)
 {
     m_syncBaseDependents.add(animation);
     if (m_interval.begin.isFinite())
         animation->createInstanceTimesFromSyncbase(this);
 }
 
 void SVGSMILElement::removeSyncBaseDependent(SVGSMILElement* animation)
 {
     m_syncBaseDependents.remove(animation);
 }
 
 void SVGSMILElement::handleConditionEvent(Event* event, Condition* condition)
 {
     if (event->type() == "repeatn" && toRepeatEvent(event)->repeat() != condition->repeat())
         return;
 
     SMILTime elapsed = this->elapsed();
     if (elapsed.isUnresolved())
         return;
-    if (condition->beginOrEnd() == Begin)
+    if (condition->getBeginOrEnd() == Begin)
         addBeginTime(elapsed, elapsed + condition->offset());
     else
         addEndTime(elapsed, elapsed + condition->offset());
 }
 
 void SVGSMILElement::beginByLinkActivation()
 {
     SMILTime elapsed = this->elapsed();
     if (elapsed.isUnresolved())
         return;
@@ skipping 64 matching lines @@
     visitor->trace(m_targetElement);
     visitor->trace(m_timeContainer);
     visitor->trace(m_conditions);
     visitor->trace(m_syncBaseDependents);
 #endif
     SVGElement::trace(visitor);
     SVGTests::trace(visitor);
 }
 
 } // namespace blink