diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp index 0eb467676f40..517c01eb0623 100644 --- a/content/canvas/src/nsCanvasRenderingContext2D.cpp +++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp @@ -3518,10 +3518,8 @@ nsCanvasRenderingContext2D::SetGlobalCompositeOperation(const nsAString& op) if (op.EqualsLiteral(cvsop)) \ thebes_op = gfxContext::OPERATOR_##thebesop; - // XXX "darker" isn't really correct CANVAS_OP_TO_THEBES_OP("clear", CLEAR) else CANVAS_OP_TO_THEBES_OP("copy", SOURCE) - else CANVAS_OP_TO_THEBES_OP("darker", SATURATE) // XXX else CANVAS_OP_TO_THEBES_OP("destination-atop", DEST_ATOP) else CANVAS_OP_TO_THEBES_OP("destination-in", DEST_IN) else CANVAS_OP_TO_THEBES_OP("destination-out", DEST_OUT) diff --git a/content/canvas/test/test_canvas.html b/content/canvas/test/test_canvas.html index c385ce6d31da..f1b9233ffd84 100644 --- a/content/canvas/test/test_canvas.html +++ b/content/canvas/test/test_canvas.html @@ -1501,7 +1501,7 @@ var ctx = canvas.getContext('2d'); ctx.globalCompositeOperation = 'xor'; ctx.globalCompositeOperation = 'darker'; -todo(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'"); +ok(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'"); }