This repository was archived by the owner on Feb 25, 2025. It is now read-only.
[web] roll CanvasKit 0.36.1 (attempt 3) #36005
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # Specifies the version of CanvasKit to use for Flutter Web apps. | ||
| # | ||
| # See `lib/web_ui/README.md` for how to update this file. | ||
| canvaskit_version: "0.36.1" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,6 +10,7 @@ import 'package:test/test.dart'; | |
|
|
||
| import 'package:ui/src/engine.dart'; | ||
| import 'package:ui/ui.dart' as ui; | ||
| import 'package:web_engine_tester/golden_tester.dart'; | ||
|
|
||
| import '../matchers.dart'; | ||
| import 'common.dart'; | ||
|
|
@@ -49,7 +50,9 @@ void testMain() { | |
| _matrix4x4CompositionTests(); | ||
| _toSkRectTests(); | ||
| _skVerticesTests(); | ||
| group('SkParagraph', () { | ||
| _paragraphTests(); | ||
| }); | ||
| group('SkPath', () { | ||
| _pathTests(); | ||
| }); | ||
|
|
@@ -1447,31 +1450,36 @@ void _textStyleTests() { | |
| } | ||
|
|
||
| void _paragraphTests() { | ||
| setUpAll(() async { | ||
| CanvasKitRenderer.instance.fontCollection.debugRegisterTestFonts(); | ||
| await CanvasKitRenderer.instance.fontCollection.ensureFontsLoaded(); | ||
| }); | ||
|
|
||
| // This test is just a kitchen sink that blasts CanvasKit with all paragraph | ||
| // properties all at once, making sure CanvasKit doesn't choke on anything. | ||
| // In particular, this tests that our JS bindings are correct, such as that | ||
| // arguments are of acceptable types and passed in the correct order. | ||
| test('kitchensink', () async { | ||
| final SkParagraphStyleProperties props = SkParagraphStyleProperties(); | ||
| props.textAlign = canvasKit.TextAlign.Left; | ||
| props.textDirection = canvasKit.TextDirection.RTL; | ||
| props.heightMultiplier = 3; | ||
| props.textHeightBehavior = canvasKit.TextHeightBehavior.All; | ||
| props.maxLines = 4; | ||
| props.ellipsis = '___'; | ||
| props.textStyle = SkTextStyleProperties() | ||
| ..backgroundColor = Float32List.fromList(<double>[0.2, 0, 0, 0.5]) | ||
| ..color = Float32List.fromList(<double>[0, 1, 0, 1]) | ||
| ..foregroundColor = Float32List.fromList(<double>[1, 0, 1, 1]) | ||
| ..decoration = 0x2 | ||
| ..decorationThickness = 2.0 | ||
| ..decorationColor = Float32List.fromList(<double>[13, 14, 15, 16]) | ||
| ..decorationStyle = canvasKit.DecorationStyle.Dotted | ||
| ..textBaseline = canvasKit.TextBaseline.Ideographic | ||
| ..fontSize = 48 | ||
|
There was a problem hiding this comment. Why these changes in fontSize, heightMultiplier and others? (I understand the colors were maybe invalid before, but the rest?) There was a problem hiding this comment. I made this test a golden test. Previously the text we rendered was complete nonsense. Now it is displaying something reasonable: https://flutter-engine-gold.skia.org/diff?test=paragraph_kitchen_sink&left=c8f1c90d490826fdbcaf4e2a4762fc76&right=eb3fc116f84bdf3e401fe0345ccde4f3 |
||
| ..letterSpacing = 5 | ||
| ..wordSpacing = 10 | ||
| ..heightMultiplier = 1.3 | ||
| ..halfLeading = true | ||
| ..locale = 'en_CA' | ||
| ..fontFamilies = <String>['Roboto', 'serif'] | ||
|
|
@@ -1486,23 +1494,24 @@ void _paragraphTests() { | |
| SkFontFeature() | ||
| ..name = 'tnum' | ||
| ..value = 1, | ||
| ] | ||
| ; | ||
| props.strutStyle = SkStrutStyleProperties() | ||
| ..fontFamilies = <String>['Roboto', 'Noto'] | ||
| ..fontStyle = (SkFontStyle() | ||
| ..slant = canvasKit.FontSlant.Italic | ||
| ..weight = canvasKit.FontWeight.Bold) | ||
| ..fontSize = 72 | ||
| ..heightMultiplier = 1.5 | ||
| ..halfLeading = true | ||
| ..leading = 0 | ||
| ..strutEnabled = true | ||
| ..forceStrutHeight = false; | ||
|
|
||
| final SkParagraphStyle paragraphStyle = canvasKit.ParagraphStyle(props); | ||
| final SkParagraphBuilder builder = canvasKit.ParagraphBuilder.MakeFromFontProvider( | ||
| paragraphStyle, | ||
| CanvasKitRenderer.instance.fontCollection.fontProvider, | ||
| ); | ||
|
|
||
| builder.addText('Hello'); | ||
|
|
@@ -1513,51 +1522,93 @@ void _paragraphTests() { | |
| canvasKit.TextBaseline.Ideographic, | ||
| 4.0, | ||
| ); | ||
| builder.pushStyle(canvasKit.TextStyle(SkTextStyleProperties() | ||
| ..color = Float32List.fromList(<double>[1, 0, 0, 1]) | ||
| ..fontSize = 24 | ||
| ..fontFamilies = <String>['Roboto', 'serif'] | ||
| )); | ||
| builder.addText('World'); | ||
| builder.pop(); | ||
| builder.pushPaintStyle( | ||
| canvasKit.TextStyle(SkTextStyleProperties() | ||
| ..color = Float32List.fromList(<double>[1, 0, 0, 1]) | ||
| ..fontSize = 60 | ||
| ..fontFamilies = <String>['Roboto', 'serif'] | ||
| ), | ||
| SkPaint()..setColorInt(0xFF0000FF), | ||
| SkPaint()..setColorInt(0xFFFF0000), | ||
| ); | ||
| builder.addText('!'); | ||
| builder.pop(); | ||
| builder.pushStyle( | ||
| canvasKit.TextStyle(SkTextStyleProperties()..halfLeading = true)); | ||
| builder.pop(); | ||
| final SkParagraph paragraph = builder.build(); | ||
| paragraph.layout(500); | ||
|
|
||
| final DomCanvasElement canvas = createDomCanvasElement( | ||
| width: 400, | ||
| height: 160, | ||
| ); | ||
| domDocument.body!.append(canvas); | ||
|
|
||
| // TODO(yjbanov): WebGL screenshot tests do not work on Firefox - https://github.com/flutter/flutter/issues/109265 | ||
| if (!isFirefox) { | ||
| final SkSurface surface = canvasKit.MakeWebGLCanvasSurface(canvas); | ||
| final SkCanvas skCanvas = surface.getCanvas(); | ||
| skCanvas.drawColorInt(0xFFCCCCCC, toSkBlendMode(ui.BlendMode.srcOver)); | ||
| skCanvas.drawParagraph(paragraph, 20, 20); | ||
| skCanvas.drawRect( | ||
| Float32List.fromList(<double>[20, 20, 20 + paragraph.getMaxIntrinsicWidth(), 20 + paragraph.getHeight()]), | ||
| SkPaint() | ||
| ..setStyle(toSkPaintStyle(ui.PaintingStyle.stroke)) | ||
| ..setStrokeWidth(1) | ||
| ..setColorInt(0xFF00FF00), | ||
| ); | ||
| surface.flush(); | ||
|
|
||
| await matchGoldenFile( | ||
| 'paragraph_kitchen_sink.png', | ||
| region: const ui.Rect.fromLTRB(0, 0, 400, 160), | ||
| maxDiffRatePercent: 0.0, | ||
| write: true, | ||
| ); | ||
| } | ||
|
|
||
| void expectAlmost(double actual, double expected) { | ||
| expect(actual, within<double>(distance: actual / 100, from: expected)); | ||
| } | ||
|
Comment on lines
+1578
to
+1580
There was a problem hiding this comment. Do you need your own implementation to validate this? There's already expect(actual, moreOrLessEquals(expected, epsilon: actual/100));(Also not sure about using There was a problem hiding this comment.
|
||
|
|
||
| expectAlmost(paragraph.getAlphabeticBaseline(), 85.5); | ||
| expect(paragraph.didExceedMaxLines(), isFalse); | ||
| expectAlmost(paragraph.getHeight(), 108); | ||
| expectAlmost(paragraph.getIdeographicBaseline(), 108); | ||
| expectAlmost(paragraph.getLongestLine(), 263); | ||
| expectAlmost(paragraph.getMaxIntrinsicWidth(), 263); | ||
| expectAlmost(paragraph.getMinIntrinsicWidth(), 135); | ||
| expectAlmost(paragraph.getMaxWidth(), 500); | ||
|
There was a problem hiding this comment. In this case, the width can be There was a problem hiding this comment. This whole test is just a smoke test. More precise text measurement tests are in dedicated files. So I'm not worried about the precision here. TBH I'd probably be happy if we just checked that the returned value is not null. That we are also checking for a specific value is a bonus. |
||
| expect( | ||
| paragraph.getRectsForRange(1, 3, canvasKit.RectHeightStyle.Tight, canvasKit.RectWidthStyle.Max).single, | ||
| hasLength(4), | ||
| ); | ||
| expect(paragraph.getRectsForPlaceholders(), hasLength(1)); | ||
| expect(paragraph.getLineMetrics(), hasLength(1)); | ||
|
|
||
| final SkLineMetrics lineMetrics = | ||
| paragraph.getLineMetrics().cast<SkLineMetrics>().single; | ||
| expectAlmost(lineMetrics.ascent, 55.6); | ||
| expectAlmost(lineMetrics.descent, 14.8); | ||
| expect(lineMetrics.isHardBreak, isTrue); | ||
| expectAlmost(lineMetrics.baseline, 85.5); | ||
| expectAlmost(lineMetrics.height, 108); | ||
| expectAlmost(lineMetrics.left, 2.5); | ||
| expectAlmost(lineMetrics.width, 263); | ||
| expect(lineMetrics.lineNumber, 0); | ||
|
|
||
| expect( | ||
| paragraph.getGlyphPositionAtCoordinate(5, 5).affinity, | ||
| canvasKit.Affinity.Upstream, | ||
| ); | ||
|
|
||
| // "Hello" | ||
| for (int i = 0; i < 5; i++) { | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.