DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[web] Fix regression in foreground style (flutter/engine#22999)

Browse Source
This commit is contained in:
Mouad Debbar 2020-12-10 16:30:09 -08:00 committed by GitHub
parent 0e4346c057
commit be382beadb
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/src/flutter/lib/web_ui/lib/src/engine/text/paragraph.dart
View File

@ -1328,7 +1328,7 @@ class DomParagraphBuilder implements ui.ParagraphBuilder {
/// paragraph. Plain text is more efficient to lay out and measure than rich
/// text.
EngineParagraph? _tryBuildPlainText() {
ui.Color color = _defaultTextColor;
ui.Color? color;
ui.TextDecoration? decoration;
ui.Color? decorationColor;
ui.TextDecorationStyle? decorationStyle;
@ -1416,6 +1416,10 @@ class DomParagraphBuilder implements ui.ParagraphBuilder {
i++;
}
if (color == null && foreground == null) {
color = _defaultTextColor;
}
final EngineTextStyle cumulativeStyle = EngineTextStyle(
color: color,
decoration: decoration,
@ -1443,7 +1447,7 @@ class DomParagraphBuilder implements ui.ParagraphBuilder {
paint = foreground;
} else {
paint = ui.Paint();
paint.color = color;
paint.color = color!;
}
if (i >= _ops.length) {

14
engine/src/flutter/lib/web_ui/test/paragraph_builder_test.dart
View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// @dart = 2.6
// @dart = 2.12
import 'package:test/bootstrap/browser.dart';
import 'package:test/test.dart';
import 'package:ui/src/engine.dart';
@ -28,10 +28,20 @@ void testMain() {
expect(paragraph.height, isNonZero);
});
test('PushStyle should not segfault after build()', () {
test('pushStyle should not segfault after build()', () {
final ParagraphBuilder paragraphBuilder =
ParagraphBuilder(ParagraphStyle());
paragraphBuilder.build();
paragraphBuilder.pushStyle(TextStyle());
});
test('the presence of foreground style should not throw', () {
final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle());
builder.pushStyle(TextStyle(
foreground: Paint()..color = const Color(0xFFABCDEF),
));
builder.addText('hi');
expect(() => builder.build(), returnsNormally);
});
}