Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions lib/web_ui/lib/src/engine/compositor/canvas.dart
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class SkCanvas {
startAngle * toDegrees,
sweepAngle * toDegrees,
useCenter,
paint.makeSkPaint(),
paint.skiaObject,
]);
}

Expand All @@ -80,7 +80,7 @@ class SkCanvas {
skAtlas.skImage,
rects,
rstTransforms,
paint.makeSkPaint(),
paint.skiaObject,
makeSkBlendMode(blendMode),
colors,
]);
Expand All @@ -91,7 +91,7 @@ class SkCanvas {
c.dx,
c.dy,
radius,
paint.makeSkPaint(),
paint.skiaObject,
]);
}

Expand All @@ -106,7 +106,7 @@ class SkCanvas {
skCanvas.callMethod('drawDRRect', <js.JsObject>[
makeSkRRect(outer),
makeSkRRect(inner),
paint.makeSkPaint(),
paint.skiaObject,
]);
}

Expand All @@ -116,7 +116,7 @@ class SkCanvas {
skImage.skImage,
offset.dx,
offset.dy,
paint.makeSkPaint(),
paint.skiaObject,
]);
}

Expand All @@ -126,7 +126,7 @@ class SkCanvas {
skImage.skImage,
makeSkRect(src),
makeSkRect(dst),
paint.makeSkPaint(),
paint.skiaObject,
false,
]);
}
Expand All @@ -138,7 +138,7 @@ class SkCanvas {
skImage.skImage,
makeSkRect(center),
makeSkRect(dst),
paint.makeSkPaint(),
paint.skiaObject,
]);
}

Expand All @@ -148,19 +148,19 @@ class SkCanvas {
p1.dy,
p2.dx,
p2.dy,
paint.makeSkPaint(),
paint.skiaObject,
]);
}

void drawOval(ui.Rect rect, SkPaint paint) {
skCanvas.callMethod('drawOval', <js.JsObject>[
makeSkRect(rect),
paint.makeSkPaint(),
paint.skiaObject,
]);
}

void drawPaint(SkPaint paint) {
skCanvas.callMethod('drawPaint', <js.JsObject>[paint.makeSkPaint()]);
skCanvas.callMethod('drawPaint', <js.JsObject>[paint.skiaObject]);
}

void drawParagraph(ui.Paragraph paragraph, ui.Offset offset) {
Expand All @@ -173,7 +173,7 @@ class SkCanvas {
}

void drawPath(ui.Path path, SkPaint paint) {
final js.JsObject skPaint = paint.makeSkPaint();
final js.JsObject skPaint = paint.skiaObject;
final SkPath enginePath = path;
final js.JsObject skPath = enginePath._skPath;
skCanvas.callMethod('drawPath', <js.JsObject>[skPath, skPaint]);
Expand All @@ -188,20 +188,20 @@ class SkCanvas {
skCanvas.callMethod('drawPoints', <dynamic>[
makeSkPointMode(pointMode),
points,
paint.makeSkPaint(),
paint.skiaObject,
]);
}

void drawRRect(ui.RRect rrect, SkPaint paint) {
skCanvas.callMethod('drawRRect', <js.JsObject>[
makeSkRRect(rrect),
paint.makeSkPaint(),
paint.skiaObject,
]);
}

void drawRect(ui.Rect rect, SkPaint paint) {
final js.JsObject skRect = makeSkRect(rect);
final js.JsObject skPaint = paint.makeSkPaint();
final js.JsObject skPaint = paint.skiaObject;
skCanvas.callMethod('drawRect', <js.JsObject>[skRect, skPaint]);
}

Expand All @@ -217,7 +217,7 @@ class SkCanvas {
skCanvas.callMethod('drawVertices', <js.JsObject>[
skVertices.skVertices,
makeSkBlendMode(blendMode),
paint.makeSkPaint()
paint.skiaObject
]);
}

Expand All @@ -241,12 +241,12 @@ class SkCanvas {
void saveLayer(ui.Rect bounds, SkPaint paint) {
skCanvas.callMethod('saveLayer', <js.JsObject>[
makeSkRect(bounds),
paint.makeSkPaint(),
paint.skiaObject,
]);
}

void saveLayerWithoutBounds(SkPaint paint) {
skCanvas.callMethod('saveLayer', <js.JsObject>[null, paint.makeSkPaint()]);
skCanvas.callMethod('saveLayer', <js.JsObject>[null, paint.skiaObject]);
}

void saveLayerWithFilter(ui.Rect bounds, ui.ImageFilter filter) {
Expand Down
Loading