1 files changed, 8 insertions, 8 deletions
diff --git a/src/ui/render/border_render_object.cpp b/src/ui/render/border_render_object.cpp
index 541be473..99c2cb4c 100644
--- a/src/ui/render/border_render_object.cpp
+++ b/src/ui/render/border_render_object.cpp
@@ -3,20 +3,20 @@
 #include "cru/platform/debug.hpp"
 #include "cru/platform/graph/geometry.hpp"
 #include "cru/platform/graph/graph_factory.hpp"
-#include "cru/platform/graph/painter_util.hpp"
+#include "cru/platform/graph/util/painter_util.hpp"
 
 #include <algorithm>
 #include <cassert>
 
 namespace cru::ui::render {
 BorderRenderObject::BorderRenderObject(
-    std::shared_ptr<platform::graph::Brush> brush) {
+    std::shared_ptr<platform::graph::IBrush> brush) {
   assert(brush);
   this->border_brush_ = std::move(brush);
   RecreateGeometry();
 }
 
-void BorderRenderObject::Draw(platform::graph::Painter* painter) {
+void BorderRenderObject::Draw(platform::graph::IPainter* painter) {
   painter->FillGeometry(geometry_.get(), border_brush_.get());
   if (const auto child = GetChild()) {
     auto offset = child->GetOffset();
@@ -154,7 +154,7 @@ void BorderRenderObject::RecreateGeometry() {
   geometry_.reset();
   border_outer_geometry_.reset();
 
-  auto f = [](platform::graph::GeometryBuilder* builder, const Rect& rect,
+  auto f = [](platform::graph::IGeometryBuilder* builder, const Rect& rect,
               const CornerRadius& corner) {
     builder->BeginFigure(Point(rect.left + corner.left_top.x, rect.top));
     builder->LineTo(Point(rect.GetRight() - corner.right_top.x, rect.top));
@@ -181,18 +181,18 @@ void BorderRenderObject::RecreateGeometry() {
   const Rect outer_rect{margin.left, margin.top,
                         size.width - margin.GetHorizontalTotal(),
                         size.height - margin.GetVerticalTotal()};
-  const auto graph_factory = platform::graph::GraphFactory::GetInstance();
-  std::unique_ptr<platform::graph::GeometryBuilder> builder{
+  const auto graph_factory = platform::graph::IGraphFactory::GetInstance();
+  std::unique_ptr<platform::graph::IGeometryBuilder> builder{
       graph_factory->CreateGeometryBuilder()};
   f(builder.get(), outer_rect, corner_radius_);
-  border_outer_geometry_.reset(builder->Build());
+  border_outer_geometry_.reset(builder->End());
   builder.reset();
 
   const Rect inner_rect = outer_rect.Shrink(border_thickness_);
   builder.reset(graph_factory->CreateGeometryBuilder());
   f(builder.get(), outer_rect, corner_radius_);
   f(builder.get(), inner_rect, corner_radius_);
-  geometry_.reset(builder->Build());
+  geometry_.reset(builder->End());
   builder.reset();
 }
 }  // namespace cru::ui::render