Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(198)

Unified Diff: third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp

Issue 2640163004: Replace ENABLE(ASSERT) with DCHECK_IS_ON(). (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp
diff --git a/third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp b/third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp
index a9b1b9a0bf1f4dcc09ba8c003f05edb88dc3333b..871201b553b95dfb11217338dc5f94d6ad53fb86 100644
--- a/third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp
+++ b/third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp
@@ -52,10 +52,6 @@ SMILTimeContainer::SMILTimeContainer(SVGSVGElement& owner)
m_animationPolicyOnceTimer(this,
&SMILTimeContainer::animationPolicyTimerFired),
m_ownerSVGElement(&owner)
-#if ENABLE(ASSERT)
- ,
- m_preventScheduledAnimationsChanges(false)
-#endif
{
}
@@ -63,7 +59,7 @@ SMILTimeContainer::~SMILTimeContainer() {
cancelAnimationFrame();
cancelAnimationPolicyTimer();
ASSERT(!m_wakeupTimer.isActive());
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
ASSERT(!m_preventScheduledAnimationsChanges);
#endif
}
@@ -75,7 +71,7 @@ void SMILTimeContainer::schedule(SVGSMILElement* animation,
DCHECK(target);
DCHECK(animation->hasValidTarget());
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
ASSERT(!m_preventScheduledAnimationsChanges);
#endif
@@ -97,7 +93,7 @@ void SMILTimeContainer::unschedule(SVGSMILElement* animation,
const QualifiedName& attributeName) {
ASSERT(animation->timeContainer() == this);
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
ASSERT(!m_preventScheduledAnimationsChanges);
#endif
@@ -233,7 +229,7 @@ void SMILTimeContainer::setElapsed(double elapsed) {
if (!isPaused())
synchronizeToDocumentTimeline();
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
m_preventScheduledAnimationsChanges = true;
#endif
for (const auto& entry : m_scheduledAnimations) {
@@ -244,7 +240,7 @@ void SMILTimeContainer::setElapsed(double elapsed) {
for (SVGSMILElement* element : *scheduled)
element->reset();
}
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
m_preventScheduledAnimationsChanges = false;
#endif
@@ -423,7 +419,7 @@ SMILTime SMILTimeContainer::updateAnimations(double elapsed, bool seekToTime) {
ASSERT(document().isActive());
SMILTime earliestFireTime = SMILTime::unresolved();
-#if ENABLE(ASSERT)
+#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
@@ -491,7 +487,7 @@ SMILTime SMILTimeContainer::updateAnimations(double elapsed, bool seekToTime) {
m_scheduledAnimations.removeAll(invalidKeys);
if (animationsToApply.isEmpty()) {
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
m_preventScheduledAnimationsChanges = false;
#endif
return earliestFireTime;
@@ -506,7 +502,7 @@ SMILTime SMILTimeContainer::updateAnimations(double elapsed, bool seekToTime) {
for (const auto& timedElement : animationsToApply)
timedElement->applyResultsToTarget();
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
m_preventScheduledAnimationsChanges = false;
#endif

Powered by Google App Engine
This is Rietveld 408576698