Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / RenderLineBoxList.h

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderLineBoxList.h b/src/third_party/WebKit/Source/core/rendering/RenderLineBoxList.h
index 611b4d4..2bf6660 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderLineBoxList.h
+++ b/src/third_party/WebKit/Source/core/rendering/RenderLineBoxList.h
@@ -32,7 +32,7 @@
 
 #include "core/rendering/RenderObject.h"
 
-namespace WebCore {
+namespace blink {
 
 class RenderLineBoxList {
 public:
@@ -42,7 +42,7 @@ public:
     {
     }
 
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
     ~RenderLineBoxList();
 #endif
 
@@ -79,12 +79,12 @@ private:
 };
 
 
-#ifdef NDEBUG
+#if !ENABLE(ASSERT)
 inline void RenderLineBoxList::checkConsistency() const
 {
 }
 #endif
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // RenderFlow_h