Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / dom / shadow / ComposedTreeWalker.h

diff --git a/src/third_party/WebKit/Source/core/dom/shadow/ComposedTreeWalker.h b/src/third_party/WebKit/Source/core/dom/shadow/ComposedTreeWalker.h
index 81cb156..d3598e7 100644 (file)
--- a/src/third_party/WebKit/Source/core/dom/shadow/ComposedTreeWalker.h
+++ b/src/third_party/WebKit/Source/core/dom/shadow/ComposedTreeWalker.h
@@ -31,10 +31,9 @@
 #include "core/dom/shadow/InsertionPoint.h"
 #include "core/dom/shadow/ShadowRoot.h"
 
-namespace WebCore {
+namespace blink {
 
 class Node;
-class ShadowRoot;
 
 // FIXME: Make some functions inline to optimise the performance.
 // https://bugs.webkit.org/show_bug.cgi?id=82702
@@ -75,7 +74,7 @@ private:
 
     void assertPrecondition() const
     {
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
         ASSERT(m_node);
         ASSERT(!m_node->isShadowRoot());
         ASSERT(!isActiveInsertionPoint(*m_node));
@@ -84,7 +83,7 @@ private:
 
     void assertPostcondition() const
     {
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
         if (m_node)
             assertPrecondition();
 #endif
@@ -116,7 +115,7 @@ private:
 inline ComposedTreeWalker::ComposedTreeWalker(const Node* node, StartPolicy startPolicy)
     : m_node(node)
 {
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
     if (m_node && startPolicy == CannotStartFromShadowBoundary)
         assertPrecondition();
 #endif