5 files changed, 16 insertions, 21 deletions
diff --git a/src/ui/render/border_render_object.cpp b/src/ui/render/border_render_object.cpp
index 5b6cdb3c..7c96a3b6 100644
--- a/src/ui/render/border_render_object.cpp
+++ b/src/ui/render/border_render_object.cpp
@@ -7,7 +7,6 @@
 #include "cru/platform/graph/util/painter.hpp"
 
 #include <algorithm>
-#include <cassert>
 
 namespace cru::ui::render {
 BorderRenderObject::BorderRenderObject() {
diff --git a/src/ui/render/flex_layout_render_object.cpp b/src/ui/render/flex_layout_render_object.cpp
index 791e705a..f40a9b3e 100644
--- a/src/ui/render/flex_layout_render_object.cpp
+++ b/src/ui/render/flex_layout_render_object.cpp
@@ -3,7 +3,6 @@
 #include "cru/platform/graph/util/painter.hpp"
 
 #include <algorithm>
-#include <cassert>
 #include <functional>
 
 namespace cru::ui::render {
diff --git a/src/ui/render/render_object.cpp b/src/ui/render/render_object.cpp
index 5cce6d0d..c1b1b19b 100644
--- a/src/ui/render/render_object.cpp
+++ b/src/ui/render/render_object.cpp
@@ -3,18 +3,18 @@
 #include "cru/common/logger.hpp"
 
 #include <algorithm>
-#include <cassert>
 
 namespace cru::ui::render {
 void RenderObject::AddChild(RenderObject* render_object, const int position) {
-  assert(child_mode_ != ChildMode::None);
-  assert(!(child_mode_ == ChildMode::Single && children_.size() > 0));
+  Expects(child_mode_ != ChildMode::None);
+  Expects(!(child_mode_ == ChildMode::Single && children_.size() > 0));
 
-  assert(render_object->GetParent() ==
-         nullptr);        // Render object already has a parent.
-  assert(position >= 0);  // Position index is less than 0.
-  assert(position <= static_cast<int>(
-                         children_.size()));  // Position index is out of bound.
+  Expects(render_object->GetParent() ==
+          nullptr);        // Render object already has a parent.
+  Expects(position >= 0);  // Position index is less than 0.
+  Expects(
+      position <=
+      static_cast<int>(children_.size()));  // Position index is out of bound.
 
   children_.insert(children_.cbegin() + position, render_object);
   render_object->SetParent(this);
@@ -23,9 +23,9 @@ void RenderObject::AddChild(RenderObject* render_object, const int position) {
 }
 
 void RenderObject::RemoveChild(const int position) {
-  assert(position >= 0);  // Position index is less than 0.
-  assert(position < static_cast<int>(
-                        children_.size()));  // Position index is out of bound.
+  Expects(position >= 0);  // Position index is less than 0.
+  Expects(position < static_cast<int>(
+                         children_.size()));  // Position index is out of bound.
 
   const auto i = children_.cbegin() + position;
   const auto removed_child = *i;
@@ -45,7 +45,7 @@ Point RenderObject::GetTotalOffset() const {
     result.y += o.y;
     render_object = render_object->GetParent();
   }
-  
+
   return result;
 }
 
diff --git a/src/ui/render/text_render_object.cpp b/src/ui/render/text_render_object.cpp
index d14a46e2..be02f8fe 100644
--- a/src/ui/render/text_render_object.cpp
+++ b/src/ui/render/text_render_object.cpp
@@ -6,7 +6,6 @@
 #include "cru/platform/graph/util/painter.hpp"
 
 #include <algorithm>
-#include <cassert>
 
 // TODO: Null Check!!!
 
@@ -15,9 +14,9 @@ TextRenderObject::TextRenderObject(
     std::shared_ptr<platform::graph::IBrush> brush,
     std::shared_ptr<platform::graph::IFont> font,
     std::shared_ptr<platform::graph::IBrush> selection_brush) {
-  assert(brush);
-  assert(font);
-  assert(selection_brush);
+  Expects(brush);
+  Expects(font);
+  Expects(selection_brush);
 
   SetChildMode(ChildMode::None);
 
diff --git a/src/ui/render/window_render_object.cpp b/src/ui/render/window_render_object.cpp
index 43269d09..29313645 100644
--- a/src/ui/render/window_render_object.cpp
+++ b/src/ui/render/window_render_object.cpp
@@ -7,15 +7,13 @@
 #include "cru/platform/native/window.hpp"
 #include "cru/ui/window.hpp"
 
-#include <cassert>
-
 namespace cru::ui::render {
 class WindowRenderHost : public IRenderHost,
                          public SelfResolvable<WindowRenderHost> {
  public:
   WindowRenderHost(WindowRenderObject* render_object)
       : render_object_(render_object) {
-    assert(render_object != nullptr);
+    Expects(render_object != nullptr);
   }
 
   void InvalidateLayout() override;