aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorn0max <n0mad@gmx.de>2017-04-29 18:06:54 +0200
committern0max <n0mad@gmx.de>2017-04-29 19:27:00 +0200
commit49820a6797fab5d376c06ff7c7f23b0aa18f5525 (patch)
treea5c4f83e82407d0bef76e0e20c7d807d4721288a
parent33c6abb1a8a908e848e5aab77bd9c2a94647b74c (diff)
downloadservo-49820a6797fab5d376c06ff7c7f23b0aa18f5525.tar.gz
servo-49820a6797fab5d376c06ff7c7f23b0aa18f5525.zip
Remove IndexSizeError in CanvasRenderingContext2D::drawImage
-rw-r--r--components/script/dom/canvasrenderingcontext2d.rs4
-rw-r--r--tests/wpt/metadata/2dcontext/conformance-requirements/2d.voidreturn.html.ini6
-rw-r--r--tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/2d.drawImage.zerosource.html.ini5
3 files changed, 2 insertions, 13 deletions
diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs
index 432dbe800aa..a5ec8d233b6 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 d93a4f9d41f..00000000000
--- 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 c5c6c54bdb1..00000000000
--- 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
-