diff --git a/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.nonfinite.spacing.html b/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.nonfinite.spacing.html index f4741eae34c45c..be085ebfa8f4b8 100644 --- a/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.nonfinite.spacing.html +++ b/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.nonfinite.spacing.html @@ -20,12 +20,12 @@

2d.text.drawing.style.nonfinite.spacing

_addTest(function(canvas, ctx) { _assertSame(ctx.textLetterSpacing, 0, "ctx.textLetterSpacing", "0"); -_assertSame(ctx.textWordSpacing, 0, "ctx.textWordSpacing", "0"); +_assertSame(ctx.wordSpacing, 0, "ctx.wordSpacing", "0"); function test_word_spacing(value) { - ctx.textWordSpacing = value; + ctx.wordSpacing = value; ctx.textLetterSpacing = value; - _assertSame(ctx.textWordSpacing, 0, "ctx.textWordSpacing", "0"); + _assertSame(ctx.wordSpacing, 0, "ctx.wordSpacing", "0"); _assertSame(ctx.textLetterSpacing, 0, "ctx.textLetterSpacing", "0"); } test_word_spacing(NaN); diff --git a/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.spacing.html b/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.spacing.html index 67092690ed37ba..b65971280bb120 100644 --- a/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.spacing.html +++ b/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.spacing.html @@ -20,20 +20,20 @@

2d.text.drawing.style.spacing

_addTest(function(canvas, ctx) { _assertSame(ctx.textLetterSpacing, 0, "ctx.textLetterSpacing", "0"); -_assertSame(ctx.textWordSpacing, 0, "ctx.textWordSpacing", "0"); +_assertSame(ctx.wordSpacing, 0, "ctx.wordSpacing", "0"); ctx.textLetterSpacing = 3; _assertSame(ctx.textLetterSpacing, 3, "ctx.textLetterSpacing", "3"); -_assertSame(ctx.textWordSpacing, 0, "ctx.textWordSpacing", "0"); +_assertSame(ctx.wordSpacing, 0, "ctx.wordSpacing", "0"); -ctx.textWordSpacing = 5; +ctx.wordSpacing = 5; _assertSame(ctx.textLetterSpacing, 3, "ctx.textLetterSpacing", "3"); -_assertSame(ctx.textWordSpacing, 5, "ctx.textWordSpacing", "5"); +_assertSame(ctx.wordSpacing, 5, "ctx.wordSpacing", "5"); ctx.textLetterSpacing = -1; -ctx.textWordSpacing = -1; +ctx.wordSpacing = -1; _assertSame(ctx.textLetterSpacing, -1, "ctx.textLetterSpacing", "-1"); -_assertSame(ctx.textWordSpacing, -1, "ctx.textWordSpacing", "-1"); +_assertSame(ctx.wordSpacing, -1, "ctx.wordSpacing", "-1"); }); diff --git a/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.spacing.measure.html b/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.spacing.measure.html index d4f0faa983cb8c..b4b4c66fd8a15f 100644 --- a/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.spacing.measure.html +++ b/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.spacing.measure.html @@ -20,28 +20,28 @@

2d.text.drawing.style.spacing.measure

_addTest(function(canvas, ctx) { _assertSame(ctx.textLetterSpacing, 0, "ctx.textLetterSpacing", "0"); -_assertSame(ctx.textWordSpacing, 0, "ctx.textWordSpacing", "0"); +_assertSame(ctx.wordSpacing, 0, "ctx.wordSpacing", "0"); var width_normal = ctx.measureText('Hello World').width; ctx.textLetterSpacing = 3; _assertSame(ctx.textLetterSpacing, 3, "ctx.textLetterSpacing", "3"); -_assertSame(ctx.textWordSpacing, 0, "ctx.textWordSpacing", "0"); +_assertSame(ctx.wordSpacing, 0, "ctx.wordSpacing", "0"); var width_with_spacing = ctx.measureText('Hello World').width; // Add letter spacing after each letter, so 11 * 3 = 33px longer. _assertSame(width_with_spacing, width_normal + 33, "width_with_spacing", "width_normal + 33"); -ctx.textWordSpacing = 5; +ctx.wordSpacing = 5; ctx.textLetterSpacing = 0; _assertSame(ctx.textLetterSpacing, 0, "ctx.textLetterSpacing", "0"); -_assertSame(ctx.textWordSpacing, 5, "ctx.textWordSpacing", "5"); +_assertSame(ctx.wordSpacing, 5, "ctx.wordSpacing", "5"); // Add Word Spacing between "Hello" and "World", so it's 5px longer. width_with_spacing = ctx.measureText('Hello World').width; _assertSame(width_with_spacing, width_normal + 5, "width_with_spacing", "width_normal + 5"); ctx.textLetterSpacing = -2; -ctx.textWordSpacing = -1; +ctx.wordSpacing = -1; _assertSame(ctx.textLetterSpacing, -2, "ctx.textLetterSpacing", "-2"); -_assertSame(ctx.textWordSpacing, -1, "ctx.textWordSpacing", "-1"); +_assertSame(ctx.wordSpacing, -1, "ctx.wordSpacing", "-1"); // Add Word Spacing and letter spacing, so it's -11*2 = -22px from // letter spacing and -1px from word spacing. width_with_spacing = ctx.measureText('Hello World').width; diff --git a/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.html b/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.html index 521d7c4773a599..cc2d2d5580b40c 100644 --- a/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.html +++ b/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.html @@ -21,12 +21,12 @@

2d.text.drawing.style.nonfinite.spacing

var ctx = offscreenCanvas.getContext('2d'); _assertSame(ctx.textLetterSpacing, 0, "ctx.textLetterSpacing", "0"); -_assertSame(ctx.textWordSpacing, 0, "ctx.textWordSpacing", "0"); +_assertSame(ctx.wordSpacing, 0, "ctx.wordSpacing", "0"); function test_word_spacing(value) { - ctx.textWordSpacing = value; + ctx.wordSpacing = value; ctx.textLetterSpacing = value; - _assertSame(ctx.textWordSpacing, 0, "ctx.textWordSpacing", "0"); + _assertSame(ctx.wordSpacing, 0, "ctx.wordSpacing", "0"); _assertSame(ctx.textLetterSpacing, 0, "ctx.textLetterSpacing", "0"); } test_word_spacing(NaN); diff --git a/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.worker.js b/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.worker.js index a83682af16545f..101378bece9f64 100644 --- a/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.worker.js +++ b/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.worker.js @@ -17,12 +17,12 @@ var offscreenCanvas = new OffscreenCanvas(100, 50); var ctx = offscreenCanvas.getContext('2d'); _assertSame(ctx.textLetterSpacing, 0, "ctx.textLetterSpacing", "0"); -_assertSame(ctx.textWordSpacing, 0, "ctx.textWordSpacing", "0"); +_assertSame(ctx.wordSpacing, 0, "ctx.wordSpacing", "0"); function test_word_spacing(value) { - ctx.textWordSpacing = value; + ctx.wordSpacing = value; ctx.textLetterSpacing = value; - _assertSame(ctx.textWordSpacing, 0, "ctx.textWordSpacing", "0"); + _assertSame(ctx.wordSpacing, 0, "ctx.wordSpacing", "0"); _assertSame(ctx.textLetterSpacing, 0, "ctx.textLetterSpacing", "0"); } test_word_spacing(NaN); diff --git a/html/canvas/offscreen/text/2d.text.drawing.style.spacing.html b/html/canvas/offscreen/text/2d.text.drawing.style.spacing.html index 512ed7157c86e3..d1db23fdfe283c 100644 --- a/html/canvas/offscreen/text/2d.text.drawing.style.spacing.html +++ b/html/canvas/offscreen/text/2d.text.drawing.style.spacing.html @@ -21,20 +21,20 @@

2d.text.drawing.style.spacing

var ctx = offscreenCanvas.getContext('2d'); _assertSame(ctx.textLetterSpacing, 0, "ctx.textLetterSpacing", "0"); -_assertSame(ctx.textWordSpacing, 0, "ctx.textWordSpacing", "0"); +_assertSame(ctx.wordSpacing, 0, "ctx.wordSpacing", "0"); ctx.textLetterSpacing = 3; _assertSame(ctx.textLetterSpacing, 3, "ctx.textLetterSpacing", "3"); -_assertSame(ctx.textWordSpacing, 0, "ctx.textWordSpacing", "0"); +_assertSame(ctx.wordSpacing, 0, "ctx.wordSpacing", "0"); -ctx.textWordSpacing = 5; +ctx.wordSpacing = 5; _assertSame(ctx.textLetterSpacing, 3, "ctx.textLetterSpacing", "3"); -_assertSame(ctx.textWordSpacing, 5, "ctx.textWordSpacing", "5"); +_assertSame(ctx.wordSpacing, 5, "ctx.wordSpacing", "5"); ctx.textLetterSpacing = -1; -ctx.textWordSpacing = -1; +ctx.wordSpacing = -1; _assertSame(ctx.textLetterSpacing, -1, "ctx.textLetterSpacing", "-1"); -_assertSame(ctx.textWordSpacing, -1, "ctx.textWordSpacing", "-1"); +_assertSame(ctx.wordSpacing, -1, "ctx.wordSpacing", "-1"); t.done(); }); diff --git a/html/canvas/offscreen/text/2d.text.drawing.style.spacing.measure.html b/html/canvas/offscreen/text/2d.text.drawing.style.spacing.measure.html index fd6638d8c703b4..91f446b737efd1 100644 --- a/html/canvas/offscreen/text/2d.text.drawing.style.spacing.measure.html +++ b/html/canvas/offscreen/text/2d.text.drawing.style.spacing.measure.html @@ -21,28 +21,28 @@

2d.text.drawing.style.spacing.measure

var ctx = offscreenCanvas.getContext('2d'); _assertSame(ctx.textLetterSpacing, 0, "ctx.textLetterSpacing", "0"); -_assertSame(ctx.textWordSpacing, 0, "ctx.textWordSpacing", "0"); +_assertSame(ctx.wordSpacing, 0, "ctx.wordSpacing", "0"); var width_normal = ctx.measureText('Hello World').width; ctx.textLetterSpacing = 3; _assertSame(ctx.textLetterSpacing, 3, "ctx.textLetterSpacing", "3"); -_assertSame(ctx.textWordSpacing, 0, "ctx.textWordSpacing", "0"); +_assertSame(ctx.wordSpacing, 0, "ctx.wordSpacing", "0"); var width_with_spacing = ctx.measureText('Hello World').width; // Add letter spacing after each letter, so 11 * 3 = 33px longer. _assertSame(width_with_spacing, width_normal + 33, "width_with_spacing", "width_normal + 33"); -ctx.textWordSpacing = 5; +ctx.wordSpacing = 5; ctx.textLetterSpacing = 0; _assertSame(ctx.textLetterSpacing, 0, "ctx.textLetterSpacing", "0"); -_assertSame(ctx.textWordSpacing, 5, "ctx.textWordSpacing", "5"); +_assertSame(ctx.wordSpacing, 5, "ctx.wordSpacing", "5"); // Add Word Spacing between "Hello" and "World", so it's 5px longer. width_with_spacing = ctx.measureText('Hello World').width; _assertSame(width_with_spacing, width_normal + 5, "width_with_spacing", "width_normal + 5"); ctx.textLetterSpacing = -2; -ctx.textWordSpacing = -1; +ctx.wordSpacing = -1; _assertSame(ctx.textLetterSpacing, -2, "ctx.textLetterSpacing", "-2"); -_assertSame(ctx.textWordSpacing, -1, "ctx.textWordSpacing", "-1"); +_assertSame(ctx.wordSpacing, -1, "ctx.wordSpacing", "-1"); // Add Word Spacing and letter spacing, so it's -11*2 = -22px from // letter spacing and -1px from word spacing. width_with_spacing = ctx.measureText('Hello World').width; diff --git a/html/canvas/offscreen/text/2d.text.drawing.style.spacing.measure.worker.js b/html/canvas/offscreen/text/2d.text.drawing.style.spacing.measure.worker.js index 3a787b755cf538..a514bbdfe3f753 100644 --- a/html/canvas/offscreen/text/2d.text.drawing.style.spacing.measure.worker.js +++ b/html/canvas/offscreen/text/2d.text.drawing.style.spacing.measure.worker.js @@ -17,28 +17,28 @@ var offscreenCanvas = new OffscreenCanvas(100, 50); var ctx = offscreenCanvas.getContext('2d'); _assertSame(ctx.textLetterSpacing, 0, "ctx.textLetterSpacing", "0"); -_assertSame(ctx.textWordSpacing, 0, "ctx.textWordSpacing", "0"); +_assertSame(ctx.wordSpacing, 0, "ctx.wordSpacing", "0"); var width_normal = ctx.measureText('Hello World').width; ctx.textLetterSpacing = 3; _assertSame(ctx.textLetterSpacing, 3, "ctx.textLetterSpacing", "3"); -_assertSame(ctx.textWordSpacing, 0, "ctx.textWordSpacing", "0"); +_assertSame(ctx.wordSpacing, 0, "ctx.wordSpacing", "0"); var width_with_spacing = ctx.measureText('Hello World').width; // Add letter spacing after each letter, so 11 * 3 = 33px longer. _assertSame(width_with_spacing, width_normal + 33, "width_with_spacing", "width_normal + 33"); -ctx.textWordSpacing = 5; +ctx.wordSpacing = 5; ctx.textLetterSpacing = 0; _assertSame(ctx.textLetterSpacing, 0, "ctx.textLetterSpacing", "0"); -_assertSame(ctx.textWordSpacing, 5, "ctx.textWordSpacing", "5"); +_assertSame(ctx.wordSpacing, 5, "ctx.wordSpacing", "5"); // Add Word Spacing between "Hello" and "World", so it's 5px longer. width_with_spacing = ctx.measureText('Hello World').width; _assertSame(width_with_spacing, width_normal + 5, "width_with_spacing", "width_normal + 5"); ctx.textLetterSpacing = -2; -ctx.textWordSpacing = -1; +ctx.wordSpacing = -1; _assertSame(ctx.textLetterSpacing, -2, "ctx.textLetterSpacing", "-2"); -_assertSame(ctx.textWordSpacing, -1, "ctx.textWordSpacing", "-1"); +_assertSame(ctx.wordSpacing, -1, "ctx.wordSpacing", "-1"); // Add Word Spacing and letter spacing, so it's -11*2 = -22px from // letter spacing and -1px from word spacing. width_with_spacing = ctx.measureText('Hello World').width; diff --git a/html/canvas/offscreen/text/2d.text.drawing.style.spacing.worker.js b/html/canvas/offscreen/text/2d.text.drawing.style.spacing.worker.js index 1dac9f5c1f3499..e6855c1838e6f7 100644 --- a/html/canvas/offscreen/text/2d.text.drawing.style.spacing.worker.js +++ b/html/canvas/offscreen/text/2d.text.drawing.style.spacing.worker.js @@ -17,20 +17,20 @@ var offscreenCanvas = new OffscreenCanvas(100, 50); var ctx = offscreenCanvas.getContext('2d'); _assertSame(ctx.textLetterSpacing, 0, "ctx.textLetterSpacing", "0"); -_assertSame(ctx.textWordSpacing, 0, "ctx.textWordSpacing", "0"); +_assertSame(ctx.wordSpacing, 0, "ctx.wordSpacing", "0"); ctx.textLetterSpacing = 3; _assertSame(ctx.textLetterSpacing, 3, "ctx.textLetterSpacing", "3"); -_assertSame(ctx.textWordSpacing, 0, "ctx.textWordSpacing", "0"); +_assertSame(ctx.wordSpacing, 0, "ctx.wordSpacing", "0"); -ctx.textWordSpacing = 5; +ctx.wordSpacing = 5; _assertSame(ctx.textLetterSpacing, 3, "ctx.textLetterSpacing", "3"); -_assertSame(ctx.textWordSpacing, 5, "ctx.textWordSpacing", "5"); +_assertSame(ctx.wordSpacing, 5, "ctx.wordSpacing", "5"); ctx.textLetterSpacing = -1; -ctx.textWordSpacing = -1; +ctx.wordSpacing = -1; _assertSame(ctx.textLetterSpacing, -1, "ctx.textLetterSpacing", "-1"); -_assertSame(ctx.textWordSpacing, -1, "ctx.textWordSpacing", "-1"); +_assertSame(ctx.wordSpacing, -1, "ctx.wordSpacing", "-1"); t.done(); }); diff --git a/html/canvas/tools/yaml/element/drawing-text-to-the-canvas.yaml b/html/canvas/tools/yaml/element/drawing-text-to-the-canvas.yaml index d53138d6d1d6db..6d871592fa910a 100644 --- a/html/canvas/tools/yaml/element/drawing-text-to-the-canvas.yaml +++ b/html/canvas/tools/yaml/element/drawing-text-to-the-canvas.yaml @@ -744,20 +744,20 @@ - 2d.text.drawing.style.spacing code: | @assert ctx.textLetterSpacing === 0; - @assert ctx.textWordSpacing === 0; + @assert ctx.wordSpacing === 0; ctx.textLetterSpacing = 3; @assert ctx.textLetterSpacing === 3; - @assert ctx.textWordSpacing === 0; + @assert ctx.wordSpacing === 0; - ctx.textWordSpacing = 5; + ctx.wordSpacing = 5; @assert ctx.textLetterSpacing === 3; - @assert ctx.textWordSpacing === 5; + @assert ctx.wordSpacing === 5; ctx.textLetterSpacing = -1; - ctx.textWordSpacing = -1; + ctx.wordSpacing = -1; @assert ctx.textLetterSpacing === -1; - @assert ctx.textWordSpacing === -1; + @assert ctx.wordSpacing === -1; - name: 2d.text.drawing.style.nonfinite.spacing desc: Testing letter spacing and word spacing with nonfinite inputs @@ -765,12 +765,12 @@ - 2d.text.drawing.style.spacing code: | @assert ctx.textLetterSpacing === 0; - @assert ctx.textWordSpacing === 0; + @assert ctx.wordSpacing === 0; function test_word_spacing(value) { - ctx.textWordSpacing = value; + ctx.wordSpacing = value; ctx.textLetterSpacing = value; - @assert ctx.textWordSpacing === 0; + @assert ctx.wordSpacing === 0; @assert ctx.textLetterSpacing === 0; } @nonfinite test_word_spacing(<0 NaN Infinity -Infinity>); @@ -781,28 +781,28 @@ - 2d.text.drawing.style.spacing code: | @assert ctx.textLetterSpacing === 0; - @assert ctx.textWordSpacing === 0; + @assert ctx.wordSpacing === 0; var width_normal = ctx.measureText('Hello World').width; ctx.textLetterSpacing = 3; @assert ctx.textLetterSpacing === 3; - @assert ctx.textWordSpacing === 0; + @assert ctx.wordSpacing === 0; var width_with_spacing = ctx.measureText('Hello World').width; // Add letter spacing after each letter, so 11 * 3 = 33px longer. @assert width_with_spacing === width_normal + 33; - ctx.textWordSpacing = 5; + ctx.wordSpacing = 5; ctx.textLetterSpacing = 0; @assert ctx.textLetterSpacing === 0; - @assert ctx.textWordSpacing === 5; + @assert ctx.wordSpacing === 5; // Add Word Spacing between "Hello" and "World", so it's 5px longer. width_with_spacing = ctx.measureText('Hello World').width; @assert width_with_spacing === width_normal + 5; ctx.textLetterSpacing = -2; - ctx.textWordSpacing = -1; + ctx.wordSpacing = -1; @assert ctx.textLetterSpacing === -2; - @assert ctx.textWordSpacing === -1; + @assert ctx.wordSpacing === -1; // Add Word Spacing and letter spacing, so it's -11*2 = -22px from // letter spacing and -1px from word spacing. width_with_spacing = ctx.measureText('Hello World').width; diff --git a/html/canvas/tools/yaml/offscreen/text.yaml b/html/canvas/tools/yaml/offscreen/text.yaml index 255a79be641c8e..df4cc1c307d87c 100644 --- a/html/canvas/tools/yaml/offscreen/text.yaml +++ b/html/canvas/tools/yaml/offscreen/text.yaml @@ -1242,20 +1242,20 @@ - 2d.text.drawing.style.spacing code: | @assert ctx.textLetterSpacing === 0; - @assert ctx.textWordSpacing === 0; + @assert ctx.wordSpacing === 0; ctx.textLetterSpacing = 3; @assert ctx.textLetterSpacing === 3; - @assert ctx.textWordSpacing === 0; + @assert ctx.wordSpacing === 0; - ctx.textWordSpacing = 5; + ctx.wordSpacing = 5; @assert ctx.textLetterSpacing === 3; - @assert ctx.textWordSpacing === 5; + @assert ctx.wordSpacing === 5; ctx.textLetterSpacing = -1; - ctx.textWordSpacing = -1; + ctx.wordSpacing = -1; @assert ctx.textLetterSpacing === -1; - @assert ctx.textWordSpacing === -1; + @assert ctx.wordSpacing === -1; t.done(); - name: 2d.text.drawing.style.nonfinite.spacing @@ -1264,12 +1264,12 @@ - 2d.text.drawing.style.spacing code: | @assert ctx.textLetterSpacing === 0; - @assert ctx.textWordSpacing === 0; + @assert ctx.wordSpacing === 0; function test_word_spacing(value) { - ctx.textWordSpacing = value; + ctx.wordSpacing = value; ctx.textLetterSpacing = value; - @assert ctx.textWordSpacing === 0; + @assert ctx.wordSpacing === 0; @assert ctx.textLetterSpacing === 0; } @nonfinite test_word_spacing(<0 NaN Infinity -Infinity>); @@ -1282,28 +1282,28 @@ - 2d.text.drawing.style.spacing code: | @assert ctx.textLetterSpacing === 0; - @assert ctx.textWordSpacing === 0; + @assert ctx.wordSpacing === 0; var width_normal = ctx.measureText('Hello World').width; ctx.textLetterSpacing = 3; @assert ctx.textLetterSpacing === 3; - @assert ctx.textWordSpacing === 0; + @assert ctx.wordSpacing === 0; var width_with_spacing = ctx.measureText('Hello World').width; // Add letter spacing after each letter, so 11 * 3 = 33px longer. @assert width_with_spacing === width_normal + 33; - ctx.textWordSpacing = 5; + ctx.wordSpacing = 5; ctx.textLetterSpacing = 0; @assert ctx.textLetterSpacing === 0; - @assert ctx.textWordSpacing === 5; + @assert ctx.wordSpacing === 5; // Add Word Spacing between "Hello" and "World", so it's 5px longer. width_with_spacing = ctx.measureText('Hello World').width; @assert width_with_spacing === width_normal + 5; ctx.textLetterSpacing = -2; - ctx.textWordSpacing = -1; + ctx.wordSpacing = -1; @assert ctx.textLetterSpacing === -2; - @assert ctx.textWordSpacing === -1; + @assert ctx.wordSpacing === -1; // Add Word Spacing and letter spacing, so it's -11*2 = -22px from // letter spacing and -1px from word spacing. width_with_spacing = ctx.measureText('Hello World').width;