++

Author: jonahwilliams

impeller/aiks/aiks_unittests.cc

@@ -12,7 +12,6 @@
 #include <utility>
 #include <vector>
 
-#include "display_list/dl_paint.h"
 #include "flutter/testing/testing.h"
 #include "gtest/gtest.h"
 #include "impeller/aiks/canvas.h"
@@ -667,7 +666,6 @@ bool RenderTextInCanvasSkia(const std::shared_ptr<Context>& context,
   }
 
   // Create the Impeller text frame and draw it at the designated baseline.
-  flutter::DlPaint paint;
   auto frame = MakeTextFrameFromTextBlobSkia(blob);
 
   Paint text_paint;
@@ -908,7 +906,6 @@ TEST_P(AiksTest, CanRenderTextOutsideBoundaries) {
     {
       auto blob = SkTextBlob::MakeFromString(t.text, sk_font);
       ASSERT_NE(blob, nullptr);
-      flutter::DlPaint paint;
       auto frame = MakeTextFrameFromTextBlobSkia(blob);
       canvas.DrawTextFrame(frame, Point(), text_paint);
     }

impeller/entity/contents/text_contents.cc

@@ -77,7 +77,9 @@ void TextContents::SetTextProperties(Color color,
                                      Join stroke_join,
                                      Scalar stroke_miter) {
   if (frame_->HasColor()) {
-    properties_.color = color;
+    // Alpha is always applied when rendering, remove it here so
+    // we do not double-apply the alpha.
+    properties_.color = color.WithAlpha(1.0);
   }
   if (stroke) {
     properties_.stroke = true;