From 561dd52fd9dd09d1b3c671a08d82f01a98866b1f Mon Sep 17 00:00:00 2001 From: Yi Xu Date: Thu, 29 Jul 2021 00:06:19 +0000 Subject: [PATCH] Rename Canvas2D.textWordSpacing to Canvas2D.wordSpacing Per discussion in https://github.com/w3ctag/design-reviews/issues/627, we have agreed to remove text prefix for attribute textWordSpacing. So that thee attribute name wordSpacing follows the same naming conversion of other text attributes. Bug: 1233706 Change-Id: Ic735c7c4617572511fd37fe0928f8919e7fd3f69 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3056391 Reviewed-by: Bo Reviewed-by: Aaron Krajeski Commit-Queue: Yi Xu Cr-Commit-Position: refs/heads/master@{#906470} --- .../global-interface-listing-expected.txt | 8 ++--- .../canvas2d/base_rendering_context_2d.cc | 4 +-- .../canvas2d/base_rendering_context_2d.h | 2 +- .../canvas2d/canvas_rendering_context_2d.cc | 4 +-- .../canvas2d/canvas_rendering_context_2d.h | 2 +- .../canvas2d/canvas_rendering_context_2d.idl | 2 +- .../canvas_rendering_context_2d_state.cc | 4 +-- .../canvas_rendering_context_2d_state.h | 4 +-- .../offscreen_canvas_rendering_context_2d.cc | 4 +-- .../offscreen_canvas_rendering_context_2d.h | 2 +- .../offscreen_canvas_rendering_context_2d.idl | 2 +- ....text.drawing.style.nonfinite.spacing.html | 6 ++-- .../2d.text.drawing.style.spacing.html | 12 ++++---- ...2d.text.drawing.style.spacing.measure.html | 12 ++++---- ....text.drawing.style.nonfinite.spacing.html | 6 ++-- ....drawing.style.nonfinite.spacing.worker.js | 6 ++-- .../text/2d.text.drawing.style.spacing.html | 12 ++++---- ...2d.text.drawing.style.spacing.measure.html | 12 ++++---- ...xt.drawing.style.spacing.measure.worker.js | 12 ++++---- .../2d.text.drawing.style.spacing.worker.js | 12 ++++---- .../element/drawing-text-to-the-canvas.yaml | 30 +++++++++---------- .../canvas/tools/yaml/offscreen/text.yaml | 30 +++++++++---------- ...lude=(Document_Window_HTML._)-expected.txt | 8 ++--- .../html/dom/idlharness.worker-expected.txt | 4 +-- ...-text-drawing-style-letterWordSpacing.html | 10 +++---- ...erface-listing-service-worker-expected.txt | 4 +-- ...face-listing-dedicated-worker-expected.txt | 4 +-- .../global-interface-listing-expected.txt | 8 ++--- ...terface-listing-shared-worker-expected.txt | 4 +-- 29 files changed, 115 insertions(+), 115 deletions(-) diff --git a/android_webview/tools/system_webview_shell/test/data/webexposed/global-interface-listing-expected.txt b/android_webview/tools/system_webview_shell/test/data/webexposed/global-interface-listing-expected.txt index 5321fa521930ae..bbc937f22786c1 100644 --- a/android_webview/tools/system_webview_shell/test/data/webexposed/global-interface-listing-expected.txt +++ b/android_webview/tools/system_webview_shell/test/data/webexposed/global-interface-listing-expected.txt @@ -704,7 +704,7 @@ interface CanvasRenderingContext2D getter textBaseline getter textLetterSpacing getter textRendering - getter textWordSpacing + getter wordSpacing method arc method arcTo method beginPath @@ -773,7 +773,7 @@ interface CanvasRenderingContext2D setter textBaseline setter textLetterSpacing setter textRendering - setter textWordSpacing + setter wordSpacing interface ChannelMergerNode : AudioNode attribute @@toStringTag method constructor @@ -4262,7 +4262,7 @@ interface OffscreenCanvasRenderingContext2D getter textAlign getter textLetterSpacing getter textRendering - getter textWordSpacing + getter wordSpacing getter textBaseline method arc method arcTo @@ -4330,7 +4330,7 @@ interface OffscreenCanvasRenderingContext2D setter textBaseline setter textLetterSpacing setter textRendering - setter textWordSpacing + setter wordSpacing interface Option attribute @@toStringTag getter defaultSelected diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc index d33ffcf8609e61..5d8a3cbe87d75f 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc @@ -2408,8 +2408,8 @@ double BaseRenderingContext2D::textLetterSpacing() const { return GetState().GetTextLetterSpacing(); } -double BaseRenderingContext2D::textWordSpacing() const { - return GetState().GetTextWordSpacing(); +double BaseRenderingContext2D::wordSpacing() const { + return GetState().GetWordSpacing(); } String BaseRenderingContext2D::textRendering() const { diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h index 3cff8a8d08d2dd..da62d250d743a9 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h @@ -328,7 +328,7 @@ class MODULES_EXPORT BaseRenderingContext2D : public GarbageCollectedMixin, void setTextBaseline(const String&); double textLetterSpacing() const; - double textWordSpacing() const; + double wordSpacing() const; String textRendering() const; String fontKerning() const; diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc index aa248fa99914c9..cfe1ccc60910a8 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc @@ -798,7 +798,7 @@ void CanvasRenderingContext2D::setTextLetterSpacing( Host()->GetFontSelector()); } -void CanvasRenderingContext2D::setTextWordSpacing(const double word_spacing) { +void CanvasRenderingContext2D::setWordSpacing(const double word_spacing) { if (UNLIKELY(!std::isfinite(word_spacing))) return; @@ -806,7 +806,7 @@ void CanvasRenderingContext2D::setTextWordSpacing(const double word_spacing) { setFont(font()); float word_spacing_float = clampTo(word_spacing); - GetState().SetTextWordSpacing(word_spacing_float, Host()->GetFontSelector()); + GetState().SetWordSpacing(word_spacing_float, Host()->GetFontSelector()); } void CanvasRenderingContext2D::setTextRendering( diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.h b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.h index 9886c564412edc..31c2f688a41016 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.h +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.h @@ -125,7 +125,7 @@ class MODULES_EXPORT CanvasRenderingContext2D final void setDirection(const String&); void setTextLetterSpacing(const double letter_spacing); - void setTextWordSpacing(const double word_spacing); + void setWordSpacing(const double word_spacing); void setTextRendering(const String&); void setFontKerning(const String&); diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl index 1cb922800bef34..33dbfa98d670d9 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl @@ -183,7 +183,7 @@ interface CanvasRenderingContext2D { [RuntimeEnabled=NewCanvas2DAPI] attribute DOMString fontVariantCaps; // "normal", "small-caps", "all-small-caps", "petite-caps", "all-petite-caps", "unicase", "titling-caps" (default: "normal") [RuntimeEnabled=NewCanvas2DAPI] attribute unrestricted double textLetterSpacing; // length in pixel (default: 0) [RuntimeEnabled=NewCanvas2DAPI] attribute DOMString textRendering; // "auto", "optimizeSpeed", "optimizeLegibility", "geometricPrecision" (default: auto) - [RuntimeEnabled=NewCanvas2DAPI] attribute unrestricted double textWordSpacing; // length in pixel (default: 0) + [RuntimeEnabled=NewCanvas2DAPI] attribute unrestricted double wordSpacing; // length in pixel (default: 0) }; CanvasRenderingContext2D includes CanvasPath; diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d_state.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d_state.cc index ac724972b8b48c..ee9d0e397ec979 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d_state.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d_state.cc @@ -749,8 +749,8 @@ void CanvasRenderingContext2DState::SetTextLetterSpacing( SetFont(font_description, selector); } -void CanvasRenderingContext2DState::SetTextWordSpacing(float word_spacing, - FontSelector* selector) { +void CanvasRenderingContext2DState::SetWordSpacing(float word_spacing, + FontSelector* selector) { DCHECK(realized_font_); FontDescription font_description(GetFontDescription()); font_description.SetWordSpacing(word_spacing); diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d_state.h b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d_state.h index 19917166539eec..b01b2e03fbeb4b 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d_state.h +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d_state.h @@ -145,8 +145,8 @@ class CanvasRenderingContext2DState final void SetTextLetterSpacing(float letter_space, FontSelector* selector); float GetTextLetterSpacing() const { return letter_spacing_; } - void SetTextWordSpacing(float word_space, FontSelector* selector); - float GetTextWordSpacing() const { return word_spacing_; } + void SetWordSpacing(float word_space, FontSelector* selector); + float GetWordSpacing() const { return word_spacing_; } void SetTextRendering(TextRenderingMode text_rendering, FontSelector* selector); diff --git a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.cc index 97d13c429d76df..223a4e2e626cf5 100644 --- a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.cc @@ -486,7 +486,7 @@ void OffscreenCanvasRenderingContext2D::setTextLetterSpacing( Host()->GetFontSelector()); } -void OffscreenCanvasRenderingContext2D::setTextWordSpacing( +void OffscreenCanvasRenderingContext2D::setWordSpacing( const double word_spacing) { if (UNLIKELY(!std::isfinite(word_spacing))) return; @@ -495,7 +495,7 @@ void OffscreenCanvasRenderingContext2D::setTextWordSpacing( setFont(font()); float word_spacing_float = clampTo(word_spacing); - GetState().SetTextWordSpacing(word_spacing_float, Host()->GetFontSelector()); + GetState().SetWordSpacing(word_spacing_float, Host()->GetFontSelector()); } void OffscreenCanvasRenderingContext2D::setTextRendering( diff --git a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.h b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.h index 2a5e9e37d444bc..3b908ec901fed8 100644 --- a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.h +++ b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.h @@ -85,7 +85,7 @@ class MODULES_EXPORT OffscreenCanvasRenderingContext2D final void setDirection(const String&); void setTextLetterSpacing(const double letter_spacing); - void setTextWordSpacing(const double word_spacing); + void setWordSpacing(const double word_spacing); void setTextRendering(const String&); void setFontKerning(const String&); void setFontStretch(const String&); diff --git a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl index d710e166a8587e..cc98f39d313dc9 100644 --- a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl +++ b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl @@ -124,7 +124,7 @@ [RuntimeEnabled=NewCanvas2DAPI] attribute DOMString fontVariantCaps; // "normal", "small-caps", "all-small-caps", "petite-caps", "all-petite-caps", "unicase", "titling-caps" (default: "normal") [RuntimeEnabled=NewCanvas2DAPI] attribute unrestricted double textLetterSpacing; // length in pixel (default: 0) [RuntimeEnabled=NewCanvas2DAPI] attribute DOMString textRendering; // "auto", "optimizeSpeed", "optimizeLegibility", "geometricPrecision" (default: auto) - [RuntimeEnabled=NewCanvas2DAPI] attribute unrestricted double textWordSpacing; // length in pixel (default: 0) + [RuntimeEnabled=NewCanvas2DAPI] attribute unrestricted double wordSpacing; // length in pixel (default: 0) }; OffscreenCanvasRenderingContext2D includes CanvasPath; diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.nonfinite.spacing.html b/third_party/blink/web_tests/external/wpt/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.nonfinite.spacing.html index f4741eae34c45c..be085ebfa8f4b8 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.nonfinite.spacing.html +++ b/third_party/blink/web_tests/external/wpt/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/third_party/blink/web_tests/external/wpt/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.spacing.html b/third_party/blink/web_tests/external/wpt/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.spacing.html index 67092690ed37ba..b65971280bb120 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.spacing.html +++ b/third_party/blink/web_tests/external/wpt/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/third_party/blink/web_tests/external/wpt/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.spacing.measure.html b/third_party/blink/web_tests/external/wpt/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.spacing.measure.html index d4f0faa983cb8c..b4b4c66fd8a15f 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/element/drawing-text-to-the-canvas/2d.text.drawing.style.spacing.measure.html +++ b/third_party/blink/web_tests/external/wpt/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/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.html index 521d7c4773a599..cc2d2d5580b40c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.html +++ b/third_party/blink/web_tests/external/wpt/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/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.worker.js index a83682af16545f..101378bece9f64 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.nonfinite.spacing.worker.js +++ b/third_party/blink/web_tests/external/wpt/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/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.spacing.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.spacing.html index 512ed7157c86e3..d1db23fdfe283c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.spacing.html +++ b/third_party/blink/web_tests/external/wpt/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/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.spacing.measure.html b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.spacing.measure.html index fd6638d8c703b4..91f446b737efd1 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.spacing.measure.html +++ b/third_party/blink/web_tests/external/wpt/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/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.spacing.measure.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.spacing.measure.worker.js index 3a787b755cf538..a514bbdfe3f753 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.spacing.measure.worker.js +++ b/third_party/blink/web_tests/external/wpt/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/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.spacing.worker.js b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.spacing.worker.js index 1dac9f5c1f3499..e6855c1838e6f7 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/text/2d.text.drawing.style.spacing.worker.js +++ b/third_party/blink/web_tests/external/wpt/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/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/element/drawing-text-to-the-canvas.yaml b/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/element/drawing-text-to-the-canvas.yaml index d53138d6d1d6db..6d871592fa910a 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/element/drawing-text-to-the-canvas.yaml +++ b/third_party/blink/web_tests/external/wpt/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/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/text.yaml b/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/text.yaml index 255a79be641c8e..df4cc1c307d87c 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/tools/yaml/offscreen/text.yaml +++ b/third_party/blink/web_tests/external/wpt/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; diff --git a/third_party/blink/web_tests/external/wpt/html/dom/idlharness.https_exclude=(Document_Window_HTML._)-expected.txt b/third_party/blink/web_tests/external/wpt/html/dom/idlharness.https_exclude=(Document_Window_HTML._)-expected.txt index 8332c36691dc89..de79a04477dbd5 100644 --- a/third_party/blink/web_tests/external/wpt/html/dom/idlharness.https_exclude=(Document_Window_HTML._)-expected.txt +++ b/third_party/blink/web_tests/external/wpt/html/dom/idlharness.https_exclude=(Document_Window_HTML._)-expected.txt @@ -1,5 +1,5 @@ This is a testharness.js-based test. -Found 1445 tests; 1414 PASS, 31 FAIL, 0 TIMEOUT, 0 NOTRUN. +Found 1445 tests; 1411 PASS, 34 FAIL, 0 TIMEOUT, 0 NOTRUN. PASS idl_test setup PASS idl_test validation PASS Partial interface Document: original interface defined @@ -496,7 +496,7 @@ PASS CanvasRenderingContext2D interface: attribute textAlign PASS CanvasRenderingContext2D interface: attribute textBaseline PASS CanvasRenderingContext2D interface: attribute direction PASS CanvasRenderingContext2D interface: attribute textLetterSpacing -PASS CanvasRenderingContext2D interface: attribute textWordSpacing +FAIL CanvasRenderingContext2D interface: attribute textWordSpacing assert_true: The prototype object must have a property "textWordSpacing" expected true got false PASS CanvasRenderingContext2D interface: attribute fontKerning PASS CanvasRenderingContext2D interface: attribute fontStretch PASS CanvasRenderingContext2D interface: attribute fontVariantCaps @@ -618,7 +618,7 @@ PASS CanvasRenderingContext2D interface: document.createElement("canvas").getCon PASS CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "textBaseline" with the proper type PASS CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "direction" with the proper type PASS CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "textLetterSpacing" with the proper type -PASS CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "textWordSpacing" with the proper type +FAIL CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "textWordSpacing" with the proper type assert_inherits: property "textWordSpacing" not found in prototype chain PASS CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "fontKerning" with the proper type PASS CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "fontStretch" with the proper type PASS CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "fontVariantCaps" with the proper type @@ -794,7 +794,7 @@ PASS OffscreenCanvasRenderingContext2D interface: attribute textAlign PASS OffscreenCanvasRenderingContext2D interface: attribute textBaseline PASS OffscreenCanvasRenderingContext2D interface: attribute direction PASS OffscreenCanvasRenderingContext2D interface: attribute textLetterSpacing -PASS OffscreenCanvasRenderingContext2D interface: attribute textWordSpacing +FAIL OffscreenCanvasRenderingContext2D interface: attribute textWordSpacing assert_true: The prototype object must have a property "textWordSpacing" expected true got false PASS OffscreenCanvasRenderingContext2D interface: attribute fontKerning PASS OffscreenCanvasRenderingContext2D interface: attribute fontStretch PASS OffscreenCanvasRenderingContext2D interface: attribute fontVariantCaps diff --git a/third_party/blink/web_tests/external/wpt/html/dom/idlharness.worker-expected.txt b/third_party/blink/web_tests/external/wpt/html/dom/idlharness.worker-expected.txt index 4900aac24c67d5..10ce0c3c39da77 100644 --- a/third_party/blink/web_tests/external/wpt/html/dom/idlharness.worker-expected.txt +++ b/third_party/blink/web_tests/external/wpt/html/dom/idlharness.worker-expected.txt @@ -1,5 +1,5 @@ This is a testharness.js-based test. -Found 805 tests; 797 PASS, 8 FAIL, 0 TIMEOUT, 0 NOTRUN. +Found 805 tests; 796 PASS, 9 FAIL, 0 TIMEOUT, 0 NOTRUN. PASS idl_test setup PASS idl_test validation PASS Partial interface Document: original interface defined @@ -402,7 +402,7 @@ PASS OffscreenCanvasRenderingContext2D interface: attribute textAlign PASS OffscreenCanvasRenderingContext2D interface: attribute textBaseline PASS OffscreenCanvasRenderingContext2D interface: attribute direction PASS OffscreenCanvasRenderingContext2D interface: attribute textLetterSpacing -PASS OffscreenCanvasRenderingContext2D interface: attribute textWordSpacing +FAIL OffscreenCanvasRenderingContext2D interface: attribute textWordSpacing assert_true: The prototype object must have a property "textWordSpacing" expected true got false PASS OffscreenCanvasRenderingContext2D interface: attribute fontKerning PASS OffscreenCanvasRenderingContext2D interface: attribute fontStretch PASS OffscreenCanvasRenderingContext2D interface: attribute fontVariantCaps diff --git a/third_party/blink/web_tests/fast/canvas/canvas-text-drawing-style-letterWordSpacing.html b/third_party/blink/web_tests/fast/canvas/canvas-text-drawing-style-letterWordSpacing.html index 94123bdb222984..3af3ef66122c99 100644 --- a/third_party/blink/web_tests/fast/canvas/canvas-text-drawing-style-letterWordSpacing.html +++ b/third_party/blink/web_tests/fast/canvas/canvas-text-drawing-style-letterWordSpacing.html @@ -7,15 +7,15 @@ // Verify initial values: assert_equals(ctx.textLetterSpacing, 0); - assert_equals(ctx.textWordSpacing, 0); + assert_equals(ctx.wordSpacing, 0); ctx.textLetterSpacing = 3; assert_equals(ctx.textLetterSpacing, 3); - assert_equals(ctx.textWordSpacing, 0); - ctx.textWordSpacing = 5; + assert_equals(ctx.wordSpacing, 0); + ctx.wordSpacing = 5; assert_equals(ctx.textLetterSpacing, 3); - assert_equals(ctx.textWordSpacing, 5); + assert_equals(ctx.wordSpacing, 5); -}, "Test basic functionality of textLetterSpacing and textWordSpacing."); +}, "Test basic functionality of textLetterSpacing and wordSpacing."); diff --git a/third_party/blink/web_tests/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt b/third_party/blink/web_tests/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt index b5a4908bcf22c1..234c534d1e2dcc 100644 --- a/third_party/blink/web_tests/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt +++ b/third_party/blink/web_tests/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt @@ -1011,7 +1011,7 @@ interface OffscreenCanvasRenderingContext2D getter textBaseline getter textLetterSpacing getter textRendering - getter textWordSpacing + getter wordSpacing method arc method arcTo method beginLayer @@ -1087,7 +1087,7 @@ interface OffscreenCanvasRenderingContext2D setter textBaseline setter textLetterSpacing setter textRendering - setter textWordSpacing + setter wordSpacing interface Path2D attribute @@toStringTag method addPath diff --git a/third_party/blink/web_tests/webexposed/global-interface-listing-dedicated-worker-expected.txt b/third_party/blink/web_tests/webexposed/global-interface-listing-dedicated-worker-expected.txt index 4012bf329884b3..6cd2430f9a69bf 100644 --- a/third_party/blink/web_tests/webexposed/global-interface-listing-dedicated-worker-expected.txt +++ b/third_party/blink/web_tests/webexposed/global-interface-listing-dedicated-worker-expected.txt @@ -1058,7 +1058,7 @@ Starting worker: resources/global-interface-listing-worker.js [Worker] getter textBaseline [Worker] getter textLetterSpacing [Worker] getter textRendering -[Worker] getter textWordSpacing +[Worker] getter wordSpacing [Worker] method arc [Worker] method arcTo [Worker] method beginLayer @@ -1134,7 +1134,7 @@ Starting worker: resources/global-interface-listing-worker.js [Worker] setter textBaseline [Worker] setter textLetterSpacing [Worker] setter textRendering -[Worker] setter textWordSpacing +[Worker] setter wordSpacing [Worker] interface Path2D [Worker] attribute @@toStringTag [Worker] method addPath diff --git a/third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt b/third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt index b19ef5cfb653f8..9c10dfb0d407f4 100644 --- a/third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt +++ b/third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt @@ -1109,7 +1109,7 @@ interface CanvasRenderingContext2D getter textBaseline getter textLetterSpacing getter textRendering - getter textWordSpacing + getter wordSpacing method addHitRegion method arc method arcTo @@ -1191,7 +1191,7 @@ interface CanvasRenderingContext2D setter textBaseline setter textLetterSpacing setter textRendering - setter textWordSpacing + setter wordSpacing interface CaptureHandleChangeEvent : Event attribute @@toStringTag method captureHandle @@ -5962,7 +5962,7 @@ interface OffscreenCanvasRenderingContext2D getter textBaseline getter textLetterSpacing getter textRendering - getter textWordSpacing + getter wordSpacing method arc method arcTo method beginLayer @@ -6038,7 +6038,7 @@ interface OffscreenCanvasRenderingContext2D setter textBaseline setter textLetterSpacing setter textRendering - setter textWordSpacing + setter wordSpacing interface Option attribute @@toStringTag getter defaultSelected diff --git a/third_party/blink/web_tests/webexposed/global-interface-listing-shared-worker-expected.txt b/third_party/blink/web_tests/webexposed/global-interface-listing-shared-worker-expected.txt index 09829a21f85492..caef66cbdeb995 100644 --- a/third_party/blink/web_tests/webexposed/global-interface-listing-shared-worker-expected.txt +++ b/third_party/blink/web_tests/webexposed/global-interface-listing-shared-worker-expected.txt @@ -931,7 +931,7 @@ Starting worker: resources/global-interface-listing-worker.js [Worker] getter textBaseline [Worker] getter textLetterSpacing [Worker] getter textRendering -[Worker] getter textWordSpacing +[Worker] getter wordSpacing [Worker] method arc [Worker] method arcTo [Worker] method beginLayer @@ -1007,7 +1007,7 @@ Starting worker: resources/global-interface-listing-worker.js [Worker] setter textBaseline [Worker] setter textLetterSpacing [Worker] setter textRendering -[Worker] setter textWordSpacing +[Worker] setter wordSpacing [Worker] interface Path2D [Worker] attribute @@toStringTag [Worker] method addPath