Bug 630056 - Don't throw on setting miterLimit and ignore non-positive values; r+a=roc

This commit is contained in:
Ms2ger 2011-02-02 08:46:44 +13:00
parent 1a2ff9c3c4
commit efa9ee5a7b
2 changed files with 8 additions and 8 deletions

View File

@ -3168,8 +3168,8 @@ nsCanvasRenderingContext2D::GetLineJoin(nsAString& joinstyle)
NS_IMETHODIMP
nsCanvasRenderingContext2D::SetMiterLimit(float miter)
{
if (!FloatValidate(miter))
return NS_ERROR_DOM_SYNTAX_ERR;
if (!FloatValidate(miter) || miter <= 0.0)
return NS_OK;
mThebes->SetMiterLimit(miter);
return NS_OK;

View File

@ -9829,28 +9829,28 @@ ok(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
ctx.miterLimit = 1.5;
ctx.miterLimit = 0;
todo(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
ok(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
ctx.miterLimit = 1.5;
ctx.miterLimit = -1;
todo(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
ok(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
ctx.miterLimit = 1.5;
ctx.miterLimit = Infinity;
todo(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
ok(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
ctx.miterLimit = 1.5;
ctx.miterLimit = -Infinity;
todo(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
ok(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
ctx.miterLimit = 1.5;
ctx.miterLimit = NaN;
todo(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
ok(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
} catch (e) {
_thrown_outer = true;
}
todo(!_thrown_outer, 'should not throw exception');
ok(!_thrown_outer, 'should not throw exception');
}