[Impeller] Revert special character escaping

impeller/compiler/compiler.cc

@@ -481,24 +481,13 @@ const std::vector<std::string>& Compiler::GetIncludedFileNames() const {
   return included_file_names_;
 }
 
-// Escape `%` and `#` characters according to doc comment at
-// https://github.com/ninja-build/ninja/blob/master/src/depfile_parser.cc#L28
-static void EscapeString(std::string& str, std::stringstream& stream) {
-  for (auto it = str.begin(); it != str.end(); it++) {
-    if (*it == '%' || *it == '#') {
-      stream << '\\';
-    }
-    stream << *it;
-  }
-}
-
 static std::string JoinStrings(std::vector<std::string> items,
                                std::string separator) {
   std::stringstream stream;
   for (size_t i = 0, count = items.size(); i < count; i++) {
     const auto is_last = (i == count - 1);
 
-    EscapeString(items[i], stream);
+    stream << items[i];
     if (!is_last) {
       stream << separator;
     }

impeller/compiler/compiler_test.cc

@@ -58,37 +58,6 @@ static std::string SLFileName(const char* fixture_name,
   return stream.str();
 }
 
-static std::string DepfileName(const char* fixture_name) {
-  std::stringstream stream;
-  stream << fixture_name << ".d";
-  return stream.str();
-}
-
-bool CompilerTest::ValidateDepfileEscaped(const char* fixture_name) const {
-  auto depfile_name = DepfileName(fixture_name);
-  auto mapping = std::make_unique<fml::FileMapping>(
-      fml::OpenFile(intermediates_directory_, depfile_name.c_str(), false,
-                    fml::FilePermission::kRead));
-
-  std::string contents(reinterpret_cast<char const*>(mapping->GetMapping()),
-                       mapping->GetSize());
-  bool escaped = false;
-  for (auto it = contents.begin(); it != contents.end(); it++) {
-    if (*it == '\\') {
-      escaped = true;
-    } else if (*it == '%' || *it == '#') {
-      if (!escaped) {
-        VALIDATION_LOG << "Unescaped character " << *it << " in depfile.";
-        return false;
-      }
-      escaped = false;
-    } else {
-      escaped = false;
-    }
-  }
-  return true;
-}
-
 std::unique_ptr<fml::FileMapping> CompilerTest::GetReflectionJson(
     const char* fixture_name) const {
   auto filename = ReflectionJSONName(fixture_name);
@@ -197,13 +166,6 @@ bool CompilerTest::CanCompileAndReflect(const char* fixture_name,
       return false;
     }
   }
-
-  auto mapping = compiler.CreateDepfileContents({fixture_name});
-  if (!fml::WriteAtomically(intermediates_directory_,
-                            DepfileName(fixture_name).c_str(), *mapping)) {
-    VALIDATION_LOG << "Could not write depfile.";
-    return false;
-  }
   return true;
 }
 

impeller/compiler/compiler_test.h

@@ -28,8 +28,6 @@ class CompilerTest : public ::testing::TestWithParam<TargetPlatform> {
       const char* fixture_name,
       SourceType source_type = SourceType::kUnknown) const;
 
-  bool ValidateDepfileEscaped(const char* fixture_name) const;
-
  private:
   fml::UniqueFD intermediates_directory_;
 

impeller/compiler/compiler_unittests.cc

@@ -65,11 +65,6 @@ TEST_P(CompilerTest, MustFailDueToMultipleLocationPerStructMember) {
   ASSERT_FALSE(CanCompileAndReflect("struct_def_bug.vert"));
 }
 
-TEST_P(CompilerTest, ShaderWithSpecialCharactersHasEscapedDepfile) {
-  ASSERT_TRUE(CanCompileAndReflect("sa\%m#ple.vert"));
-  ASSERT_TRUE(ValidateDepfileEscaped("sa\%m#ple.vert"));
-}
-
 TEST_P(CompilerTest, BindingBaseForFragShader) {
   if (GetParam() == TargetPlatform::kFlutterSPIRV) {
     // This is a failure of reflection which this target doesn't perform.

lib/ui/fixtures/shaders/general_shaders/BUILD.gn

@@ -11,7 +11,6 @@ if (enable_unittests) {
     "blue_green_sampler.frag",
     "children_and_uniforms.frag",
     "functions.frag",
-    "functions%20with_space.frag",
     "no_builtin_redefinition.frag",
     "no_uniforms.frag",
     "simple.frag",

testing/dart/fragment_shader_test.dart

@@ -24,16 +24,6 @@ void main() async {
     _expectShaderRendersGreen(shader);
   });
 
-  test('simple shader with space in key renders correctly', () async {
-    final FragmentProgram program = await FragmentProgram.fromAsset(
-      'functions with_space.frag.iplr',
-    );
-    final Shader shader = program.shader(
-      floatUniforms: Float32List.fromList(<double>[1]),
-    );
-    _expectShaderRendersGreen(shader);
-  });
-
   test('blue-green image renders green', () async {
     final FragmentProgram program = await FragmentProgram.fromAsset(
       'blue_green_sampler.frag.iplr',