From ce48a51e997a75be4533051e2bf544358be76486 Mon Sep 17 00:00:00 2001 From: pylbrecht Date: Mon, 6 Jan 2020 19:59:32 +0100 Subject: [PATCH] Ensure subpath for control point in quadratic_curve_to() --- components/canvas/canvas_data.rs | 3 +++ .../2d.path.quadraticCurveTo.ensuresubpath.2.html.ini | 4 ---- .../2d.path.quadraticCurveTo.ensuresubpath.2.html.ini | 4 ---- .../2d.path.quadraticCurveTo.ensuresubpath.2.worker.js.ini | 4 ---- 4 files changed, 3 insertions(+), 12 deletions(-) delete mode 100644 tests/wpt/metadata/2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html.ini delete mode 100644 tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html.ini delete mode 100644 tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.worker.js.ini diff --git a/components/canvas/canvas_data.rs b/components/canvas/canvas_data.rs index 2b993d62bab..7f7e539b102 100644 --- a/components/canvas/canvas_data.rs +++ b/components/canvas/canvas_data.rs @@ -771,6 +771,9 @@ impl<'a> CanvasData<'a> { } pub fn quadratic_curve_to(&mut self, cp: &Point2D, endpoint: &Point2D) { + if self.path_builder().current_point().is_none() { + self.path_builder().move_to(cp); + } self.path_builder().quadratic_curve_to(cp, endpoint); } diff --git a/tests/wpt/metadata/2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html.ini b/tests/wpt/metadata/2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html.ini deleted file mode 100644 index b8ab96e6454..00000000000 --- a/tests/wpt/metadata/2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.quadraticCurveTo.ensuresubpath.2.html] - [If there is no subpath, the first control point is added] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html.ini deleted file mode 100644 index b8ab96e6454..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.quadraticCurveTo.ensuresubpath.2.html] - [If there is no subpath, the first control point is added] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.worker.js.ini deleted file mode 100644 index 9d3f4d72965..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.quadraticCurveTo.ensuresubpath.2.worker.html] - [If there is no subpath, the first control point is added] - expected: FAIL -