Clean codes. Remove Measure1.

6 files changed, 2 insertions, 108 deletions

diff --git a/src/ui/render/BorderRenderObject.cpp b/src/ui/render/BorderRenderObject.cpp
index 954bf6c7..23405aac 100644
--- a/src/ui/render/BorderRenderObject.cpp
+++ b/src/ui/render/BorderRenderObject.cpp
@@ -124,13 +124,6 @@ Size BorderRenderObject::OnMeasureContent(const MeasureRequirement& requirement,
   }
 }
 
-Size BorderRenderObject::OnMeasureContent1(const BoxConstraint& constraint) {
-  auto child = GetChild();
-  if (child == nullptr) return constraint.min;
-  auto child_size = child->Measure1(BoxConstraint::kNotLimit);
-  return constraint.Coerce(child_size);
-}
-
 void BorderRenderObject::OnLayoutContent(const Rect& content_rect) {
   if (auto child = GetChild()) {
     child->Layout(content_rect.GetLeftTop());
diff --git a/src/ui/render/CanvasRenderObject.cpp b/src/ui/render/CanvasRenderObject.cpp
index 318f1ffb..b68f9afd 100644
--- a/src/ui/render/CanvasRenderObject.cpp
+++ b/src/ui/render/CanvasRenderObject.cpp
@@ -21,10 +21,6 @@ Size CanvasRenderObject::OnMeasureContent(const MeasureRequirement& requirement,
                                  preferred_size.height.GetLengthOr(100)});
 }
 
-Size CanvasRenderObject::OnMeasureContent1(const BoxConstraint& constraint) {
-  return constraint.Coerce(Size{100, 100});
-}
-
 void CanvasRenderObject::OnLayoutContent(const Rect& content_rect) {
   CRU_UNUSED(content_rect)
 }
diff --git a/src/ui/render/GeometryRenderObject.cpp b/src/ui/render/GeometryRenderObject.cpp
index b311665f..9b4eb572 100644
--- a/src/ui/render/GeometryRenderObject.cpp
+++ b/src/ui/render/GeometryRenderObject.cpp
@@ -105,9 +105,5 @@ Size GeometryRenderObject::OnMeasureContent(
   return requirement.Coerce(result);
 }
 
-Size GeometryRenderObject::OnMeasureContent1(const BoxConstraint& constraint) {
-  return constraint.Coerce(GetViewPort().GetSize());
-}
-
 void GeometryRenderObject::OnLayoutContent(const Rect& content_rect) {}
 }  // namespace cru::ui::render
