Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / events / EventListenerMap.h

diff --git a/src/third_party/WebKit/Source/core/events/EventListenerMap.h b/src/third_party/WebKit/Source/core/events/EventListenerMap.h
index 37d72dd..6a9ca1b 100644 (file)
--- a/src/third_party/WebKit/Source/core/events/EventListenerMap.h
+++ b/src/third_party/WebKit/Source/core/events/EventListenerMap.h
@@ -37,7 +37,7 @@
 #include "wtf/PassOwnPtr.h"
 #include "wtf/text/AtomicStringHash.h"
 
-namespace WebCore {
+namespace blink {
 
 class EventTarget;
 
@@ -67,7 +67,7 @@ private:
 
     Vector<std::pair<AtomicString, OwnPtr<EventListenerVector> >, 2> m_entries;
 
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
     int m_activeIteratorCount;
 #endif
 };
@@ -77,7 +77,7 @@ class EventListenerIterator {
 public:
     EventListenerIterator();
     EventListenerIterator(EventTarget*);
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
     ~EventListenerIterator();
 #endif
 
@@ -89,10 +89,10 @@ private:
     unsigned m_index;
 };
 
-#ifdef NDEBUG
+#if !ENABLE(ASSERT)
 inline void EventListenerMap::assertNoActiveIterators() { }
 #endif
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // EventListenerMap_h