Rollup merge of servo#6974 - dzbarsky:tiny-create, r=jdm

[<img src=\"https://reviewable.io/review_button.png\" height=40 alt=\"Review on Reviewable\"/>](https://reviewable.io/reviews/servo/servo/6974)
Manishearth · Aug 5, 2015 · c40e719 · c40e719
2 parents d5ea08e + 2fb5fda
commit c40e719
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs
@@ -42,6 +42,7 @@ use num::{Float, ToPrimitive};
 use std::borrow::ToOwned;
 use std::cell::RefCell;
 use std::fmt;
+use std::cmp;
 use std::sync::mpsc::channel;
 
 use util::str::DOMString;
@@ -954,7 +955,9 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D {
             return Err(IndexSize)
         }
 
-        Ok(ImageData::new(self.global.root().r(), sw.abs().to_u32().unwrap(), sh.abs().to_u32().unwrap(), None))
+        let sw = cmp::max(1, sw.abs().to_u32().unwrap());
+        let sh = cmp::max(1, sh.abs().to_u32().unwrap());
+        Ok(ImageData::new(self.global.root().r(), sw, sh, None))
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-context-2d-createimagedata

diff --git a/tests/wpt/metadata/2dcontext/pixel-manipulation/2d.imageData.create2.tiny.html.ini b/tests/wpt/metadata/2dcontext/pixel-manipulation/2d.imageData.create2.tiny.html.ini