10 files changed, 85 insertions, 14 deletions
diff --git a/src/platform/graphics/CMakeLists.txt b/src/platform/graphics/CMakeLists.txt
index b6362961..1b24c22b 100644
--- a/src/platform/graphics/CMakeLists.txt
+++ b/src/platform/graphics/CMakeLists.txt
@@ -3,6 +3,7 @@ add_library(CruPlatformGraphics
 	Geometry.cpp
 	Image.cpp
 	NullPainter.cpp
+	SvgGeometry.cpp
 )
 target_compile_definitions(CruPlatformGraphics PRIVATE CRU_PLATFORM_GRAPHICS_EXPORT_API)
 target_link_libraries(CruPlatformGraphics PUBLIC CruPlatformBase)
diff --git a/src/platform/graphics/Geometry.cpp b/src/platform/graphics/Geometry.cpp
index 20197153..b6f2a724 100644
--- a/src/platform/graphics/Geometry.cpp
+++ b/src/platform/graphics/Geometry.cpp
@@ -12,6 +12,37 @@ bool IGeometry::StrokeContains(float width, const Point& point) {
   return geometry->FillContains(point);
 }
 
+void IGeometryBuilder::RelativeMoveTo(const Point& offset) {
+  MoveTo(GetCurrentPosition() + offset);
+}
+
+void IGeometryBuilder::RelativeLineTo(const Point& offset) {
+  LineTo(GetCurrentPosition() + offset);
+}
+
+void IGeometryBuilder::RelativeCubicBezierTo(const Point& start_control_offset,
+                                             const Point& end_control_offset,
+                                             const Point& end_offset) {
+  auto current_position = GetCurrentPosition();
+  CubicBezierTo(current_position + start_control_offset,
+                current_position + end_control_offset,
+                current_position + end_offset);
+}
+
+void IGeometryBuilder::RelativeQuadraticBezierTo(const Point& control_offset,
+                                                 const Point& end_offset) {
+  auto current_position = GetCurrentPosition();
+  QuadraticBezierTo(current_position + control_offset,
+                    current_position + end_offset);
+}
+
+void IGeometryBuilder::RelativeArcTo(const Point& radius, float angle,
+                                     bool is_large_arc, bool is_clockwise,
+                                     const Point& end_offset) {
+  ArcTo(radius, angle, is_large_arc, is_clockwise,
+        GetCurrentPosition() + end_offset);
+}
+
 constexpr float PI = 3.14159265358979323846f;
 
 using std::abs;
