Skip to content

Commit

Permalink
Fix Canvas 2d attribute spelling
Browse files Browse the repository at this point in the history 
TextRendering properties are saved as "Auto", "GeometricPrecision",
"OptimizeSpeed", etc, which is wrong and it is supposed to start with
lower case letters instead, i.e., "auto", "geometricPrecision",
"optimizeSpeed", etc. This similar mistake were made for FontKerning,
FontVariant and FontStretch.

This Cl fixes the spelling issues for these Canvas 2D attributes.

Bug: 1230242

Change-Id: I8e5e4cd60fcf75ec5de984a880c5b5b9426a75e6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3055118
Reviewed-by: Justin Novosad <[email protected]>
Commit-Queue: Yi Xu <[email protected]>
Cr-Commit-Position: refs/heads/master@{#905809}
  • Loading branch information
@yiyix @chromium-wpt-export-bot
yiyix authored and chromium-wpt-export-bot committed Jul 27, 2021
1 parent 3fd8696 commit e2a08cb
Show file tree
Hide file tree
Showing 14 changed files with 230 additions and 230 deletions.
6 changes: 3 additions & 3 deletions html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.fontKerning.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ <h1>2d.text.drawing.style.fontKerning</h1>
var t = async_test("Testing basic functionalities of fontKerning for canvas");
_addTest(function(canvas, ctx) {

_assertSame(ctx.fontKerning, "Auto", "ctx.fontKerning", "\"Auto\"");
_assertSame(ctx.fontKerning, "auto", "ctx.fontKerning", "\"auto\"");
ctx.fontKerning = "Normal";
_assertSame(ctx.fontKerning, "Normal", "ctx.fontKerning", "\"Normal\"");
_assertSame(ctx.fontKerning, "normal", "ctx.fontKerning", "\"normal\"");
width_normal = ctx.measureText("TAWATAVA").width;
ctx.fontKerning = "None";
_assertSame(ctx.fontKerning, "None", "ctx.fontKerning", "\"None\"");
_assertSame(ctx.fontKerning, "none", "ctx.fontKerning", "\"none\"");
width_none = ctx.measureText("TAWATAVA").width;
_assert(width_normal < width_none, "width_normal < width_none");

Expand Down
22 changes: 11 additions & 11 deletions .../element/drawing-text-to-the-canvas/2d.text.drawing.style.fontKerning.with.uppercase.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,36 +19,36 @@ <h1>2d.text.drawing.style.fontKerning.with.uppercase</h1>
var t = async_test("Testing basic functionalities of fontKerning for canvas");
_addTest(function(canvas, ctx) {

_assertSame(ctx.fontKerning, "Auto", "ctx.fontKerning", "\"Auto\"");
_assertSame(ctx.fontKerning, "auto", "ctx.fontKerning", "\"auto\"");
ctx.fontKerning = "Normal";
_assertSame(ctx.fontKerning, "Normal", "ctx.fontKerning", "\"Normal\"");
_assertSame(ctx.fontKerning, "normal", "ctx.fontKerning", "\"normal\"");
ctx.fontKerning = "Auto";
ctx.fontKerning = "normal";
_assertSame(ctx.fontKerning, "Normal", "ctx.fontKerning", "\"Normal\"");
_assertSame(ctx.fontKerning, "normal", "ctx.fontKerning", "\"normal\"");
ctx.fontKerning = "Auto";
ctx.fontKerning = "noRmal";
_assertSame(ctx.fontKerning, "Normal", "ctx.fontKerning", "\"Normal\"");
_assertSame(ctx.fontKerning, "normal", "ctx.fontKerning", "\"normal\"");
ctx.fontKerning = "Auto";
ctx.fontKerning = "NoRMal";
_assertSame(ctx.fontKerning, "Normal", "ctx.fontKerning", "\"Normal\"");
_assertSame(ctx.fontKerning, "normal", "ctx.fontKerning", "\"normal\"");
ctx.fontKerning = "Auto";
ctx.fontKerning = "NORMAL";
_assertSame(ctx.fontKerning, "Normal", "ctx.fontKerning", "\"Normal\"");
_assertSame(ctx.fontKerning, "normal", "ctx.fontKerning", "\"normal\"");

ctx.fontKerning = "None";
_assertSame(ctx.fontKerning, "None", "ctx.fontKerning", "\"None\"");
_assertSame(ctx.fontKerning, "none", "ctx.fontKerning", "\"none\"");
ctx.fontKerning = "Auto";
ctx.fontKerning = "none";
_assertSame(ctx.fontKerning, "None", "ctx.fontKerning", "\"None\"");
_assertSame(ctx.fontKerning, "none", "ctx.fontKerning", "\"none\"");
ctx.fontKerning = "Auto";
ctx.fontKerning = "nOne";
_assertSame(ctx.fontKerning, "None", "ctx.fontKerning", "\"None\"");
_assertSame(ctx.fontKerning, "none", "ctx.fontKerning", "\"none\"");
ctx.fontKerning = "Auto";
ctx.fontKerning = "nonE";
_assertSame(ctx.fontKerning, "None", "ctx.fontKerning", "\"None\"");
_assertSame(ctx.fontKerning, "none", "ctx.fontKerning", "\"none\"");
ctx.fontKerning = "Auto";
ctx.fontKerning = "NONE";
_assertSame(ctx.fontKerning, "None", "ctx.fontKerning", "\"None\"");
_assertSame(ctx.fontKerning, "none", "ctx.fontKerning", "\"none\"");


});
Expand Down
32 changes: 16 additions & 16 deletions ...canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.fontVariant.settings.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,54 +20,54 @@ <h1>2d.text.drawing.style.fontVariant.settings</h1>
_addTest(function(canvas, ctx) {

// Setting fontVariantCaps with lower cases
_assertSame(ctx.fontVariantCaps, "Normal", "ctx.fontVariantCaps", "\"Normal\"");
_assertSame(ctx.fontVariantCaps, "normal", "ctx.fontVariantCaps", "\"normal\"");

ctx.fontVariantCaps = "normal";
_assertSame(ctx.fontVariantCaps, "Normal", "ctx.fontVariantCaps", "\"Normal\"");
_assertSame(ctx.fontVariantCaps, "normal", "ctx.fontVariantCaps", "\"normal\"");

ctx.fontVariantCaps = "small-caps";
_assertSame(ctx.fontVariantCaps, "SmallCaps", "ctx.fontVariantCaps", "\"SmallCaps\"");
_assertSame(ctx.fontVariantCaps, "small-caps", "ctx.fontVariantCaps", "\"small-caps\"");

ctx.fontVariantCaps = "all-small-caps";
_assertSame(ctx.fontVariantCaps, "AllSmallCaps", "ctx.fontVariantCaps", "\"AllSmallCaps\"");
_assertSame(ctx.fontVariantCaps, "all-small-caps", "ctx.fontVariantCaps", "\"all-small-caps\"");

ctx.fontVariantCaps = "petite-caps";
_assertSame(ctx.fontVariantCaps, "PetiteCaps", "ctx.fontVariantCaps", "\"PetiteCaps\"");
_assertSame(ctx.fontVariantCaps, "petite-caps", "ctx.fontVariantCaps", "\"petite-caps\"");

ctx.fontVariantCaps = "all-petite-caps";
_assertSame(ctx.fontVariantCaps, "AllPetiteCaps", "ctx.fontVariantCaps", "\"AllPetiteCaps\"");
_assertSame(ctx.fontVariantCaps, "all-petite-caps", "ctx.fontVariantCaps", "\"all-petite-caps\"");

ctx.fontVariantCaps = "unicase";
_assertSame(ctx.fontVariantCaps, "Unicase", "ctx.fontVariantCaps", "\"Unicase\"");
_assertSame(ctx.fontVariantCaps, "unicase", "ctx.fontVariantCaps", "\"unicase\"");

ctx.fontVariantCaps = "titling-caps";
_assertSame(ctx.fontVariantCaps, "TitlingCaps", "ctx.fontVariantCaps", "\"TitlingCaps\"");
_assertSame(ctx.fontVariantCaps, "titling-caps", "ctx.fontVariantCaps", "\"titling-caps\"");

// Setting fontVariantCaps with lower cases and upper cases word.
ctx.fontVariantCaps = "nORmal";
_assertSame(ctx.fontVariantCaps, "Normal", "ctx.fontVariantCaps", "\"Normal\"");
_assertSame(ctx.fontVariantCaps, "normal", "ctx.fontVariantCaps", "\"normal\"");

ctx.fontVariantCaps = "smaLL-caps";
_assertSame(ctx.fontVariantCaps, "SmallCaps", "ctx.fontVariantCaps", "\"SmallCaps\"");
_assertSame(ctx.fontVariantCaps, "small-caps", "ctx.fontVariantCaps", "\"small-caps\"");

ctx.fontVariantCaps = "all-small-CAPS";
_assertSame(ctx.fontVariantCaps, "AllSmallCaps", "ctx.fontVariantCaps", "\"AllSmallCaps\"");
_assertSame(ctx.fontVariantCaps, "all-small-caps", "ctx.fontVariantCaps", "\"all-small-caps\"");

ctx.fontVariantCaps = "pEtitE-caps";
_assertSame(ctx.fontVariantCaps, "PetiteCaps", "ctx.fontVariantCaps", "\"PetiteCaps\"");
_assertSame(ctx.fontVariantCaps, "petite-caps", "ctx.fontVariantCaps", "\"petite-caps\"");

ctx.fontVariantCaps = "All-Petite-Caps";
_assertSame(ctx.fontVariantCaps, "AllPetiteCaps", "ctx.fontVariantCaps", "\"AllPetiteCaps\"");
_assertSame(ctx.fontVariantCaps, "all-petite-caps", "ctx.fontVariantCaps", "\"all-petite-caps\"");

ctx.fontVariantCaps = "uNIcase";
_assertSame(ctx.fontVariantCaps, "Unicase", "ctx.fontVariantCaps", "\"Unicase\"");
_assertSame(ctx.fontVariantCaps, "unicase", "ctx.fontVariantCaps", "\"unicase\"");

ctx.fontVariantCaps = "titling-CAPS";
_assertSame(ctx.fontVariantCaps, "TitlingCaps", "ctx.fontVariantCaps", "\"TitlingCaps\"");
_assertSame(ctx.fontVariantCaps, "titling-caps", "ctx.fontVariantCaps", "\"titling-caps\"");

// Setting fontVariantCaps with non-existing font variant.
ctx.fontVariantCaps = "abcd";
_assertSame(ctx.fontVariantCaps, "TitlingCaps", "ctx.fontVariantCaps", "\"TitlingCaps\"");
_assertSame(ctx.fontVariantCaps, "titling-caps", "ctx.fontVariantCaps", "\"titling-caps\"");


});
Expand Down
20 changes: 10 additions & 10 deletions ...nvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.textRendering.settings.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,36 +20,36 @@ <h1>2d.text.drawing.style.textRendering.settings</h1>
_addTest(function(canvas, ctx) {

// Setting textRendering with lower cases
_assertSame(ctx.textRendering, "Auto", "ctx.textRendering", "\"Auto\"");
_assertSame(ctx.textRendering, "auto", "ctx.textRendering", "\"auto\"");

ctx.textRendering = "auto";
_assertSame(ctx.textRendering, "Auto", "ctx.textRendering", "\"Auto\"");
_assertSame(ctx.textRendering, "auto", "ctx.textRendering", "\"auto\"");

ctx.textRendering = "optimizespeed";
_assertSame(ctx.textRendering, "OptimizeSpeed", "ctx.textRendering", "\"OptimizeSpeed\"");
_assertSame(ctx.textRendering, "optimizeSpeed", "ctx.textRendering", "\"optimizeSpeed\"");

ctx.textRendering = "optimizelegibility";
_assertSame(ctx.textRendering, "OptimizeLegibility", "ctx.textRendering", "\"OptimizeLegibility\"");
_assertSame(ctx.textRendering, "optimizeLegibility", "ctx.textRendering", "\"optimizeLegibility\"");

ctx.textRendering = "geometricprecision";
_assertSame(ctx.textRendering, "GeometricPrecision", "ctx.textRendering", "\"GeometricPrecision\"");
_assertSame(ctx.textRendering, "geometricPrecision", "ctx.textRendering", "\"geometricPrecision\"");

// Setting textRendering with lower cases and upper cases word.
ctx.textRendering = "aUto";
_assertSame(ctx.textRendering, "Auto", "ctx.textRendering", "\"Auto\"");
_assertSame(ctx.textRendering, "auto", "ctx.textRendering", "\"auto\"");

ctx.textRendering = "OPtimizeSpeed";
_assertSame(ctx.textRendering, "OptimizeSpeed", "ctx.textRendering", "\"OptimizeSpeed\"");
_assertSame(ctx.textRendering, "optimizeSpeed", "ctx.textRendering", "\"optimizeSpeed\"");

ctx.textRendering = "OPtimizELEgibility";
_assertSame(ctx.textRendering, "OptimizeLegibility", "ctx.textRendering", "\"OptimizeLegibility\"");
_assertSame(ctx.textRendering, "optimizeLegibility", "ctx.textRendering", "\"optimizeLegibility\"");

ctx.textRendering = "GeometricPrecision";
_assertSame(ctx.textRendering, "GeometricPrecision", "ctx.textRendering", "\"GeometricPrecision\"");
_assertSame(ctx.textRendering, "geometricPrecision", "ctx.textRendering", "\"geometricPrecision\"");

// Setting textRendering with non-existing font variant.
ctx.textRendering = "abcd";
_assertSame(ctx.textRendering, "GeometricPrecision", "ctx.textRendering", "\"GeometricPrecision\"");
_assertSame(ctx.textRendering, "geometricPrecision", "ctx.textRendering", "\"geometricPrecision\"");


});
Expand Down
10 changes: 5 additions & 5 deletions html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ <h1>2d.text.drawing.style.fontKerning</h1>
var offscreenCanvas = new OffscreenCanvas(100, 50);
var ctx = offscreenCanvas.getContext('2d');

_assertSame(ctx.fontKerning, "Auto", "ctx.fontKerning", "\"Auto\"");
ctx.fontKerning = "Normal";
_assertSame(ctx.fontKerning, "Normal", "ctx.fontKerning", "\"Normal\"");
_assertSame(ctx.fontKerning, "auto", "ctx.fontKerning", "\"auto\"");
ctx.fontKerning = "normal";
_assertSame(ctx.fontKerning, "normal", "ctx.fontKerning", "\"normal\"");
width_normal = ctx.measureText("TAWATAVA").width;
ctx.fontKerning = "None";
_assertSame(ctx.fontKerning, "None", "ctx.fontKerning", "\"None\"");
ctx.fontKerning = "none";
_assertSame(ctx.fontKerning, "none", "ctx.fontKerning", "\"none\"");
width_none = ctx.measureText("TAWATAVA").width;
_assert(width_normal < width_none, "width_normal < width_none");
t.done();
Expand Down
38 changes: 19 additions & 19 deletions html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.with.uppercase.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,36 +20,36 @@ <h1>2d.text.drawing.style.fontKerning.with.uppercase</h1>
var offscreenCanvas = new OffscreenCanvas(100, 50);
var ctx = offscreenCanvas.getContext('2d');

_assertSame(ctx.fontKerning, "Auto", "ctx.fontKerning", "\"Auto\"");
_assertSame(ctx.fontKerning, "auto", "ctx.fontKerning", "\"auto\"");
ctx.fontKerning = "Normal";
_assertSame(ctx.fontKerning, "Normal", "ctx.fontKerning", "\"Normal\"");
ctx.fontKerning = "Auto";
_assertSame(ctx.fontKerning, "normal", "ctx.fontKerning", "\"normal\"");
ctx.fontKerning = "auto";
ctx.fontKerning = "normal";
_assertSame(ctx.fontKerning, "Normal", "ctx.fontKerning", "\"Normal\"");
ctx.fontKerning = "Auto";
_assertSame(ctx.fontKerning, "normal", "ctx.fontKerning", "\"normal\"");
ctx.fontKerning = "auto";
ctx.fontKerning = "noRmal";
_assertSame(ctx.fontKerning, "Normal", "ctx.fontKerning", "\"Normal\"");
ctx.fontKerning = "Auto";
_assertSame(ctx.fontKerning, "normal", "ctx.fontKerning", "\"normal\"");
ctx.fontKerning = "auto";
ctx.fontKerning = "NoRMal";
_assertSame(ctx.fontKerning, "Normal", "ctx.fontKerning", "\"Normal\"");
ctx.fontKerning = "Auto";
_assertSame(ctx.fontKerning, "normal", "ctx.fontKerning", "\"normal\"");
ctx.fontKerning = "auto";
ctx.fontKerning = "NORMAL";
_assertSame(ctx.fontKerning, "Normal", "ctx.fontKerning", "\"Normal\"");
_assertSame(ctx.fontKerning, "normal", "ctx.fontKerning", "\"normal\"");

ctx.fontKerning = "None";
_assertSame(ctx.fontKerning, "None", "ctx.fontKerning", "\"None\"");
ctx.fontKerning = "Auto";
_assertSame(ctx.fontKerning, "none", "ctx.fontKerning", "\"none\"");
ctx.fontKerning = "auto";
ctx.fontKerning = "none";
_assertSame(ctx.fontKerning, "None", "ctx.fontKerning", "\"None\"");
ctx.fontKerning = "Auto";
_assertSame(ctx.fontKerning, "none", "ctx.fontKerning", "\"none\"");
ctx.fontKerning = "auto";
ctx.fontKerning = "nOne";
_assertSame(ctx.fontKerning, "None", "ctx.fontKerning", "\"None\"");
ctx.fontKerning = "Auto";
_assertSame(ctx.fontKerning, "none", "ctx.fontKerning", "\"none\"");
ctx.fontKerning = "auto";
ctx.fontKerning = "nonE";
_assertSame(ctx.fontKerning, "None", "ctx.fontKerning", "\"None\"");
ctx.fontKerning = "Auto";
_assertSame(ctx.fontKerning, "none", "ctx.fontKerning", "\"none\"");
ctx.fontKerning = "auto";
ctx.fontKerning = "NONE";
_assertSame(ctx.fontKerning, "None", "ctx.fontKerning", "\"None\"");
_assertSame(ctx.fontKerning, "none", "ctx.fontKerning", "\"none\"");
t.done();

});
Expand Down
38 changes: 19 additions & 19 deletions html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.with.uppercase.worker.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,36 @@ t.step(function() {
var offscreenCanvas = new OffscreenCanvas(100, 50);
var ctx = offscreenCanvas.getContext('2d');

_assertSame(ctx.fontKerning, "Auto", "ctx.fontKerning", "\"Auto\"");
_assertSame(ctx.fontKerning, "auto", "ctx.fontKerning", "\"auto\"");
ctx.fontKerning = "Normal";
_assertSame(ctx.fontKerning, "Normal", "ctx.fontKerning", "\"Normal\"");
ctx.fontKerning = "Auto";
_assertSame(ctx.fontKerning, "normal", "ctx.fontKerning", "\"normal\"");
ctx.fontKerning = "auto";
ctx.fontKerning = "normal";
_assertSame(ctx.fontKerning, "Normal", "ctx.fontKerning", "\"Normal\"");
ctx.fontKerning = "Auto";
_assertSame(ctx.fontKerning, "normal", "ctx.fontKerning", "\"normal\"");
ctx.fontKerning = "auto";
ctx.fontKerning = "noRmal";
_assertSame(ctx.fontKerning, "Normal", "ctx.fontKerning", "\"Normal\"");
ctx.fontKerning = "Auto";
_assertSame(ctx.fontKerning, "normal", "ctx.fontKerning", "\"normal\"");
ctx.fontKerning = "auto";
ctx.fontKerning = "NoRMal";
_assertSame(ctx.fontKerning, "Normal", "ctx.fontKerning", "\"Normal\"");
ctx.fontKerning = "Auto";
_assertSame(ctx.fontKerning, "normal", "ctx.fontKerning", "\"normal\"");
ctx.fontKerning = "auto";
ctx.fontKerning = "NORMAL";
_assertSame(ctx.fontKerning, "Normal", "ctx.fontKerning", "\"Normal\"");
_assertSame(ctx.fontKerning, "normal", "ctx.fontKerning", "\"normal\"");

ctx.fontKerning = "None";
_assertSame(ctx.fontKerning, "None", "ctx.fontKerning", "\"None\"");
ctx.fontKerning = "Auto";
_assertSame(ctx.fontKerning, "none", "ctx.fontKerning", "\"none\"");
ctx.fontKerning = "auto";
ctx.fontKerning = "none";
_assertSame(ctx.fontKerning, "None", "ctx.fontKerning", "\"None\"");
ctx.fontKerning = "Auto";
_assertSame(ctx.fontKerning, "none", "ctx.fontKerning", "\"none\"");
ctx.fontKerning = "auto";
ctx.fontKerning = "nOne";
_assertSame(ctx.fontKerning, "None", "ctx.fontKerning", "\"None\"");
ctx.fontKerning = "Auto";
_assertSame(ctx.fontKerning, "none", "ctx.fontKerning", "\"none\"");
ctx.fontKerning = "auto";
ctx.fontKerning = "nonE";
_assertSame(ctx.fontKerning, "None", "ctx.fontKerning", "\"None\"");
ctx.fontKerning = "Auto";
_assertSame(ctx.fontKerning, "none", "ctx.fontKerning", "\"none\"");
ctx.fontKerning = "auto";
ctx.fontKerning = "NONE";
_assertSame(ctx.fontKerning, "None", "ctx.fontKerning", "\"None\"");
_assertSame(ctx.fontKerning, "none", "ctx.fontKerning", "\"none\"");
t.done();

});
Expand Down
10 changes: 5 additions & 5 deletions html/canvas/offscreen/text/2d.text.drawing.style.fontKerning.worker.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ t.step(function() {
var offscreenCanvas = new OffscreenCanvas(100, 50);
var ctx = offscreenCanvas.getContext('2d');

_assertSame(ctx.fontKerning, "Auto", "ctx.fontKerning", "\"Auto\"");
ctx.fontKerning = "Normal";
_assertSame(ctx.fontKerning, "Normal", "ctx.fontKerning", "\"Normal\"");
_assertSame(ctx.fontKerning, "auto", "ctx.fontKerning", "\"auto\"");
ctx.fontKerning = "normal";
_assertSame(ctx.fontKerning, "normal", "ctx.fontKerning", "\"normal\"");
width_normal = ctx.measureText("TAWATAVA").width;
ctx.fontKerning = "None";
_assertSame(ctx.fontKerning, "None", "ctx.fontKerning", "\"None\"");
ctx.fontKerning = "none";
_assertSame(ctx.fontKerning, "none", "ctx.fontKerning", "\"none\"");
width_none = ctx.measureText("TAWATAVA").width;
_assert(width_normal < width_none, "width_normal < width_none");
t.done();
Expand Down
Loading

0 comments on commit e2a08cb

Please sign in to comment.