Replace ASSERT with DCHECK in core/svg/

third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.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 43 matching lines @@
           &SMILTimeContainer::wakeupTimerFired),
       m_animationPolicyOnceTimer(
           TaskRunnerHelper::get(TaskType::UnspecedTimer, &owner.document()),
           this,
           &SMILTimeContainer::animationPolicyTimerFired),
       m_ownerSVGElement(&owner) {}
 
 SMILTimeContainer::~SMILTimeContainer() {
   cancelAnimationFrame();
   cancelAnimationPolicyTimer();
-  ASSERT(!m_wakeupTimer.isActive());
+  DCHECK(!m_wakeupTimer.isActive());
 #if DCHECK_IS_ON()
-  ASSERT(!m_preventScheduledAnimationsChanges);
+  DCHECK(!m_preventScheduledAnimationsChanges);
 #endif
 }
 
 void SMILTimeContainer::schedule(SVGSMILElement* animation,
                                  SVGElement* target,
                                  const QualifiedName& attributeName) {
   DCHECK_EQ(animation->timeContainer(), this);
   DCHECK(target);
   DCHECK(animation->hasValidTarget());
 
 #if DCHECK_IS_ON()
-  ASSERT(!m_preventScheduledAnimationsChanges);
+  DCHECK(!m_preventScheduledAnimationsChanges);
 #endif
 
   ElementAttributePair key(target, attributeName);
   Member<AnimationsLinkedHashSet>& scheduled =
       m_scheduledAnimations.insert(key, nullptr).storedValue->value;
   if (!scheduled)
     scheduled = new AnimationsLinkedHashSet;
-  ASSERT(!scheduled->contains(animation));
+  DCHECK(!scheduled->contains(animation));
   scheduled->insert(animation);
 
   SMILTime nextFireTime = animation->nextProgressTime();
   if (nextFireTime.isFinite())
     notifyIntervalsChanged();
 }
 
 void SMILTimeContainer::unschedule(SVGSMILElement* animation,
                                    SVGElement* target,
                                    const QualifiedName& attributeName) {
-  ASSERT(animation->timeContainer() == this);
+  DCHECK_EQ(animation->timeContainer(), this);
 
 #if DCHECK_IS_ON()
-  ASSERT(!m_preventScheduledAnimationsChanges);
+  DCHECK(!m_preventScheduledAnimationsChanges);
 #endif
 
   ElementAttributePair key(target, attributeName);
   GroupedAnimationsMap::iterator it = m_scheduledAnimations.find(key);
-  ASSERT(it != m_scheduledAnimations.end());
+  DCHECK_NE(it, m_scheduledAnimations.end());
   AnimationsLinkedHashSet* scheduled = it->value.get();
-  ASSERT(scheduled);
+  DCHECK(scheduled);
   AnimationsLinkedHashSet::iterator itAnimation = scheduled->find(animation);
-  ASSERT(itAnimation != scheduled->end());
+  DCHECK(itAnimation != scheduled->end());

[tkent, 2017/03/14 22:33:14]

Use DCHECK_NE if possible

[mrunal, 2017/03/14 23:52:14]

It throws a compiler error,
../../base/logging.h:659:3: error: no matching function for call to
'MakeCheckOpValueString'
  MakeCheckOpValueString(&ss, v1);
  ^~~~~~~~~~~~~~~~~~~~~~
../../base/logging.h:704:1: note: in instantiation of function template
specialization
'logging::MakeCheckOpString<WTF::LinkedHashSetIterator<WTF::LinkedHashSet<blink::WeakMember<blink::SVGSMILElement>,
WTF::MemberHash<blink::SVGSMILElement>,
WTF::HashTraits<blink::WeakMember<blink::SVGSMILElement> >,
blink::HeapAllocator> >,
WTF::LinkedHashSetIterator<WTF::LinkedHashSet<blink::WeakMember<blink::SVGSMILElement>,
WTF::MemberHash<blink::SVGSMILElement>,
WTF::HashTraits<blink::WeakMember<blink::SVGSMILElement> >,
blink::HeapAllocator> > >' requested here
DEFINE_CHECK_OP_IMPL(NE, !=)
^
../../base/logging.h:695:25: note: expanded from macro 'DEFINE_CHECK_OP_IMPL'
      return ::logging::MakeCheckOpString(v1, v2, names);                    \
                        ^
../../third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp:109:3:
note: in instantiation of function template specialization
'logging::CheckNEImpl<WTF::LinkedHashSetIterator<WTF::LinkedHashSet<blink::WeakMember<blink::SVGSMILElement>,
WTF::MemberHash<blink::SVGSMILElement>,
WTF::HashTraits<blink::WeakMember<blink::SVGSMILElement> >,
blink::HeapAllocator> >,
WTF::LinkedHashSetIterator<WTF::LinkedHashSet<blink::WeakMember<blink::SVGSMILElement>,
WTF::MemberHash<blink::SVGSMILElement>,
WTF::HashTraits<blink::WeakMember<blink::SVGSMILElement> >,
blink::HeapAllocator> > >' requested here
  DCHECK_NE(itAnimation, scheduled->end());
  ^
../../base/logging.h:900:31: note: expanded from macro 'DCHECK_NE'
#define DCHECK_NE(val1, val2) DCHECK_OP(NE, !=, val1, val2)
                              ^
../../base/logging.h:853:18: note: expanded from macro 'DCHECK_OP'
      ::logging::Check##name##Impl((val1), (val2),                     \

   scheduled->erase(itAnimation);
 
   if (scheduled->isEmpty())
     m_scheduledAnimations.remove(it);
 }
 
 bool SMILTimeContainer::hasAnimations() const {
   return !m_scheduledAnimations.isEmpty();
 }
 
