Back out b88ccf7bd3e3 for Linux test_canvas.html failures on a CLOSED TREE

content/canvas/test/test_canvas.html

@@ -16078,17 +16078,9 @@ function test_2d_pattern_repeat_null() {
 var canvas = document.getElementById('c494');
 var ctx = canvas.getContext('2d');
 
-ctx.fillStyle = '#f00';
+var _thrown = undefined; try {
-ctx.fillRect(0, 0, 100, 50);
+  ctx.createPattern(canvas, null);
-var img = document.getElementById('green-1x1_2.png');
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.name == "SyntaxError" && _thrown.code == DOMException.SYNTAX_ERR, "should throw SyntaxError");
-var pattern = ctx.createPattern(img, null);
-ctx.fillStyle = pattern;
-ctx.fillRect(0, 0, 100, 50);
-
-isPixel(ctx, 1,1, 0,255,0,255, 0);
-isPixel(ctx, 98,1, 0,255,0,255, 0);
-isPixel(ctx, 1,48, 0,255,0,255, 0);
-isPixel(ctx, 98,48, 0,255,0,255, 0);
 
 
 }
@@ -16127,8 +16119,7 @@ var ctx = canvas.getContext('2d');
 
 var _thrown = undefined; try {
   ctx.createPattern(canvas, undefined);
-  // XXXbz TODO fix bug 784869
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.name == "SyntaxError" && _thrown.code == DOMException.SYNTAX_ERR, "should throw SyntaxError");
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.name == "SyntaxError" && _thrown.code == DOMException.SYNTAX_ERR, "should throw SyntaxError");
 
 
 }

dom/interfaces/canvas/nsIDOMCanvasRenderingContext2D.idl

@@ -93,7 +93,7 @@ enum CanvasMultiGetterType {
 
   nsIDOMCanvasGradient createLinearGradient (in float x0, in float y0, in float x1, in float y1);
   nsIDOMCanvasGradient createRadialGradient(in float x0, in float y0, in float r0, in float x1, in float y1, in float r1);
-  nsIDOMCanvasPattern createPattern(in nsIDOMHTMLElement image, in DOMString repetition);
+  nsIDOMCanvasPattern createPattern(in nsIDOMHTMLElement image, [Null(Stringify)] in DOMString repetition);
   attribute float lineWidth; /* default 1 */
   [binaryname(MozLineCap)]
   attribute DOMString lineCap; /* "butt", "round", "square" (default) */

dom/webidl/CanvasRenderingContext2D.webidl

@@ -55,7 +55,7 @@ interface CanvasRenderingContext2D {
            attribute any fillStyle; // (default black)
   CanvasGradient createLinearGradient(double x0, double y0, double x1, double y1);
   CanvasGradient createRadialGradient(double x0, double y0, double r0, double x1, double y1, double r1);
-  CanvasPattern createPattern((HTMLImageElement or HTMLCanvasElement or HTMLVideoElement) image, DOMString? repetition);
+  CanvasPattern createPattern((HTMLImageElement or HTMLCanvasElement or HTMLVideoElement) image, DOMString repetition);
 
   // shadows
            [Infallible]