Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 62275a0

Browse files
committed
fix licenses + fix types in some tests
1 parent 1e11b7f commit 62275a0

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

ci/licenses_golden/licenses_flutter

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,7 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/services/message_codecs.dart
526526
FILE: ../../../flutter/lib/web_ui/lib/src/engine/services/serialization.dart
527527
FILE: ../../../flutter/lib/web_ui/lib/src/engine/shadow.dart
528528
FILE: ../../../flutter/lib/web_ui/lib/src/engine/test_embedding.dart
529+
FILE: ../../../flutter/lib/web_ui/lib/src/engine/text/canvas_paragraph.dart
529530
FILE: ../../../flutter/lib/web_ui/lib/src/engine/text/font_collection.dart
530531
FILE: ../../../flutter/lib/web_ui/lib/src/engine/text/line_break_properties.dart
531532
FILE: ../../../flutter/lib/web_ui/lib/src/engine/text/line_breaker.dart

lib/web_ui/lib/src/engine/text/paragraph.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ abstract class EngineParagraph implements ui.Paragraph {
183183
/// Returns a DOM element that represents the entire paragraph and its
184184
/// children.
185185
///
186-
/// Generates a new DOM element on every invokation.
186+
/// Generates a new DOM element on every invocation.
187187
html.HtmlElement toDomElement();
188188
}
189189

lib/web_ui/test/text/measurement_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ void testMain() async {
6464
final ui.ParagraphStyle s3 = ui.ParagraphStyle(fontSize: 22.0);
6565

6666
ParagraphGeometricStyle style1, style2, style3;
67-
EngineParagraph style1Text1, style1Text2; // two paragraphs sharing style
68-
EngineParagraph style2Text1, style3Text3;
67+
DomParagraph style1Text1, style1Text2; // two paragraphs sharing style
68+
DomParagraph style2Text1, style3Text3;
6969

7070
setUp(() {
7171
style1Text1 = build(s1, '1');
@@ -481,7 +481,7 @@ void testMain() async {
481481
testMeasurements(
482482
'wraps multi-line text correctly when constraint width is infinite',
483483
(TextMeasurementService instance) {
484-
final EngineParagraph paragraph = build(ahemStyle, '123\n456 789');
484+
final DomParagraph paragraph = build(ahemStyle, '123\n456 789');
485485
final MeasurementResult result =
486486
instance.measure(paragraph, infiniteConstraints);
487487

lib/web_ui/test/text_test.dart

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ void testMain() async {
9696
fontSize: 14.0,
9797
));
9898
builder.addText('How do you do this fine morning?');
99-
final EngineParagraph paragraph = builder.build();
99+
final DomParagraph paragraph = builder.build();
100100

101101
expect(paragraph.paragraphElement.parent, isNull);
102102
expect(paragraph.height, 0.0);
@@ -162,7 +162,7 @@ void testMain() async {
162162
fontSize: 15.0,
163163
));
164164
builder.addText('hi');
165-
EngineParagraph paragraph = builder.build();
165+
DomParagraph paragraph = builder.build();
166166
expect(paragraph.plainText, isNotNull);
167167
expect(paragraph.geometricStyle.fontWeight, FontWeight.normal);
168168

@@ -189,7 +189,7 @@ void testMain() async {
189189
builder.addText('h');
190190
builder.pushStyle(TextStyle(fontWeight: FontWeight.bold));
191191
builder.addText('i');
192-
final EngineParagraph paragraph = builder.build();
192+
final DomParagraph paragraph = builder.build();
193193
expect(paragraph.plainText, isNull);
194194
expect(paragraph.geometricStyle.fontWeight, FontWeight.normal);
195195
});
@@ -202,7 +202,7 @@ void testMain() async {
202202
fontSize: 15.0,
203203
));
204204
builder.pushStyle(TextStyle(fontWeight: FontWeight.bold));
205-
final EngineParagraph paragraph = builder.build();
205+
final DomParagraph paragraph = builder.build();
206206
expect(paragraph.plainText, '');
207207
expect(paragraph.geometricStyle.fontWeight, FontWeight.bold);
208208
});
@@ -223,7 +223,7 @@ void testMain() async {
223223
builder.addText(secondSpanText);
224224
builder.pushStyle(TextStyle(fontStyle: FontStyle.italic));
225225
builder.addText('followed by a link');
226-
final EngineParagraph paragraph = builder.build();
226+
final DomParagraph paragraph = builder.build();
227227
paragraph.layout(const ParagraphConstraints(width: 800.0));
228228
expect(paragraph.plainText, isNull);
229229
const int secondSpanStartPosition = firstSpanText.length;
@@ -371,7 +371,7 @@ void testMain() async {
371371
builder.pushStyle(TextStyle(fontSize: 30.0, fontWeight: FontWeight.normal));
372372
const String secondSpanText = 'def';
373373
builder.addText(secondSpanText);
374-
final EngineParagraph paragraph = builder.build();
374+
final DomParagraph paragraph = builder.build();
375375
paragraph.layout(const ParagraphConstraints(width: 800.0));
376376
expect(paragraph.plainText, isNull);
377377
final List<SpanElement> spans =
@@ -396,7 +396,7 @@ void testMain() async {
396396

397397
builder.addText('Hello');
398398

399-
final EngineParagraph paragraph = builder.build();
399+
final DomParagraph paragraph = builder.build();
400400
expect(paragraph.paragraphElement.style.fontFamily,
401401
'SomeFont, $fallback, sans-serif');
402402

@@ -418,7 +418,7 @@ void testMain() async {
418418

419419
builder.addText('Hello');
420420

421-
final EngineParagraph paragraph = builder.build();
421+
final DomParagraph paragraph = builder.build();
422422
expect(paragraph.paragraphElement.style.fontFamily, 'serif');
423423

424424
debugEmulateFlutterTesterEnvironment = true;
@@ -435,7 +435,7 @@ void testMain() async {
435435

436436
builder.addText('Hello');
437437

438-
final EngineParagraph paragraph = builder.build();
438+
final DomParagraph paragraph = builder.build();
439439
expect(paragraph.paragraphElement.style.fontFamily,
440440
'"MyFont 2000", $fallback, sans-serif');
441441

0 commit comments

Comments
 (0)