aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/canvas/canvas_paint_task.rs15
-rw-r--r--components/script/dom/canvasrenderingcontext2d.rs4
-rw-r--r--components/script/dom/webidls/CanvasRenderingContext2D.webidl2
-rw-r--r--components/servo/Cargo.lock2
-rw-r--r--ports/cef/Cargo.lock2
-rw-r--r--ports/gonk/Cargo.lock2
-rw-r--r--tests/wpt/metadata/2dcontext/line-styles/2d.line.cap.butt.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/line-styles/2d.line.cap.closed.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/line-styles/2d.line.cross.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/line-styles/2d.line.join.open.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/line-styles/2d.line.miter.exceeded.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/line-styles/2d.line.miter.rightangle.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/line-styles/2d.line.width.scaledefault.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.empty.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.end.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.nonempty.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.selfintersect.1.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.shape.1.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.shape.3.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.shape.5.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.twopie.1.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.zero.1.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.zero.2.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.zeroradius.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.bezierCurveTo.basic.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.bezierCurveTo.scaled.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.closePath.newline.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.closePath.nextpoint.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.lineTo.basic.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.lineTo.ensuresubpath.1.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.lineTo.ensuresubpath.2.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.lineTo.nextpoint.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.moveTo.multiple.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.quadraticCurveTo.basic.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.quadraticCurveTo.scaled.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.stroke.empty.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.stroke.prune.closed.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.stroke.prune.corner.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.stroke.prune.curve.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/path-objects/2d.path.stroke.prune.line.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/shadows/2d.shadow.stroke.cap.1.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/shadows/2d.shadow.stroke.join.1.html.ini5
-rw-r--r--tests/wpt/metadata/2dcontext/shadows/2d.shadow.stroke.join.3.html.ini5
-rw-r--r--tests/wpt/metadata/html/dom/interfaces.html.ini9
46 files changed, 23 insertions, 208 deletions
diff --git a/components/canvas/canvas_paint_task.rs b/components/canvas/canvas_paint_task.rs
index 443f70bfcc6..522f5104aa3 100644
--- a/components/canvas/canvas_paint_task.rs
+++ b/components/canvas/canvas_paint_task.rs
@@ -26,6 +26,7 @@ pub enum CanvasMsg {
BeginPath,
ClosePath,
Fill,
+ Stroke,
DrawImage(Vec<u8>, Rect<i32>, Rect<i32>, bool),
DrawImageSelf(Size2D<i32>, Rect<i32>, Rect<i32>, bool),
MoveTo(Point2D<f32>),
@@ -211,6 +212,7 @@ impl<'a> CanvasPaintTask<'a> {
CanvasMsg::BeginPath => painter.begin_path(),
CanvasMsg::ClosePath => painter.close_path(),
CanvasMsg::Fill => painter.fill(),
+ CanvasMsg::Stroke => painter.stroke(),
CanvasMsg::DrawImage(imagedata, dest_rect, source_rect, smoothing_enabled) => {
painter.draw_image(imagedata, dest_rect, source_rect, smoothing_enabled)
}
@@ -284,6 +286,19 @@ impl<'a> CanvasPaintTask<'a> {
};
}
+ fn stroke(&self) {
+ let draw_options = DrawOptions::new(1.0, 0);
+ match self.stroke_style {
+ Pattern::Color(ref color) => {
+ self.drawtarget.stroke(&self.path_builder.finish(),
+ color, &self.stroke_opts, &draw_options);
+ }
+ _ => {
+ // TODO
+ }
+ };
+ }
+
fn draw_image(&self, imagedata: Vec<u8>, dest_rect: Rect<i32>,
source_rect: Rect<i32>, smoothing_enabled: bool) {
self.write_image(imagedata, source_rect, dest_rect, smoothing_enabled);
diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs
index 37108922fc5..6a3689e1459 100644
--- a/components/script/dom/canvasrenderingcontext2d.rs
+++ b/components/script/dom/canvasrenderingcontext2d.rs
@@ -311,6 +311,10 @@ impl<'a> CanvasRenderingContext2DMethods for JSRef<'a, CanvasRenderingContext2D>
self.renderer.send(CanvasMsg::Fill).unwrap();
}
+ fn Stroke(self) {
+ self.renderer.send(CanvasMsg::Stroke).unwrap();
+ }
+
// https://html.spec.whatwg.org/multipage/scripting.html#dom-context-2d-drawimage
fn DrawImage(self, image: HTMLCanvasElementOrCanvasRenderingContext2D,
dx: f64, dy: f64) -> Fallible<()> {
diff --git a/components/script/dom/webidls/CanvasRenderingContext2D.webidl b/components/script/dom/webidls/CanvasRenderingContext2D.webidl
index 6d686307f46..a3d40dc7c52 100644
--- a/components/script/dom/webidls/CanvasRenderingContext2D.webidl
+++ b/components/script/dom/webidls/CanvasRenderingContext2D.webidl
@@ -82,7 +82,7 @@ interface CanvasRenderingContext2D {
void beginPath();
void fill(optional CanvasWindingRule fillRule = "nonzero");
//void fill(Path2D path, optional CanvasWindingRule fillRule = "nonzero");
- //void stroke();
+ void stroke();
//void stroke(Path2D path);
//void drawSystemFocusRing(Element element);
//void drawSystemFocusRing(Path2D path, Element element);
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 9d422fb0dc1..14ce06919fa 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -31,7 +31,7 @@ source = "git+https://github.com/tomaka/android-rs-glue#5a68056599fb498b0cf3715f
[[package]]
name = "azure"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-azure#110b98c7d39a275513c654644311f26b7eb75580"
+source = "git+https://github.com/servo/rust-azure#9aae2113fb19a34a67a82b7ec6a5e0b34e290d29"
dependencies = [
"core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
"core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index a9b48efe02f..5fbe33e68cd 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -36,7 +36,7 @@ source = "git+https://github.com/tomaka/android-rs-glue#5a68056599fb498b0cf3715f
[[package]]
name = "azure"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-azure#110b98c7d39a275513c654644311f26b7eb75580"
+source = "git+https://github.com/servo/rust-azure#9aae2113fb19a34a67a82b7ec6a5e0b34e290d29"
dependencies = [
"core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
"core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index 7dcc0a6d7b9..8506d0a0728 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -23,7 +23,7 @@ dependencies = [
[[package]]
name = "azure"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-azure#110b98c7d39a275513c654644311f26b7eb75580"
+source = "git+https://github.com/servo/rust-azure#9aae2113fb19a34a67a82b7ec6a5e0b34e290d29"
dependencies = [
"core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
"core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
diff --git a/tests/wpt/metadata/2dcontext/line-styles/2d.line.cap.butt.html.ini b/tests/wpt/metadata/2dcontext/line-styles/2d.line.cap.butt.html.ini
deleted file mode 100644
index 386a0b1cf36..00000000000
--- a/tests/wpt/metadata/2dcontext/line-styles/2d.line.cap.butt.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.line.cap.butt.html]
- type: testharness
- [lineCap \'butt\' is rendered correctly]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/line-styles/2d.line.cap.closed.html.ini b/tests/wpt/metadata/2dcontext/line-styles/2d.line.cap.closed.html.ini
deleted file mode 100644
index 20856efda4e..00000000000
--- a/tests/wpt/metadata/2dcontext/line-styles/2d.line.cap.closed.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.line.cap.closed.html]
- type: testharness
- [Line caps are not drawn at the corners of an unclosed rectangle]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/line-styles/2d.line.cross.html.ini b/tests/wpt/metadata/2dcontext/line-styles/2d.line.cross.html.ini
deleted file mode 100644
index ca2d0b733fd..00000000000
--- a/tests/wpt/metadata/2dcontext/line-styles/2d.line.cross.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.line.cross.html]
- type: testharness
- [Canvas test: 2d.line.cross]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/line-styles/2d.line.join.open.html.ini b/tests/wpt/metadata/2dcontext/line-styles/2d.line.join.open.html.ini
deleted file mode 100644
index 2d03bf89eb5..00000000000
--- a/tests/wpt/metadata/2dcontext/line-styles/2d.line.join.open.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.line.join.open.html]
- type: testharness
- [Line joins are not drawn at the corner of an unclosed rectangle]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/line-styles/2d.line.miter.exceeded.html.ini b/tests/wpt/metadata/2dcontext/line-styles/2d.line.miter.exceeded.html.ini
deleted file mode 100644
index 9bfac57b79b..00000000000
--- a/tests/wpt/metadata/2dcontext/line-styles/2d.line.miter.exceeded.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.line.miter.exceeded.html]
- type: testharness
- [Miter joins are not drawn when the miter limit is exceeded]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/line-styles/2d.line.miter.rightangle.html.ini b/tests/wpt/metadata/2dcontext/line-styles/2d.line.miter.rightangle.html.ini
deleted file mode 100644
index ec3453af662..00000000000
--- a/tests/wpt/metadata/2dcontext/line-styles/2d.line.miter.rightangle.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.line.miter.rightangle.html]
- type: testharness
- [Miter joins are not drawn when the miter limit is exceeded, on exact right angles]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/line-styles/2d.line.width.scaledefault.html.ini b/tests/wpt/metadata/2dcontext/line-styles/2d.line.width.scaledefault.html.ini
deleted file mode 100644
index f5ee638b6a1..00000000000
--- a/tests/wpt/metadata/2dcontext/line-styles/2d.line.width.scaledefault.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.line.width.scaledefault.html]
- type: testharness
- [Default lineWidth strokes are affected by scale transformations]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.empty.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.empty.html.ini
deleted file mode 100644
index 8453ab18b35..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.empty.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.arc.empty.html]
- type: testharness
- [arc() with an empty path does not draw a straight line to the start point]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.end.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.end.html.ini
deleted file mode 100644
index 8aa906851c8..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.end.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.arc.end.html]
- type: testharness
- [arc() adds the end point of the arc to the subpath]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.nonempty.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.nonempty.html.ini
deleted file mode 100644
index 7855f8b17d1..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.nonempty.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.arc.nonempty.html]
- type: testharness
- [arc() with a non-empty path does draw a straight line to the start point]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.selfintersect.1.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.selfintersect.1.html.ini
deleted file mode 100644
index 64fb4beeedc..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.selfintersect.1.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.arc.selfintersect.1.html]
- type: testharness
- [arc() with lineWidth > 2*radius is drawn sensibly]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.shape.1.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.shape.1.html.ini
deleted file mode 100644
index 005cb67064a..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.shape.1.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.arc.shape.1.html]
- type: testharness
- [arc() from 0 to pi does not draw anything in the wrong half]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.shape.3.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.shape.3.html.ini
deleted file mode 100644
index 9b7071262b9..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.shape.3.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.arc.shape.3.html]
- type: testharness
- [arc() from 0 to -pi/2 does not draw anything in the wrong quadrant]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.shape.5.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.shape.5.html.ini
deleted file mode 100644
index 7e2e20baf52..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.shape.5.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.arc.shape.5.html]
- type: testharness
- [arc() from 0 to 5pi does not draw crazy things]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.twopie.1.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.twopie.1.html.ini
deleted file mode 100644
index de2110b0beb..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.twopie.1.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.arc.twopie.1.html]
- type: testharness
- [arc() draws nothing when end = start + 2pi-e and anticlockwise]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.zero.1.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.zero.1.html.ini
deleted file mode 100644
index b0c2394bb03..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.zero.1.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.arc.zero.1.html]
- type: testharness
- [arc() draws nothing when startAngle = endAngle and anticlockwise]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.zero.2.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.zero.2.html.ini
deleted file mode 100644
index 9b1dd1a715b..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.zero.2.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.arc.zero.2.html]
- type: testharness
- [arc() draws nothing when startAngle = endAngle and clockwise]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.zeroradius.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.zeroradius.html.ini
deleted file mode 100644
index c0d7eb76e57..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.arc.zeroradius.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.arc.zeroradius.html]
- type: testharness
- [arc() with zero radius draws a line to the start point]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.bezierCurveTo.basic.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.bezierCurveTo.basic.html.ini
deleted file mode 100644
index 51f7febafc4..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.bezierCurveTo.basic.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.bezierCurveTo.basic.html]
- type: testharness
- [Canvas test: 2d.path.bezierCurveTo.basic]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html.ini
deleted file mode 100644
index 040e0d40e74..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.bezierCurveTo.ensuresubpath.1.html]
- type: testharness
- [If there is no subpath, the first control point is added (and nothing is drawn up to it)]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.bezierCurveTo.scaled.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.bezierCurveTo.scaled.html.ini
deleted file mode 100644
index 438a372be12..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.bezierCurveTo.scaled.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.bezierCurveTo.scaled.html]
- type: testharness
- [Canvas test: 2d.path.bezierCurveTo.scaled]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.closePath.newline.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.closePath.newline.html.ini
deleted file mode 100644
index 72c6c30fb79..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.closePath.newline.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.closePath.newline.html]
- type: testharness
- [Canvas test: 2d.path.closePath.newline]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.closePath.nextpoint.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.closePath.nextpoint.html.ini
deleted file mode 100644
index b79e0fc4396..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.closePath.nextpoint.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.closePath.nextpoint.html]
- type: testharness
- [Canvas test: 2d.path.closePath.nextpoint]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.lineTo.basic.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.lineTo.basic.html.ini
deleted file mode 100644
index 9ad2b96500c..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.lineTo.basic.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.lineTo.basic.html]
- type: testharness
- [Canvas test: 2d.path.lineTo.basic]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.lineTo.ensuresubpath.1.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.lineTo.ensuresubpath.1.html.ini
deleted file mode 100644
index 7fe70780084..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.lineTo.ensuresubpath.1.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.lineTo.ensuresubpath.1.html]
- type: testharness
- [If there is no subpath, the point is added and nothing is drawn]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.lineTo.ensuresubpath.2.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.lineTo.ensuresubpath.2.html.ini
deleted file mode 100644
index 87c2f5be4b0..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.lineTo.ensuresubpath.2.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.lineTo.ensuresubpath.2.html]
- type: testharness
- [If there is no subpath, the point is added and used for subsequent drawing]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.lineTo.nextpoint.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.lineTo.nextpoint.html.ini
deleted file mode 100644
index 0fdb557edc2..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.lineTo.nextpoint.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.lineTo.nextpoint.html]
- type: testharness
- [Canvas test: 2d.path.lineTo.nextpoint]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.moveTo.multiple.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.moveTo.multiple.html.ini
deleted file mode 100644
index 88ed837c51c..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.moveTo.multiple.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.moveTo.multiple.html]
- type: testharness
- [Canvas test: 2d.path.moveTo.multiple]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.quadraticCurveTo.basic.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.quadraticCurveTo.basic.html.ini
deleted file mode 100644
index d3b625a5d54..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.quadraticCurveTo.basic.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.quadraticCurveTo.basic.html]
- type: testharness
- [Canvas test: 2d.path.quadraticCurveTo.basic]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html.ini
deleted file mode 100644
index 0a1545fe4c2..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.quadraticCurveTo.ensuresubpath.1.html]
- type: testharness
- [If there is no subpath, the first control point is added (and nothing is drawn up to it)]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.quadraticCurveTo.scaled.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.quadraticCurveTo.scaled.html.ini
deleted file mode 100644
index b5866f7763b..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.quadraticCurveTo.scaled.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.quadraticCurveTo.scaled.html]
- type: testharness
- [Canvas test: 2d.path.quadraticCurveTo.scaled]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.stroke.empty.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.stroke.empty.html.ini
deleted file mode 100644
index 0582bcd1000..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.stroke.empty.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.stroke.empty.html]
- type: testharness
- [Empty subpaths are not stroked]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.stroke.prune.closed.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.stroke.prune.closed.html.ini
deleted file mode 100644
index e725f778232..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.stroke.prune.closed.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.stroke.prune.closed.html]
- type: testharness
- [Zero-length line segments from closed paths are removed before stroking]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.stroke.prune.corner.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.stroke.prune.corner.html.ini
deleted file mode 100644
index 42da280f6e4..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.stroke.prune.corner.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.stroke.prune.corner.html]
- type: testharness
- [Zero-length line segments are removed before stroking with miters]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.stroke.prune.curve.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.stroke.prune.curve.html.ini
deleted file mode 100644
index 8c0ce9d70c1..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.stroke.prune.curve.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.stroke.prune.curve.html]
- type: testharness
- [Zero-length line segments from quadraticCurveTo and bezierCurveTo are removed before stroking]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.stroke.prune.line.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.stroke.prune.line.html.ini
deleted file mode 100644
index 5a56734aad4..00000000000
--- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.stroke.prune.line.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.path.stroke.prune.line.html]
- type: testharness
- [Zero-length line segments from lineTo are removed before stroking]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/shadows/2d.shadow.stroke.cap.1.html.ini b/tests/wpt/metadata/2dcontext/shadows/2d.shadow.stroke.cap.1.html.ini
deleted file mode 100644
index eae9eb9866b..00000000000
--- a/tests/wpt/metadata/2dcontext/shadows/2d.shadow.stroke.cap.1.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.shadow.stroke.cap.1.html]
- type: testharness
- [Shadows are not drawn for areas outside stroke caps]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/shadows/2d.shadow.stroke.join.1.html.ini b/tests/wpt/metadata/2dcontext/shadows/2d.shadow.stroke.join.1.html.ini
deleted file mode 100644
index 252b5d3ac0e..00000000000
--- a/tests/wpt/metadata/2dcontext/shadows/2d.shadow.stroke.join.1.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.shadow.stroke.join.1.html]
- type: testharness
- [Shadows are not drawn for areas outside stroke joins]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/shadows/2d.shadow.stroke.join.3.html.ini b/tests/wpt/metadata/2dcontext/shadows/2d.shadow.stroke.join.3.html.ini
deleted file mode 100644
index c0560c8aaba..00000000000
--- a/tests/wpt/metadata/2dcontext/shadows/2d.shadow.stroke.join.3.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.shadow.stroke.join.3.html]
- type: testharness
- [Shadows are drawn for stroke joins respecting miter limit]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini
index 58fb1ddc17c..d1d1be10cf3 100644
--- a/tests/wpt/metadata/html/dom/interfaces.html.ini
+++ b/tests/wpt/metadata/html/dom/interfaces.html.ini
@@ -6993,9 +6993,6 @@
[CanvasRenderingContext2D interface: operation fill(CanvasFillRule)]
expected: FAIL
- [CanvasRenderingContext2D interface: operation stroke()]
- expected: FAIL
-
[CanvasRenderingContext2D interface: operation stroke(Path2D)]
expected: FAIL
@@ -7173,12 +7170,6 @@
[CanvasRenderingContext2D interface: calling fill(Path2D,CanvasFillRule) 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 "stroke" with the proper type (31)]
- expected: FAIL
-
- [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "stroke" with the proper type (32)]
- expected: FAIL
-
[CanvasRenderingContext2D interface: calling stroke(Path2D) on document.createElement("canvas").getContext("2d") with too few arguments must throw TypeError]
expected: FAIL