From 2b48a800e3228dd22a24c8d2042c1e9bbc8ec484 Mon Sep 17 00:00:00 2001
From: Dan Field <dnfield@google.com>
Date: Wed, 20 Apr 2022 16:58:55 -0700
Subject: [PATCH] Fix up build/test issues when building on or off of mac
 (#148)

---
 impeller/BUILD.gn                               | 8 ++++++--
 impeller/compiler/utilities.cc                  | 2 +-
 impeller/display_list/display_list_unittests.cc | 2 +-
 impeller/playground/playground.cc               | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/impeller/BUILD.gn b/impeller/BUILD.gn
index 76e0d6c249875..11c78699bda27 100644
--- a/impeller/BUILD.gn
+++ b/impeller/BUILD.gn
@@ -18,7 +18,11 @@ config("impeller_public_config") {
   }
 
   if (is_win) {
-    defines += [ "_USE_MATH_DEFINES" ]
+    defines += [
+      "_USE_MATH_DEFINES",
+      # TODO(dnfield): https://github.com/flutter/flutter/issues/50053
+      "_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING",
+    ]
   }
 }
 
@@ -50,7 +54,6 @@ executable("impeller_unittests") {
     "base:base_unittests",
     "blobcat:blobcat_unittests",
     "compiler:compiler_unittests",
-    "fixtures",
     "geometry:geometry_unittests",
 
     # FML depends on the Dart VM for tracing and getting the current
@@ -63,6 +66,7 @@ executable("impeller_unittests") {
       "aiks:aiks_unittests",
       "display_list:display_list_unittests",
       "entity:entity_unittests",
+      "fixtures",
       "image:image_unittests",
       "playground",
       "renderer:renderer_unittests",
diff --git a/impeller/compiler/utilities.cc b/impeller/compiler/utilities.cc
index a191eb9a7520e..11b9dd23cfd52 100644
--- a/impeller/compiler/utilities.cc
+++ b/impeller/compiler/utilities.cc
@@ -4,9 +4,9 @@
 
 #include "impeller/compiler/utilities.h"
 
+#include <cctype>
 #include <filesystem>
 #include <sstream>
-#include <string>
 
 namespace impeller {
 namespace compiler {
diff --git a/impeller/display_list/display_list_unittests.cc b/impeller/display_list/display_list_unittests.cc
index 425e7dfe4af7b..a9bf5b4335df4 100644
--- a/impeller/display_list/display_list_unittests.cc
+++ b/impeller/display_list/display_list_unittests.cc
@@ -176,7 +176,7 @@ TEST_P(DisplayListTest, StrokedPathsDrawCorrectly) {
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
 
-TEST_F(DisplayListTest, CanDrawWithMaskBlur) {
+TEST_P(DisplayListTest, CanDrawWithMaskBlur) {
   auto texture = CreateTextureForFixture("embarcadero.jpg");
   flutter::DisplayListBuilder builder;
 
diff --git a/impeller/playground/playground.cc b/impeller/playground/playground.cc
index e843a6ee5c64b..f92aa0654dfe2 100644
--- a/impeller/playground/playground.cc
+++ b/impeller/playground/playground.cc
@@ -37,7 +37,7 @@ std::string PlaygroundBackendToString(PlaygroundBackend backend) {
 Playground::Playground()
     : impl_(PlaygroundImpl::Create(GetParam())),
       renderer_(impl_->CreateContext()),
-      is_valid_(Playground::is_enabled() && renderer_.IsValid()) {}
+      is_valid_(renderer_.IsValid()) {}
 
 Playground::~Playground() = default;