From 49820a6797fab5d376c06ff7c7f23b0aa18f5525 Mon Sep 17 00:00:00 2001 From: n0max Date: Sat, 29 Apr 2017 18:06:54 +0200 Subject: [PATCH] Remove IndexSizeError in CanvasRenderingContext2D::drawImage --- components/script/dom/canvasrenderingcontext2d.rs | 4 ++-- .../conformance-requirements/2d.voidreturn.html.ini | 6 ------ .../2d.drawImage.zerosource.html.ini | 5 ----- 3 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 tests/wpt/metadata/2dcontext/conformance-requirements/2d.voidreturn.html.ini delete mode 100644 tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/2d.drawImage.zerosource.html.ini diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs index 432dbe800aa8..a5ec8d233b65 100644 --- a/components/script/dom/canvasrenderingcontext2d.rs +++ b/components/script/dom/canvasrenderingcontext2d.rs @@ -350,7 +350,7 @@ impl CanvasRenderingContext2D { dh); if !is_rect_valid(source_rect) || !is_rect_valid(dest_rect) { - return Err(Error::IndexSize); + return Ok(()); } let smoothing_enabled = self.state.borrow().image_smoothing_enabled; @@ -407,7 +407,7 @@ impl CanvasRenderingContext2D { dh); if !is_rect_valid(source_rect) || !is_rect_valid(dest_rect) { - return Err(Error::IndexSize); + return Ok(()); } let smoothing_enabled = self.state.borrow().image_smoothing_enabled; diff --git a/tests/wpt/metadata/2dcontext/conformance-requirements/2d.voidreturn.html.ini b/tests/wpt/metadata/2dcontext/conformance-requirements/2d.voidreturn.html.ini deleted file mode 100644 index d93a4f9d41f7..000000000000 --- a/tests/wpt/metadata/2dcontext/conformance-requirements/2d.voidreturn.html.ini +++ /dev/null @@ -1,6 +0,0 @@ -[2d.voidreturn.html] - type: testharness - bug: https://github.com/servo/servo/issues/10600 - [void methods return undefined] - expected: FAIL - diff --git a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/2d.drawImage.zerosource.html.ini b/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/2d.drawImage.zerosource.html.ini deleted file mode 100644 index c5c6c54bdb13..000000000000 --- a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/2d.drawImage.zerosource.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[2d.drawImage.zerosource.html] - type: testharness - [drawImage with zero-sized source rectangle draws nothing without exception] - expected: FAIL -