Make ifdefs consistent in WebKit/Source/core/

third_party/WebKit/Source/platform/Timer.cpp

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google 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
@@ skipping 40 matching lines @@
   ASSERT(m_webTaskRunner);
 }
 
 TimerBase::~TimerBase() {
   stop();
 }
 
 void TimerBase::start(double nextFireInterval,
                       double repeatInterval,
                       const WebTraceLocation& caller) {
-  ASSERT(m_thread == currentThread());
+#if DCHECK_IS_ON()
+  DCHECK(m_thread == currentThread());

[Yuta Kitamura, 2016/11/21 09:26:12]

Ditto for this file.

[Alexander Alekseev, 2016/11/23 09:20:30]

Done.

+#endif
 
   m_location = caller;
   m_repeatInterval = repeatInterval;
   setNextFireTime(timerMonotonicallyIncreasingTime(), nextFireInterval);
 }
 
 void TimerBase::stop() {
-  ASSERT(m_thread == currentThread());
+#if DCHECK_IS_ON()
+  DCHECK(m_thread == currentThread());
+#endif
 
   m_repeatInterval = 0;
   m_nextFireTime = 0;
   m_weakPtrFactory.revokeAll();
 }
 
 double TimerBase::nextFireInterval() const {
   ASSERT(isActive());
   double current = timerMonotonicallyIncreasingTime();
   if (m_nextFireTime < current)
     return 0;
   return m_nextFireTime - current;
 }
 
 // static
 WebTaskRunner* TimerBase::getTimerTaskRunner() {
   return Platform::current()->currentThread()->scheduler()->timerTaskRunner();
 }
 
 // static
 WebTaskRunner* TimerBase::getUnthrottledTaskRunner() {
   return Platform::current()->currentThread()->getWebTaskRunner();
 }
 
 WebTaskRunner* TimerBase::timerTaskRunner() const {
   return m_webTaskRunner.get();
 }
 
 void TimerBase::setNextFireTime(double now, double delay) {
-  ASSERT(m_thread == currentThread());
+#if DCHECK_IS_ON()
+  DCHECK(m_thread == currentThread());
+#endif
 
   double newTime = now + delay;
 
   if (m_nextFireTime != newTime) {
     m_nextFireTime = newTime;
 
     // Cancel any previously posted task.
     m_weakPtrFactory.revokeAll();
 
     double delayMs = 1000.0 * (newTime - now);
@@ skipping 37 matching lines @@
                                        const TimerBase* b) const {
   return a->m_nextFireTime < b->m_nextFireTime;
 }
 
 // static
 double TimerBase::timerMonotonicallyIncreasingTime() const {
   return timerTaskRunner()->monotonicallyIncreasingVirtualTimeSeconds();
 }
 
 }  // namespace blink