1 files changed, 4 insertions, 10 deletions
diff --git a/include/cru/platform/graph/geometry.hpp b/include/cru/platform/graph/geometry.hpp
index 7a7ad8b2..71bf8c73 100644
--- a/include/cru/platform/graph/geometry.hpp
+++ b/include/cru/platform/graph/geometry.hpp
@@ -1,25 +1,19 @@
 #pragma once
 #include "cru/common/base.hpp"
 
+#include "cru/common/endable.hpp"
 #include "cru/common/ui_base.hpp"
 
 namespace cru::platform::graph {
-struct Geometry : virtual Interface {
+struct IGeometry : virtual Interface {
   virtual bool FillContains(const ui::Point& point) = 0;
 };
 
-struct GeometryBuilder : virtual Interface {
-  virtual bool IsValid() = 0;
+struct IGeometryBuilder : virtual Interface, virtual IEndable<IGeometry*> {
   virtual void BeginFigure(const ui::Point& point) = 0;
   virtual void LineTo(const ui::Point& point) = 0;
   virtual void QuadraticBezierTo(const ui::Point& control_point,
                                  const ui::Point& end_point) = 0;
   virtual void CloseFigure(bool close) = 0;
-  virtual Geometry* Build() = 0;
-
-  Geometry* BuildAndDeleteThis() {
-    Build();
-    delete this;
-  }
 };
-}  // namespace cru::platform
+}  // namespace cru::platform::graph