From a0f418b7690486e45ca0b56fca7afcb158d72a60 Mon Sep 17 00:00:00 2001
From: Mouad Debbar <mouad.debbar@gmail.com>
Date: Fri, 5 Mar 2021 17:38:19 -0800
Subject: [PATCH] [web] Don't set both color and foreground at the same time
 (flutter/engine#24828)

---
 .../lib/web_ui/lib/src/engine/text/canvas_paragraph.dart      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/text/canvas_paragraph.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/text/canvas_paragraph.dart
index 5ef68420610..ce9e1319606 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/text/canvas_paragraph.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/text/canvas_paragraph.dart
@@ -403,7 +403,7 @@ abstract class StyleNode {
     return style;
   }
 
-  ui.Color get _color;
+  ui.Color? get _color;
   ui.TextDecoration? get _decoration;
   ui.Color? get _decorationColor;
   ui.TextDecorationStyle? get _decorationStyle;
@@ -439,7 +439,7 @@ class ChildStyleNode extends StyleNode {
   // property isn't defined, go to the parent node.
 
   @override
-  ui.Color get _color => style._color ?? parent._color;
+  ui.Color? get _color => style._color ?? (_foreground == null ? parent._color : null);
 
   @override
   ui.TextDecoration? get _decoration => style._decoration ?? parent._decoration;