diff --git a/src/ui/render/RenderObject.cpp b/src/ui/render/RenderObject.cpp
index 8bd85784..9081d553 100644
--- a/src/ui/render/RenderObject.cpp
+++ b/src/ui/render/RenderObject.cpp
@@ -9,7 +9,8 @@
 namespace cru::ui::render {
 const BoxConstraint BoxConstraint::kNotLimit{Size::kMax, Size::kZero};
 
-RenderObject::RenderObject(std::string name) : name_(std::move(name)) {}
+RenderObject::RenderObject(std::string name)
+    : name_(std::move(name)), control_(nullptr), parent_(nullptr) {}
 
 RenderObject::~RenderObject() { DestroyEvent_.Raise(this); }
 
@@ -77,42 +78,6 @@ void RenderObject::SetMaxSize(const MeasureSize& max_size) {
   InvalidateLayout();
 }
 
-void RenderObject::SetMinSize1(const Size& min_size) {
-  min_size_ = min_size;
-  InvalidateLayout();
-}
-
-void RenderObject::SetMaxSize1(const Size& max_size) {
-  max_size_ = max_size;
-  InvalidateLayout();
-}
-
-BoxConstraint RenderObject::CalculateMergedConstraint(
-    const BoxConstraint& constraint) {
-  auto result = constraint;
-  if (max_size_.width >= constraint.min.width &&
-      max_size_.width < constraint.max.width) {
-    result.max.width = max_size_.width;
-  }
-
-  if (max_size_.height >= constraint.min.height &&
-      max_size_.height < constraint.max.height) {
-    result.max.height = max_size_.height;
-  }
-
-  if (min_size_.width <= constraint.max.width &&
-      min_size_.width > constraint.min.width) {
-    result.min.width = min_size_.width;
-  }
-
-  if (min_size_.height <= constraint.max.height &&
-      min_size_.height > constraint.min.height) {
-    result.min.height = min_size_.height;
-  }
-
-  return result;
-}
-
 void RenderObject::Measure(const MeasureRequirement& requirement,
                            const MeasureSize& preferred_size) {
   MeasureRequirement merged_requirement =
@@ -139,13 +104,6 @@ void RenderObject::Measure(const MeasureRequirement& requirement,
   Ensures(desired_size_.height >= 0);
 }
 
-Size RenderObject::Measure1(const BoxConstraint& constraint) {
-  Expects(constraint.Validate());
-  desired_size_ = OnMeasureCore1(constraint);
-  Ensures(constraint.Satisfy(desired_size_));
-  return desired_size_;
-}
-
 void RenderObject::Layout(const Point& offset) {
   if constexpr (cru::ui::debug_flags::layout) {
     CRU_LOG_TAG_DEBUG("{} Layout :\noffset: {} size: {}",
@@ -185,33 +143,6 @@ Size RenderObject::OnMeasureCore(const MeasureRequirement& requirement,
   return space_size + content_size;
 }
 
-Size RenderObject::OnMeasureCore1(const BoxConstraint& constraint) {
-  auto merged_constraint = CalculateMergedConstraint(constraint);
-
-  const Thickness outer_space = GetTotalSpaceThickness();
-  Size space_size{outer_space.GetHorizontalTotal(),
-                  outer_space.GetVerticalTotal()};
-
-  if (space_size.width > merged_constraint.max.width) {
-    space_size.width = merged_constraint.max.width;
-    CRU_LOG_TAG_WARN("{} space width is over constraint.max.width",
-                     this->GetDebugPathInTree());
-  }
-
-  if (space_size.height > merged_constraint.max.height) {
-    space_size.height = merged_constraint.max.height;
-    CRU_LOG_TAG_WARN("{} space height is over constraint.max.height",
-                     this->GetDebugPathInTree());
-  }
-
-  BoxConstraint content_constraint{merged_constraint.max - space_size,
-                                   merged_constraint.min - space_size};
-
-  const auto content_size = OnMeasureContent1(content_constraint);
-
-  return space_size + content_size;
-}
-
 void RenderObject::OnLayoutCore() {
   Size total_size = GetDesiredSize();
   const Thickness outer_space = GetTotalSpaceThickness();
@@ -240,10 +171,6 @@ void RenderObject::OnLayoutCore() {
   OnLayoutContent(content_rect);
 }
 
-Size RenderObject::OnMeasureContent1(const BoxConstraint& constraint) {
-  throw Exception("Not implemented.");
-}
-
 Rect RenderObject::GetPaddingRect() {
   const auto size = GetDesiredSize();
   Rect rect{Point{}, size};
diff --git a/src/ui/render/ScrollRenderObject.cpp b/src/ui/render/ScrollRenderObject.cpp
index 49cb6bf3..d3e00db1 100644
--- a/src/ui/render/ScrollRenderObject.cpp
+++ b/src/ui/render/ScrollRenderObject.cpp
@@ -189,13 +189,6 @@ Size ScrollRenderObject::OnMeasureContent(const MeasureRequirement& requirement,
   }
 }
 
-Size ScrollRenderObject::OnMeasureContent1(const BoxConstraint& constraint) {
-  auto child = GetChild();
-  if (child == nullptr) return constraint.min;
-  auto child_size = child->Measure1(BoxConstraint::kNotLimit);
-  return constraint.Coerce(child_size);
-}
-
 void ScrollRenderObject::OnLayoutContent(const Rect& content_rect) {
   if (auto child = GetChild()) {
     child->Layout(content_rect.GetLeftTop() - GetScrollOffset());
diff --git a/src/ui/render/TextRenderObject.cpp b/src/ui/render/TextRenderObject.cpp
index 3af08e49..b9ab8dd9 100644
--- a/src/ui/render/TextRenderObject.cpp
+++ b/src/ui/render/TextRenderObject.cpp
@@ -226,17 +226,6 @@ Size TextRenderObject::OnMeasureContent(const MeasureRequirement& requirement,
   return result;
 }
 
-Size TextRenderObject::OnMeasureContent1(const BoxConstraint& constraint) {
-  text_layout_->SetMaxWidth(constraint.max.width);
-  text_layout_->SetMaxHeight(std::numeric_limits<float>::max());
-
-  const Size text_size(
-      text_layout_->GetTextBounds(is_measure_including_trailing_space_)
-          .GetRightBottom());
-
-  return constraint.Coerce(text_size);
-}
-
 void TextRenderObject::OnLayoutContent(const Rect& content_rect) {
   CRU_UNUSED(content_rect)
 }