followup: adjust tests2dtext.yaml to match changes to the generated test file.
Differential Revision: https://phabricator.services.mozilla.com/D60435
bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=1102584
gecko-commit: 4e6ef0abad2320029f53b5307819b412a6aa9959
gecko-integration-branch: autoland
gecko-reviewers: lsalzman
diff --git a/2dcontext/drawing-text-to-the-canvas/2d.text.measure.actualBoundingBox.html b/2dcontext/drawing-text-to-the-canvas/2d.text.measure.actualBoundingBox.html
index 8023c78..834c195 100644
--- a/2dcontext/drawing-text-to-the-canvas/2d.text.measure.actualBoundingBox.html
+++ b/2dcontext/drawing-text-to-the-canvas/2d.text.measure.actualBoundingBox.html
@@ -38,12 +38,12 @@
// Different platforms may render text slightly different.
// Values that are nominally expected to be zero might actually vary by a pixel or so
// if the UA accounts for antialiasing at glyph edges, so we allow a slight deviation.
- _assert(Math.abs(ctx.measureText('A').actualBoundingBoxLeft) <= 1, "Math.abs(ctx.measureText('A').actualBoundingBoxLeft)", "0");
+ _assert(Math.abs(ctx.measureText('A').actualBoundingBoxLeft) <= 1, "Math.abs(ctx.measureText('A').actualBoundingBoxLeft) <= 1");
_assert(ctx.measureText('A').actualBoundingBoxRight >= 50, "ctx.measureText('A').actualBoundingBoxRight >= 50");
_assert(ctx.measureText('A').actualBoundingBoxAscent >= 35, "ctx.measureText('A').actualBoundingBoxAscent >= 35");
- _assert(Math.abs(ctx.measureText('A').actualBoundingBoxDescent) <= 1, "Math.abs(ctx.measureText('A').actualBoundingBoxDescent)", "0");
+ _assert(Math.abs(ctx.measureText('A').actualBoundingBoxDescent) <= 1, "Math.abs(ctx.measureText('A').actualBoundingBoxDescent) <= 1");
- _assert(Math.abs(ctx.measureText('ABCD').actualBoundingBoxLeft) <= 1, "Math.abs(ctx.measureText('ABCD').actualBoundingBoxLeft)", "0");
+ _assert(Math.abs(ctx.measureText('ABCD').actualBoundingBoxLeft) <= 1, "Math.abs(ctx.measureText('ABCD').actualBoundingBoxLeft) <= 1");
_assert(ctx.measureText('ABCD').actualBoundingBoxRight >= 200, "ctx.measureText('ABCD').actualBoundingBoxRight >= 200");
_assert(ctx.measureText('ABCD').actualBoundingBoxAscent >= 85, "ctx.measureText('ABCD').actualBoundingBoxAscent >= 85");
_assert(ctx.measureText('ABCD').actualBoundingBoxDescent >= 37, "ctx.measureText('ABCD').actualBoundingBoxDescent >= 37");
diff --git a/2dcontext/tools/tests2dtext.yaml b/2dcontext/tools/tests2dtext.yaml
index 6d5f8f6..e142328 100644
--- a/2dcontext/tools/tests2dtext.yaml
+++ b/2dcontext/tools/tests2dtext.yaml
@@ -1088,14 +1088,15 @@
ctx.direction = 'ltr';
ctx.align = 'left'
ctx.baseline = 'alphabetic'
- // Some platforms may return '-0'.
- @assert Math.abs(ctx.measureText('A').actualBoundingBoxLeft) === 0;
// Different platforms may render text slightly different.
+ // Values that are nominally expected to be zero might actually vary by a pixel or so
+ // if the UA accounts for antialiasing at glyph edges, so we allow a slight deviation.
+ @assert Math.abs(ctx.measureText('A').actualBoundingBoxLeft) <= 1;
@assert ctx.measureText('A').actualBoundingBoxRight >= 50;
@assert ctx.measureText('A').actualBoundingBoxAscent >= 35;
- @assert Math.abs(ctx.measureText('A').actualBoundingBoxDescent) === 0;
+ @assert Math.abs(ctx.measureText('A').actualBoundingBoxDescent) <= 1;
- @assert Math.abs(ctx.measureText('ABCD').actualBoundingBoxLeft) === 0;
+ @assert Math.abs(ctx.measureText('ABCD').actualBoundingBoxLeft) <= 1;
@assert ctx.measureText('ABCD').actualBoundingBoxRight >= 200;
@assert ctx.measureText('ABCD').actualBoundingBoxAscent >= 85;
@assert ctx.measureText('ABCD').actualBoundingBoxDescent >= 37;