5 files changed, 28 insertions, 28 deletions
diff --git a/include/cru/ui/render/border_render_object.hpp b/include/cru/ui/render/border_render_object.hpp
index 35b98948..44382c63 100644
--- a/include/cru/ui/render/border_render_object.hpp
+++ b/include/cru/ui/render/border_render_object.hpp
@@ -3,7 +3,7 @@
 
 #include <memory>
 
-namespace cru::platform {
+namespace cru::platform::graph {
 struct Brush;
 struct Geometry;
 }  // namespace cru::platform
@@ -32,7 +32,7 @@ struct CornerRadius {
 
 class BorderRenderObject : public RenderObject {
  public:
-  explicit BorderRenderObject(std::shared_ptr<platform::Brush> brush);
+  explicit BorderRenderObject(std::shared_ptr<platform::graph::Brush> brush);
   BorderRenderObject(const BorderRenderObject& other) = delete;
   BorderRenderObject(BorderRenderObject&& other) = delete;
   BorderRenderObject& operator=(const BorderRenderObject& other) = delete;
@@ -42,8 +42,8 @@ class BorderRenderObject : public RenderObject {
   bool IsEnabled() const { return is_enabled_; }
   void SetEnabled(bool enabled) { is_enabled_ = enabled; }
 
-  std::shared_ptr<platform::Brush> GetBrush() const { return border_brush_; }
-  void SetBrush(std::shared_ptr<platform::Brush> new_brush) {
+  std::shared_ptr<platform::graph::Brush> GetBrush() const { return border_brush_; }
+  void SetBrush(std::shared_ptr<platform::graph::Brush> new_brush) {
     border_brush_ = std::move(new_brush);
   }
 
@@ -59,7 +59,7 @@ class BorderRenderObject : public RenderObject {
 
   void Refresh() { RecreateGeometry(); }
 
-  void Draw(platform::Painter* painter) override;
+  void Draw(platform::graph::Painter* painter) override;
 
   RenderObject* HitTest(const Point& point) override;
 
@@ -83,11 +83,11 @@ class BorderRenderObject : public RenderObject {
  private:
   bool is_enabled_ = false;
 
-  std::shared_ptr<platform::Brush> border_brush_ = nullptr;
+  std::shared_ptr<platform::graph::Brush> border_brush_ = nullptr;
   Thickness border_thickness_{};
   CornerRadius corner_radius_{};
 
-  std::shared_ptr<platform::Geometry> geometry_ = nullptr;
-  std::shared_ptr<platform::Geometry> border_outer_geometry_ = nullptr;
+  std::shared_ptr<platform::graph::Geometry> geometry_ = nullptr;
+  std::shared_ptr<platform::graph::Geometry> border_outer_geometry_ = nullptr;
 };
 }  // namespace cru::ui::render
diff --git a/include/cru/ui/render/flex_layout_render_object.hpp b/include/cru/ui/render/flex_layout_render_object.hpp
index 278bf8c2..d225e679 100644
--- a/include/cru/ui/render/flex_layout_render_object.hpp
+++ b/include/cru/ui/render/flex_layout_render_object.hpp
@@ -38,7 +38,7 @@ class FlexLayoutRenderObject : public RenderObject {
 
   FlexChildLayoutData* GetChildLayoutData(int position);
 
-  void Draw(platform::Painter* painter) override;
+  void Draw(platform::graph::Painter* painter) override;
 
   RenderObject* HitTest(const Point& point) override;
 
diff --git a/include/cru/ui/render/render_object.hpp b/include/cru/ui/render/render_object.hpp
index 3cd14a6a..7f5f7ac6 100644
--- a/include/cru/ui/render/render_object.hpp
+++ b/include/cru/ui/render/render_object.hpp
@@ -10,7 +10,7 @@ namespace cru::ui {
 class Control;
 }
 
-namespace cru::platform {
+namespace cru::platform::graph {
 struct Painter;
 }
 
@@ -58,7 +58,7 @@ class RenderObject : public Object {
   void Measure(const Size& available_size);
   void Layout(const Rect& rect);
 
-  virtual void Draw(platform::Painter* render_target) = 0;
+  virtual void Draw(platform::graph::Painter* painter) = 0;
 
   virtual RenderObject* HitTest(const Point& point) = 0;
 
diff --git a/include/cru/ui/render/text_render_object.hpp b/include/cru/ui/render/text_render_object.hpp
index 527fcd71..9f03551d 100644
--- a/include/cru/ui/render/text_render_object.hpp
+++ b/include/cru/ui/render/text_render_object.hpp
@@ -5,18 +5,18 @@
 #include <string>
 
 // forward declarations
-namespace cru::platform {
+namespace cru::platform::graph {
 struct Brush;
 struct FontDescriptor;
 struct TextLayout;
-}  // namespace cru::platform
+}  // namespace cru::platform::graph
 
 namespace cru::ui::render {
 class TextRenderObject : public RenderObject {
  public:
-  TextRenderObject(std::shared_ptr<platform::Brush> brush,
-                   std::shared_ptr<platform::FontDescriptor> font,
-                   std::shared_ptr<platform::Brush> selection_brush);
+  TextRenderObject(std::shared_ptr<platform::graph::Brush> brush,
+                   std::shared_ptr<platform::graph::FontDescriptor> font,
+                   std::shared_ptr<platform::graph::Brush> selection_brush);
   TextRenderObject(const TextRenderObject& other) = delete;
   TextRenderObject(TextRenderObject&& other) = delete;
   TextRenderObject& operator=(const TextRenderObject& other) = delete;
@@ -26,13 +26,13 @@ class TextRenderObject : public RenderObject {
   std::wstring GetText() const;
   void SetText(std::wstring new_text);
 
-  std::shared_ptr<platform::Brush> GetBrush() const { return brush_; }
-  void SetBrush(std::shared_ptr<platform::Brush> new_brush) {
+  std::shared_ptr<platform::graph::Brush> GetBrush() const { return brush_; }
+  void SetBrush(std::shared_ptr<platform::graph::Brush> new_brush) {
     new_brush.swap(brush_);
   }
 
-  std::shared_ptr<platform::FontDescriptor> GetFont() const;
-  void SetFont(std::shared_ptr<platform::FontDescriptor> font);
+  std::shared_ptr<platform::graph::FontDescriptor> GetFont() const;
+  void SetFont(std::shared_ptr<platform::graph::FontDescriptor> font);
 
   std::optional<TextRange> GetSelectionRange() const {
     return selection_range_;
@@ -41,14 +41,14 @@ class TextRenderObject : public RenderObject {
     selection_range_ = std::move(new_range);
   }
 
-  std::shared_ptr<platform::Brush> GetSelectionBrush() const {
+  std::shared_ptr<platform::graph::Brush> GetSelectionBrush() const {
     return selection_brush_;
   }
-  void SetSelectionBrush(std::shared_ptr<platform::Brush> new_brush) {
+  void SetSelectionBrush(std::shared_ptr<platform::graph::Brush> new_brush) {
     new_brush.swap(selection_brush_);
   }
 
-  void Draw(platform::Painter* painter) override;
+  void Draw(platform::graph::Painter* painter) override;
 
   RenderObject* HitTest(const Point& point) override;
 
@@ -59,11 +59,11 @@ class TextRenderObject : public RenderObject {
   void OnLayoutContent(const Rect& content_rect) override;
 
  private:
-  std::shared_ptr<platform::Brush> brush_;
-  std::shared_ptr<platform::FontDescriptor> font_;
-  std::shared_ptr<platform::TextLayout> text_layout_;
+  std::shared_ptr<platform::graph::Brush> brush_;
+  std::shared_ptr<platform::graph::FontDescriptor> font_;
+  std::shared_ptr<platform::graph::TextLayout> text_layout_;
 
   std::optional<TextRange> selection_range_ = std::nullopt;
-  std::shared_ptr<platform::Brush>  selection_brush_;
+  std::shared_ptr<platform::graph::Brush> selection_brush_;
 };
 }  // namespace cru::ui::render
diff --git a/include/cru/ui/render/window_render_object.hpp b/include/cru/ui/render/window_render_object.hpp
index e0a7c74e..dfeae487 100644
--- a/include/cru/ui/render/window_render_object.hpp
+++ b/include/cru/ui/render/window_render_object.hpp
@@ -17,7 +17,7 @@ class WindowRenderObject : public RenderObject {
 
   void MeasureAndLayout();
 
-  void Draw(platform::Painter* painter) override;
+  void Draw(platform::graph::Painter* painter) override;
 
   RenderObject* HitTest(const Point& point) override;