mirror of
https://github.com/servo/servo.git
synced 2025-07-24 15:50:21 +01:00
Canvas: implement rectangle drawing.
This commit is contained in:
Mátyás Mustoha
parent
e4b620ea54
commit
5287cb7fba
34 changed files with 21 additions and 155 deletions
|
|
@ -33,6 +33,7 @@ pub enum Canvas2dMsg {
|
|||
MoveTo(Point2D<f32>),
|
||||
PutImageData(Vec<u8>, Rect<f64>, Option<Rect<f64>>),
|
||||
QuadraticCurveTo(Point2D<f32>, Point2D<f32>),
|
||||
Rect(Rect<f32>),
|
||||
RestoreContext,
|
||||
SaveContext,
|
||||
StrokeRect(Rect<f32>),
|
||||
|
|
|
|||
|
|
@ -220,6 +220,7 @@ impl<'a> CanvasPaintTask<'a> {
|
|||
}
|
||||
Canvas2dMsg::MoveTo(ref point) => painter.move_to(point),
|
||||
Canvas2dMsg::LineTo(ref point) => painter.line_to(point),
|
||||
Canvas2dMsg::Rect(ref rect) => painter.rect(rect),
|
||||
Canvas2dMsg::QuadraticCurveTo(ref cp, ref pt) => {
|
||||
painter.quadratic_curve_to(cp, pt)
|
||||
}
|
||||
|
|
@ -351,6 +352,15 @@ impl<'a> CanvasPaintTask<'a> {
|
|||
self.path_builder.line_to(*point)
|
||||
}
|
||||
|
||||
fn rect(&self, rect: &Rect<f32>) {
|
||||
self.path_builder.move_to(Point2D(rect.origin.x, rect.origin.y));
|
||||
self.path_builder.line_to(Point2D(rect.origin.x + rect.size.width, rect.origin.y));
|
||||
self.path_builder.line_to(Point2D(rect.origin.x + rect.size.width,
|
||||
rect.origin.y + rect.size.height));
|
||||
self.path_builder.line_to(Point2D(rect.origin.x, rect.origin.y + rect.size.height));
|
||||
self.path_builder.close();
|
||||
}
|
||||
|
||||
fn quadratic_curve_to(&self,
|
||||
cp: &Point2D<AzFloat>,
|
||||
endpoint: &Point2D<AzFloat>) {
|
||||
|
|
|
|||
|
|
@ -640,6 +640,15 @@ impl<'a> CanvasRenderingContext2DMethods for JSRef<'a, CanvasRenderingContext2D>
|
|||
self.renderer.send(CanvasMsg::Canvas2d(Canvas2dMsg::LineTo(Point2D(x as f32, y as f32)))).unwrap();
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-context-2d-rect
|
||||
fn Rect(self, x: f64, y: f64, width: f64, height: f64) {
|
||||
if [x, y, width, height].iter().all(|val| val.is_finite()) {
|
||||
let rect = Rect(Point2D(x as f32, y as f32),
|
||||
Size2D(width as f32, height as f32));
|
||||
self.renderer.send(CanvasMsg::Canvas2d(Canvas2dMsg::Rect(rect))).unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-context-2d-quadraticcurveto
|
||||
fn QuadraticCurveTo(self, cpx: f64, cpy: f64, x: f64, y: f64) {
|
||||
if !(cpx.is_finite() && cpy.is_finite() &&
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@ interface CanvasPathMethods {
|
|||
unrestricted double radius);
|
||||
// NOT IMPLEMENTED [LenientFloat] void arcTo(double x1, double y1, double x2, double y2, double radiusX, double radiusY, double rotation);
|
||||
|
||||
//void rect(double x, double y, double w, double h);
|
||||
void rect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
|
||||
|
||||
[Throws]
|
||||
void arc(double x, double y, double radius, double startAngle, double endAngle, optional boolean anticlockwise = false);
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.drawImage.path.html]
|
||||
type: testharness
|
||||
[Canvas test: 2d.drawImage.path]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.clearRect.path.html]
|
||||
type: testharness
|
||||
[clearRect does not affect the current path]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.fillRect.path.html]
|
||||
type: testharness
|
||||
[fillRect does not affect the current path]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.strokeRect.path.html]
|
||||
type: testharness
|
||||
[strokeRect does not affect the current path]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.gradient.interpolate.zerosize.fill.html]
|
||||
type: testharness
|
||||
[Canvas test: 2d.gradient.interpolate.zerosize.fill]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.path.arcTo.shape.curve1.html]
|
||||
type: testharness
|
||||
[arcTo() curves in the right kind of shape]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.path.arcTo.shape.curve2.html]
|
||||
type: testharness
|
||||
[arcTo() curves in the right kind of shape]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.path.beginPath.html]
|
||||
type: testharness
|
||||
[Canvas test: 2d.path.beginPath]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.path.fill.overlap.html]
|
||||
type: testharness
|
||||
[Canvas test: 2d.path.fill.overlap]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.path.moveTo.basic.html]
|
||||
type: testharness
|
||||
[Canvas test: 2d.path.moveTo.basic]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.path.rect.basic.html]
|
||||
type: testharness
|
||||
[Canvas test: 2d.path.rect.basic]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.path.rect.closed.html]
|
||||
type: testharness
|
||||
[Canvas test: 2d.path.rect.closed]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.path.rect.end.1.html]
|
||||
type: testharness
|
||||
[Canvas test: 2d.path.rect.end.1]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.path.rect.end.2.html]
|
||||
type: testharness
|
||||
[Canvas test: 2d.path.rect.end.2]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.path.rect.negative.html]
|
||||
type: testharness
|
||||
[Canvas test: 2d.path.rect.negative]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.path.rect.newsubpath.html]
|
||||
type: testharness
|
||||
[Canvas test: 2d.path.rect.newsubpath]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.path.rect.nonfinite.html]
|
||||
type: testharness
|
||||
[rect() with Infinity/NaN is ignored]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.path.rect.selfintersect.html]
|
||||
type: testharness
|
||||
[Canvas test: 2d.path.rect.selfintersect]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.path.rect.winding.html]
|
||||
type: testharness
|
||||
[Canvas test: 2d.path.rect.winding]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.path.rect.zero.1.html]
|
||||
type: testharness
|
||||
[Canvas test: 2d.path.rect.zero.1]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.path.rect.zero.2.html]
|
||||
type: testharness
|
||||
[Canvas test: 2d.path.rect.zero.2]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.path.rect.zero.3.html]
|
||||
type: testharness
|
||||
[Canvas test: 2d.path.rect.zero.3]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.path.rect.zero.4.html]
|
||||
type: testharness
|
||||
[Canvas test: 2d.path.rect.zero.4]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.path.rect.zero.5.html]
|
||||
type: testharness
|
||||
[Canvas test: 2d.path.rect.zero.5]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.path.rect.zero.6.html]
|
||||
type: testharness
|
||||
[Canvas test: 2d.path.rect.zero.6]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.path.stroke.prune.rect.html]
|
||||
type: testharness
|
||||
[Zero-length line segments from rect and strokeRect are removed before stroking]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.path.transformation.multiple.html]
|
||||
type: testharness
|
||||
[Transformations are applied while building paths, not when drawing]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.imageData.put.path.html]
|
||||
type: testharness
|
||||
[putImageData() does not affect the current path]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[2d.state.saverestore.path.html]
|
||||
type: testharness
|
||||
[save()/restore() does not affect the current path]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -6993,9 +6993,6 @@
|
|||
[CanvasRenderingContext2D interface: operation arcTo(unrestricted double,unrestricted double,unrestricted double,unrestricted double,unrestricted double,unrestricted double,unrestricted double)]
|
||||
expected: FAIL
|
||||
|
||||
[CanvasRenderingContext2D interface: operation rect(unrestricted double,unrestricted double,unrestricted double,unrestricted double)]
|
||||
expected: FAIL
|
||||
|
||||
[CanvasRenderingContext2D interface: operation arc(unrestricted double,unrestricted double,unrestricted double,unrestricted double,unrestricted double,boolean)]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -7191,12 +7188,6 @@
|
|||
[CanvasRenderingContext2D interface: calling arcTo(unrestricted double,unrestricted double,unrestricted double,unrestricted double,unrestricted double,unrestricted double,unrestricted double) on document.createElement("canvas").getContext("2d") with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "rect" with the proper type (77)]
|
||||
expected: FAIL
|
||||
|
||||
[CanvasRenderingContext2D interface: calling rect(unrestricted double,unrestricted double,unrestricted double,unrestricted double) on document.createElement("canvas").getContext("2d") with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "ellipse" with the proper type (79)]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue