Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / frame / SuspendableTimer.cpp

diff --git a/src/third_party/WebKit/Source/core/frame/SuspendableTimer.cpp b/src/third_party/WebKit/Source/core/frame/SuspendableTimer.cpp
index afbf627..64f0829 100644 (file)
--- a/src/third_party/WebKit/Source/core/frame/SuspendableTimer.cpp
+++ b/src/third_party/WebKit/Source/core/frame/SuspendableTimer.cpp
@@ -27,14 +27,14 @@
 #include "config.h"
 #include "core/frame/SuspendableTimer.h"
 
-namespace WebCore {
+namespace blink {
 
 SuspendableTimer::SuspendableTimer(ExecutionContext* context)
     : ActiveDOMObject(context)
     , m_nextFireInterval(0)
     , m_repeatInterval(0)
     , m_active(false)
-#if ASSERT_ENABLED
+#if ENABLE(ASSERT)
     , m_suspended(false)
 #endif
 {
@@ -56,7 +56,7 @@ void SuspendableTimer::stop()
 
 void SuspendableTimer::suspend()
 {
-#if ASSERT_ENABLED
+#if ENABLE(ASSERT)
     ASSERT(!m_suspended);
     m_suspended = true;
 #endif
@@ -70,7 +70,7 @@ void SuspendableTimer::suspend()
 
 void SuspendableTimer::resume()
 {
-#if ASSERT_ENABLED
+#if ENABLE(ASSERT)
     ASSERT(m_suspended);
     m_suspended = false;
 #endif
@@ -79,4 +79,4 @@ void SuspendableTimer::resume()
         start(m_nextFireInterval, m_repeatInterval, FROM_HERE);
 }
 
-} // namespace WebCore
+} // namespace blink