feat(canvas): add rect() and ellipse()

Author: yorkie

src/client/canvas/rendering_context2d-inl.hpp

@@ -447,6 +447,27 @@ namespace canvas
     skPaint->setBlendMode(globalCompositeOperation);
   }
 
+  template <typename CanvasType>
+  void CanvasRenderingContext2D<CanvasType>::rect(float x, float y, float width, float height)
+  {
+    if (currentPath == nullptr)
+      return;
+    currentPath->addRect(SkRect::MakeXYWH(x, y, width, height));
+  }
+
+  template <typename CanvasType>
+  void CanvasRenderingContext2D<CanvasType>::ellipse(float x,
+                                                     float y,
+                                                     float radiusX,
+                                                     float radiusY,
+                                                     float rotation,
+                                                     float startAngle,
+                                                     float endAngle,
+                                                     bool ccw)
+  {
+    ellipseToSkPath(currentPath, x, y, radiusX, radiusY, rotation, startAngle, endAngle, ccw);
+  }
+
   template <typename CanvasType>
   const std::vector<float> &CanvasRenderingContext2D<CanvasType>::getLineDash()
   {

src/client/canvas/rendering_context2d.hpp

@@ -78,6 +78,17 @@ namespace canvas
     void stroke();
     void strokeRect(float x, float y, float width, float height);
     void clearRect(float x, float y, float width, float height);
+
+    void rect(float x, float y, float width, float height);
+    void ellipse(float x,
+                 float y,
+                 float radiusX,
+                 float radiusY,
+                 float rotation,
+                 float startAngle,
+                 float endAngle,
+                 bool ccw = false);
+
     const std::vector<float> &getLineDash();
     void setLineDash(const std::vector<float> &segments);
     void beginPath();

src/client/script_bindings/canvas/canvas_rendering_context_2d-inl.hpp

@@ -381,13 +381,36 @@ namespace script_bindings::canvas_bindings
     args.GetReturnValue().SetUndefined();
   }
 
+  template <typename T, typename CanvasType>
+  void CanvasRenderingContext2DBase<T, CanvasType>::Rect(const v8::FunctionCallbackInfo<v8::Value> &args)
+  {
+    v8::Isolate *isolate = args.GetIsolate();
+    v8::HandleScope scope(isolate);
+
+    if (args.Length() < 4)
+    {
+      isolate->ThrowException(v8::Exception::TypeError(
+        T::MakeMethodArgCountError(isolate, "rect", 4, args.Length())));
+      return;
+    }
+
+    v8::Local<v8::Context> context = isolate->GetCurrentContext();
+    auto x = args[0]->ToNumber(context).ToLocalChecked()->Value();
+    auto y = args[1]->ToNumber(context).ToLocalChecked()->Value();
+    auto width = args[2]->ToNumber(context).ToLocalChecked()->Value();
+    auto height = args[3]->ToNumber(context).ToLocalChecked()->Value();
+
+    this->handle()->rect(x, y, width, height);
+    args.GetReturnValue().SetUndefined();
+  }
+
   template <typename T, typename CanvasType>
   void CanvasRenderingContext2DBase<T, CanvasType>::Ellipse(const v8::FunctionCallbackInfo<v8::Value> &args)
   {
     v8::Isolate *isolate = args.GetIsolate();
     v8::HandleScope scope(isolate);
 
-    if (args.Length() < 8)
+    if (args.Length() < 7)
     {
       isolate->ThrowException(v8::Exception::TypeError(
         T::MakeMethodArgCountError(isolate, "ellipse", 8, args.Length())));
@@ -404,14 +427,12 @@ namespace script_bindings::canvas_bindings
     auto endAngle = args[6]->ToNumber(context).ToLocalChecked()->Value();
     bool anticlockwise = false;
 
-    if (args.Length() > 7 && args[7]->IsBoolean())
+    if (args.Length() > 7)
     {
       anticlockwise = args[7]->ToBoolean(isolate)->Value();
     }
 
-    // this->handle()->ellipse(x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise);
-    isolate->ThrowException(v8::Exception::Error(
-      T::MakeMethodError(isolate, "ellipse", "Not implemented")));
+    this->handle()->ellipse(x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise);
     args.GetReturnValue().SetUndefined();
   }
 

src/client/script_bindings/canvas/canvas_rendering_context_2d.hpp

@@ -43,6 +43,7 @@ namespace script_bindings
         T::InstanceMethod(isolate, prototype, "bezierCurveTo", &T::BezierCurveTo);
         T::InstanceMethod(isolate, prototype, "quadraticCurveTo", &T::QuadraticCurveTo);
         T::InstanceMethod(isolate, prototype, "arc", &T::Arc);
+        T::InstanceMethod(isolate, prototype, "rect", &T::Rect);
         T::InstanceMethod(isolate, prototype, "ellipse", &T::Ellipse);
 
         // Drawing paths
@@ -133,8 +134,8 @@ namespace script_bindings
       void QuadraticCurveTo(const v8::FunctionCallbackInfo<v8::Value> &info);
       void Arc(const v8::FunctionCallbackInfo<v8::Value> &info);
       void ArcTo(const v8::FunctionCallbackInfo<v8::Value> &info);
-      void Ellipse(const v8::FunctionCallbackInfo<v8::Value> &info);
       void Rect(const v8::FunctionCallbackInfo<v8::Value> &info);
+      void Ellipse(const v8::FunctionCallbackInfo<v8::Value> &info);
 
       // Drawing path methods
       void Fill(const v8::FunctionCallbackInfo<v8::Value> &info);