minor streamlining of paragraph SkPaint construction

flar · flar · commit 804653aafec2 · 2021-11-02T02:32:45.000-07:00
diff --git a/lib/ui/text/paragraph_builder.cc b/lib/ui/text/paragraph_builder.cc
@@ -453,18 +453,16 @@ void ParagraphBuilder::pushStyle(tonic::Int32List& encoded,
   if (mask & tsBackgroundMask) {
     Paint background(background_objects, background_data);
     if (background.isNotNull()) {
-      SkPaint sk_paint;
       style.has_background = true;
-      style.background = *background.paint(sk_paint);
+      FML_CHECK(background.paint(style.background));
     }
   }
 
   if (mask & tsForegroundMask) {
     Paint foreground(foreground_objects, foreground_data);
     if (foreground.isNotNull()) {
-      SkPaint sk_paint;
       style.has_foreground = true;
-      style.foreground = *foreground.paint(sk_paint);
+      FML_CHECK(foreground.paint(style.foreground));
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -453,18 +453,16 @@ void ParagraphBuilder::pushStyle(tonic::Int32List& encoded,`
`453`	`453`	`if (mask & tsBackgroundMask) {`
`454`	`454`	`Paint background(background_objects, background_data);`
`455`	`455`	`if (background.isNotNull()) {`
`456`		`- SkPaint sk_paint;`
`457`	`456`	`style.has_background = true;`
`458`		`- style.background = *background.paint(sk_paint);`
	`457`	`+ FML_CHECK(background.paint(style.background));`
`459`	`458`	`}`
`460`	`459`	`}`
`461`	`460`
`462`	`461`	`if (mask & tsForegroundMask) {`
`463`	`462`	`Paint foreground(foreground_objects, foreground_data);`
`464`	`463`	`if (foreground.isNotNull()) {`
`465`		`- SkPaint sk_paint;`
`466`	`464`	`style.has_foreground = true;`
`467`		`- style.foreground = *foreground.paint(sk_paint);`
	`465`	`+ FML_CHECK(foreground.paint(style.foreground));`
`468`	`466`	`}`
`469`	`467`	`}`
`470`	`468`