Auto merge of #5433 - dmarcos:issue5290, r=jdm

This commit is contained in:
bors-servo 2015-04-07 18:38:34 -05:00
commit 58637a1174
86 changed files with 1380 additions and 251 deletions

View file

@ -6,8 +6,8 @@
enum CanvasWindingRule { "nonzero", "evenodd" };
// http://www.whatwg.org/html/#2dcontext
typedef (/* HTMLImageElement or
HTMLVideoElement or */
typedef (HTMLImageElement or
/* HTMLVideoElement or */
HTMLCanvasElement or
CanvasRenderingContext2D /* or
ImageBitmap */) CanvasImageSource;