From 16699789caa3b39befaf92f606d772d947e43bdb Mon Sep 17 00:00:00 2001
From: Chinmay Garde <chinmaygarde@google.com>
Date: Thu, 8 Jul 2021 17:53:42 -0700
Subject: [PATCH] Update enum name.

---
 .../impeller/compositor/texture_descriptor.mm      | 13 ++++++-------
 .../src/flutter/impeller/image/compressed_image.cc | 14 +++++++-------
 engine/src/flutter/impeller/image/image.cc         |  4 ++--
 engine/src/flutter/impeller/image/image.h          |  8 ++++----
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/engine/src/flutter/impeller/compositor/texture_descriptor.mm b/engine/src/flutter/impeller/compositor/texture_descriptor.mm
index 70120f615ba..5bdcc81e507 100644
--- a/engine/src/flutter/impeller/compositor/texture_descriptor.mm
+++ b/engine/src/flutter/impeller/compositor/texture_descriptor.mm
@@ -6,18 +6,17 @@
 
 namespace impeller {
 
-std::optional<PixelFormat> FormatForImageResultComponents(
-    Image::Components comp) {
+std::optional<PixelFormat> FormatForImageResultComponents(Image::Format comp) {
   switch (comp) {
-    case Image::Components::Invalid:
+    case Image::Format::Invalid:
       return std::nullopt;
-    case Image::Components::Grey:
+    case Image::Format::Grey:
       return std::nullopt;
-    case Image::Components::GreyAlpha:
+    case Image::Format::GreyAlpha:
       return std::nullopt;
-    case Image::Components::RGB:
+    case Image::Format::RGB:
       return std::nullopt;
-    case Image::Components::RGBA:
+    case Image::Format::RGBA:
       return PixelFormat::kPixelFormat_R8G8B8A8_UNormInt;
   }
   return std::nullopt;
diff --git a/engine/src/flutter/impeller/image/compressed_image.cc b/engine/src/flutter/impeller/image/compressed_image.cc
index 719ba6311ae..6076be69888 100644
--- a/engine/src/flutter/impeller/image/compressed_image.cc
+++ b/engine/src/flutter/impeller/image/compressed_image.cc
@@ -47,27 +47,27 @@ Image CompressedImage::Decode() const {
   /*
    *  Make sure we got a valid component set.
    */
-  auto components = Image::Components::Invalid;
+  auto components = Image::Format::Invalid;
 
   switch (comps) {
     case STBI_grey:
-      components = Image::Components::Grey;
+      components = Image::Format::Grey;
       break;
     case STBI_grey_alpha:
-      components = Image::Components::GreyAlpha;
+      components = Image::Format::GreyAlpha;
       break;
     case STBI_rgb:
-      components = Image::Components::RGB;
+      components = Image::Format::RGB;
       break;
     case STBI_rgb_alpha:
-      components = Image::Components::RGBA;
+      components = Image::Format::RGBA;
       break;
     default:
-      components = Image::Components::Invalid;
+      components = Image::Format::Invalid;
       break;
   }
 
-  if (components == Image::Components::Invalid) {
+  if (components == Image::Format::Invalid) {
     FML_LOG(ERROR) << "Could not detect image components when decoding.";
     return {};
   }
diff --git a/engine/src/flutter/impeller/image/image.cc b/engine/src/flutter/impeller/image/image.cc
index 7ea8b9013af..e8b15cfa5ca 100644
--- a/engine/src/flutter/impeller/image/image.cc
+++ b/engine/src/flutter/impeller/image/image.cc
@@ -9,7 +9,7 @@ namespace impeller {
 Image::Image() = default;
 
 Image::Image(ISize size,
-             Components components,
+             Format components,
              std::shared_ptr<const fml::Mapping> allocation)
     : size_(size), components_(components), allocation_(std::move(allocation)) {
   if (!allocation_ || !size.IsPositive()) {
@@ -28,7 +28,7 @@ const ISize& Image::GetSize() const {
   return size_;
 }
 
-Image::Components Image::GetComponents() const {
+Image::Format Image::GetComponents() const {
   return components_;
 }
 
diff --git a/engine/src/flutter/impeller/image/image.h b/engine/src/flutter/impeller/image/image.h
index 30013542a55..3c3271f5eb5 100644
--- a/engine/src/flutter/impeller/image/image.h
+++ b/engine/src/flutter/impeller/image/image.h
@@ -14,7 +14,7 @@ namespace impeller {
 
 class Image {
  public:
-  enum class Components {
+  enum class Format {
     Invalid,
     Grey,
     GreyAlpha,
@@ -25,7 +25,7 @@ class Image {
   Image();
 
   Image(ISize size,
-        Components components,
+        Format components,
         std::shared_ptr<const fml::Mapping> allocation);
 
   ~Image();
@@ -34,13 +34,13 @@ class Image {
 
   bool IsValid() const;
 
-  Components GetComponents() const;
+  Format GetComponents() const;
 
   const std::shared_ptr<const fml::Mapping>& GetAllocation() const;
 
  private:
   ISize size_;
-  Components components_ = Components::Invalid;
+  Format components_ = Format::Invalid;
   std::shared_ptr<const fml::Mapping> allocation_;
   bool is_valid_ = false;