diff --git a/src/platform/graphics/SvgGeometry.cpp b/src/platform/graphics/SvgGeometry.cpp
new file mode 100644
index 00000000..149c4bb6
--- /dev/null
+++ b/src/platform/graphics/SvgGeometry.cpp
@@ -0,0 +1 @@
+#include "cru/platform/graphics/SvgGeometry.h"
diff --git a/src/platform/graphics/web_canvas/CMakeLists.txt b/src/platform/graphics/web_canvas/CMakeLists.txt
index bbf736e0..d0a1a7d9 100644
--- a/src/platform/graphics/web_canvas/CMakeLists.txt
+++ b/src/platform/graphics/web_canvas/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_library(CruPlatformGraphicsWebCanvas
 	Brush.cpp
 	Factory.cpp
+	Geometry.cpp
 	Painter.cpp
 	Resource.cpp
 	WebCanvasRef.cpp
diff --git a/src/platform/graphics/web_canvas/Geometry.cpp b/src/platform/graphics/web_canvas/Geometry.cpp
new file mode 100644
index 00000000..eb4ce84e
--- /dev/null
+++ b/src/platform/graphics/web_canvas/Geometry.cpp
@@ -0,0 +1,12 @@
+#include "cru/platform/graphics/web_canvas/WebCanvasGeometry.h"
+#include "cru/platform/graphics/web_canvas/WebCanvasGraphicsFactory.h"
+#include "cru/platform/graphics/web_canvas/WebCanvasResource.h"
+#include "cru/platform/web/Js.h"
+
+namespace cru::platform::graphics::web_canvas {
+WebCanvasGeometryBuilder::WebCanvasGeometryBuilder(
+    WebCanvasGraphicsFactory* factory)
+    : WebCanvasResource(factory) {
+  path2d_ = web::js::Construct("Path2D");
+}
+}  // namespace cru::platform::graphics::web_canvas
diff --git a/src/platform/graphics/web_canvas/Painter.cpp b/src/platform/graphics/web_canvas/Painter.cpp
index a78ab9f1..c9184165 100644
--- a/src/platform/graphics/web_canvas/Painter.cpp
+++ b/src/platform/graphics/web_canvas/Painter.cpp
@@ -59,6 +59,29 @@ void WebCanvasPainter::DrawLine(const Point& start, const Point& end,
   context_.call<void>("stroke");
 }
 
+void WebCanvasPainter::StrokeRectangle(const Rect& rectangle, IBrush* brush,
+                                       float width) {
+  SetStrokeStyle(brush, width);
+  context_.call<void>("strokeRect", rectangle.left, rectangle.top,
+                      rectangle.width, rectangle.height);
+}
+
+void WebCanvasPainter::FillRectangle(const Rect& rectangle, IBrush* brush) {
+  SetFillStyle(brush);
+  context_.call<void>("fillRect", rectangle.left, rectangle.top,
+                      rectangle.width, rectangle.height);
+}
+
+void WebCanvasPainter::StrokeEllipse(const Rect& outline_rect, IBrush* brush,
+                                     float width) {
+  SetStrokeStyle(brush);
+  // TODO: Need to use path.
+}
+void WebCanvasPainter::FillEllipse(const Rect& outline_rect, IBrush* brush) {
+  SetFillStyle(brush);
+  // TODO: Need to use path.
+}
+
 void WebCanvasPainter::SetStrokeStyle(IBrush* brush, float width) {
   context_.set("strokeStyle", ConvertBrush(brush)->GetStyle());
   if (width > 0) {
diff --git a/src/platform/graphics/web_canvas/WebCanvasRef.cpp b/src/platform/graphics/web_canvas/WebCanvasRef.cpp
index c4f75626..886131f6 100644
--- a/src/platform/graphics/web_canvas/WebCanvasRef.cpp
+++ b/src/platform/graphics/web_canvas/WebCanvasRef.cpp
@@ -1,5 +1,5 @@
 #include "cru/platform/graphics/web_canvas/WebCanvasRef.h"
-#include "cru/platform/web/JsUtility.h"
+#include "cru/platform/web/Js.h"
 
 #include <cassert>
 #include <utility>
@@ -7,7 +7,7 @@
 namespace cru::platform::graphics::web_canvas {
 WebCanvasRef::WebCanvasRef(emscripten::val canvas_val)
     : val_(std::move(canvas_val)) {
-  assert(web::IsNotNullAndInstanceOf(val_, "HTMLCanvasElement"));
+  assert(web::js::IsNotNullAndInstanceOf(val_, "HTMLCanvasElement"));
 }
 
 int WebCanvasRef::GetWidth() const { return val_["width"].as<int>(); }
diff --git a/src/platform/web/CMakeLists.txt b/src/platform/web/CMakeLists.txt
index 0a9bd6dd..3d11e428 100644
--- a/src/platform/web/CMakeLists.txt
+++ b/src/platform/web/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_library(CruPlatformBaseWeb
-	JsUtility.cpp
+	Js.cpp
 	Resource.cpp
 )
 
diff --git a/src/platform/web/Js.cpp b/src/platform/web/Js.cpp
new file mode 100644
index 00000000..ea8a0d68
--- /dev/null
+++ b/src/platform/web/Js.cpp
@@ -0,0 +1,13 @@
+#include "cru/platform/web/Js.h"
+
+namespace cru::platform::web {
+bool IsNotNullAndInstanceOf(const emscripten::val& value,
+                            const emscripten::val& type) {
+  return !value.isNull() && !type.isNull() && value.instanceof (type);
+}
+
+bool IsNotNullAndInstanceOf(const emscripten::val& value,
+                            const char* global_type) {
+  return IsNotNullAndInstanceOf(value, emscripten::val::global(global_type));
+}
+}  // namespace cru::platform::web
diff --git a/src/platform/web/JsUtility.cpp b/src/platform/web/JsUtility.cpp
deleted file mode 100644
index b426bbda..00000000
--- a/src/platform/web/JsUtility.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "cru/platform/web/JsUtility.h"
-
-namespace cru::platform::web {
-bool IsNotNullAndInstanceOf(const emscripten::val& value, const emscripten::val& type) {
-  return !value.isNull() && !type.isNull() && value.instanceof(type);
-}
-
-bool IsNotNullAndInstanceOf(const emscripten::val& value, const char* global_type) {
-  return IsNotNullAndInstanceOf(value, emscripten::val::global(global_type));
-}
-}