From 0b7a43da6b367ec3b03dbbd1fd8d7b3089a99b94 Mon Sep 17 00:00:00 2001 From: Alan Jeffrey Date: Wed, 5 Jul 2017 13:33:21 -0500 Subject: [PATCH] Clear canvas thread state on recreation. --- components/canvas/canvas_paint_thread.rs | 2 ++ .../meta/mozilla/css-paint-api/paint2d-composite.html.ini | 4 ---- .../meta/mozilla/css-paint-api/paint2d-shadows.html.ini | 4 ---- 3 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 tests/wpt/mozilla/meta/mozilla/css-paint-api/paint2d-composite.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/css-paint-api/paint2d-shadows.html.ini diff --git a/components/canvas/canvas_paint_thread.rs b/components/canvas/canvas_paint_thread.rs index 68cb96cd685..344e7d18430 100644 --- a/components/canvas/canvas_paint_thread.rs +++ b/components/canvas/canvas_paint_thread.rs @@ -544,6 +544,8 @@ impl<'a> CanvasPaintThread<'a> { fn recreate(&mut self, size: Size2D) { self.drawtarget = CanvasPaintThread::create(size); + self.state = CanvasPaintState::new(self.state.draw_options.antialias == AntialiasMode::Default); + self.saved_states.clear(); // Webrender doesn't let images change size, so we clear the webrender image key. if let Some(image_key) = self.image_key.take() { self.webrender_api.delete_image(image_key); diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/paint2d-composite.html.ini b/tests/wpt/mozilla/meta/mozilla/css-paint-api/paint2d-composite.html.ini deleted file mode 100644 index 53c2cefbe3d..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/paint2d-composite.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[paint2d-composite.html] - type: reftest - expected: FAIL - bug: https://github.com/servo/servo/issues/17533 diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/paint2d-shadows.html.ini b/tests/wpt/mozilla/meta/mozilla/css-paint-api/paint2d-shadows.html.ini deleted file mode 100644 index 081185efd6f..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/paint2d-shadows.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[paint2d-shadows.html] - type: reftest - expected: FAIL - bug: https://github.com/servo/servo/issues/17533