From f3f2d9eb95a02da6f4097c0a9708112753373275 Mon Sep 17 00:00:00 2001 From: Mouad Debbar Date: Wed, 13 Jan 2021 13:00:23 -0800 Subject: [PATCH 1/2] [web] Reland: Enable the new rich paragraph implementation --- lib/web_ui/lib/src/engine/web_experiments.dart | 2 +- lib/web_ui/test/engine/web_experiments_test.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/web_ui/lib/src/engine/web_experiments.dart b/lib/web_ui/lib/src/engine/web_experiments.dart index fb5f1a40b637c..058600987bf0f 100644 --- a/lib/web_ui/lib/src/engine/web_experiments.dart +++ b/lib/web_ui/lib/src/engine/web_experiments.dart @@ -45,7 +45,7 @@ class WebExperiments { static const bool _defaultUseCanvasRichText = const bool.fromEnvironment( 'FLUTTER_WEB_USE_EXPERIMENTAL_CANVAS_RICH_TEXT', - defaultValue: false, + defaultValue: true, ); bool _useCanvasRichText = _defaultUseCanvasRichText; diff --git a/lib/web_ui/test/engine/web_experiments_test.dart b/lib/web_ui/test/engine/web_experiments_test.dart index 5102846e5c84e..c38de84767e7e 100644 --- a/lib/web_ui/test/engine/web_experiments_test.dart +++ b/lib/web_ui/test/engine/web_experiments_test.dart @@ -11,7 +11,7 @@ import 'package:test/test.dart'; import 'package:ui/src/engine.dart'; const bool _defaultUseCanvasText = true; -const bool _defaultUseCanvasRichText = false; +const bool _defaultUseCanvasRichText = true; void main() { internalBootstrapBrowserTest(() => testMain); From 8b42f6bccc21a43dee716e6e55df1200d49453b1 Mon Sep 17 00:00:00 2001 From: Mouad Debbar Date: Wed, 13 Jan 2021 15:00:57 -0800 Subject: [PATCH 2/2] fix test failure caused by the recent text cutoff fix --- lib/web_ui/test/golden_tests/engine/canvas_golden_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/web_ui/test/golden_tests/engine/canvas_golden_test.dart b/lib/web_ui/test/golden_tests/engine/canvas_golden_test.dart index d8d1f1ce07fcc..b5604b81e68de 100644 --- a/lib/web_ui/test/golden_tests/engine/canvas_golden_test.dart +++ b/lib/web_ui/test/golden_tests/engine/canvas_golden_test.dart @@ -230,7 +230,7 @@ void testMain() async { canvas.drawParagraph(paragraph, const Offset(180, 50)); expect( - canvas.rootElement.querySelectorAll('p').map((e) => e.innerText).toList(), + canvas.rootElement.querySelectorAll('p').map((e) => e.text).toList(), [text], reason: 'Expected to render text using HTML', );