@@ skipping 144 matching lines @@
 }
 
 void SMILTimeContainer::cancelAnimationFrame() {
   m_frameSchedulingState = Idle;
   m_wakeupTimer.stop();
 }
 
 void SMILTimeContainer::scheduleWakeUp(
     double delayTime,
     FrameSchedulingState frameSchedulingState) {
-  ASSERT(frameSchedulingState == SynchronizeAnimations ||
+  DCHECK(frameSchedulingState == SynchronizeAnimations ||
          frameSchedulingState == FutureAnimationFrame);
   m_wakeupTimer.startOneShot(delayTime, BLINK_FROM_HERE);
   m_frameSchedulingState = frameSchedulingState;
 }
 
 void SMILTimeContainer::wakeupTimerFired(TimerBase*) {
-  ASSERT(m_frameSchedulingState == SynchronizeAnimations ||
+  DCHECK(m_frameSchedulingState == SynchronizeAnimations ||
          m_frameSchedulingState == FutureAnimationFrame);
   if (m_frameSchedulingState == FutureAnimationFrame) {
-    ASSERT(isTimelineRunning());
+    DCHECK(isTimelineRunning());
     m_frameSchedulingState = Idle;
     serviceOnNextFrame();
   } else {
     m_frameSchedulingState = Idle;
     updateAnimationsAndScheduleFrameIfNeeded(elapsed());
   }
 }
 
 void SMILTimeContainer::scheduleAnimationPolicyTimer() {
   m_animationPolicyOnceTimer.startOneShot(animationPolicyOnceDuration,
@@ skipping 117 matching lines @@
     return;
 
   SMILTime earliestFireTime = updateAnimations(elapsed, seekToTime);
   if (!canScheduleFrame(earliestFireTime))
     return;
   double delayTime = earliestFireTime.value() - elapsed;
   scheduleAnimationFrame(delayTime);
 }
 
 SMILTime SMILTimeContainer::updateAnimations(double elapsed, bool seekToTime) {
-  ASSERT(document().isActive());
+  DCHECK(document().isActive());
   SMILTime earliestFireTime = SMILTime::unresolved();
 
 #if DCHECK_IS_ON()
   // This boolean will catch any attempts to schedule/unschedule
   // scheduledAnimations during this critical section.  Similarly, any elements
   // removed will unschedule themselves, so this will catch modification of
   // animationsToApply.
   m_preventScheduledAnimationsChanges = true;
 #endif
 
@@ skipping 96 matching lines @@
 void SMILTimeContainer::advanceFrameForTesting() {
   setElapsed(elapsed() + initialFrameDelay);
 }
 
 DEFINE_TRACE(SMILTimeContainer) {
   visitor->trace(m_scheduledAnimations);
   visitor->trace(m_ownerSVGElement);
 }
 
 }  // namespace blink