fixed fuchsia by moving impeller logic into an impeller compiled file

gaaclarke · gaaclarke · commit 992fb70fecb8 · 2023-03-02T17:32:38.000-08:00
diff --git a/lib/ui/painting/image.cc b/lib/ui/painting/image.cc
@@ -8,20 +8,14 @@
 #include <limits>
 
 #if IMPELLER_SUPPORTS_RENDERING
-#include "flutter/impeller/renderer/texture.h"
+#include "flutter/lib/ui/painting/image_encoding_impeller.h"
 #endif
 #include "flutter/lib/ui/painting/image_encoding.h"
 #include "third_party/tonic/converter/dart_converter.h"
 #include "third_party/tonic/dart_args.h"
 #include "third_party/tonic/dart_binding_macros.h"
 #include "third_party/tonic/dart_library_natives.h"
 
-// Must be kept in sync with painting.dart.
-enum ColorSpace {
-  kSRGB,
-  kExtendedSRGB,
-};
-
 namespace flutter {
 
 typedef CanvasImage Image;
@@ -49,15 +43,7 @@ int CanvasImage::colorSpace() {
     return ColorSpace::kSRGB;
   } else if (image_->impeller_texture()) {
 #if IMPELLER_SUPPORTS_RENDERING
-    const impeller::TextureDescriptor& desc =
-        image_->impeller_texture()->GetTextureDescriptor();
-    switch (desc.format) {
-      case impeller::PixelFormat::kB10G10R10XR:  // intentional_fallthrough
-      case impeller::PixelFormat::kR16G16B16A16Float:
-        return ColorSpace::kExtendedSRGB;
-      default:
-        return ColorSpace::kSRGB;
-    }
+    return ImageEncodingImpeller::GetColorSpace(image_->impeller_texture());
 #endif  // IMPELLER_SUPPORTS_RENDERING
   }
 
diff --git a/lib/ui/painting/image.h b/lib/ui/painting/image.h
@@ -14,6 +14,12 @@
 
 namespace flutter {
 
+// Must be kept in sync with painting.dart.
+enum ColorSpace {
+  kSRGB,
+  kExtendedSRGB,
+};
+
 class CanvasImage final : public RefCountedDartWrappable<CanvasImage> {
   DEFINE_WRAPPERTYPEINFO();
   FML_FRIEND_MAKE_REF_COUNTED(CanvasImage);
diff --git a/lib/ui/painting/image_encoding_impeller.cc b/lib/ui/painting/image_encoding_impeller.cc
@@ -163,4 +163,16 @@ void ImageEncodingImpeller::ConvertImageToRaster(
   });
 }
 
+int ImageEncodingImpeller::GetColorSpace(
+    const std::shared_ptr<impeller::Texture>& texture) {
+  const impeller::TextureDescriptor& desc = texture->GetTextureDescriptor();
+  switch (desc.format) {
+    case impeller::PixelFormat::kB10G10R10XR:  // intentional_fallthrough
+    case impeller::PixelFormat::kR16G16B16A16Float:
+      return ColorSpace::kExtendedSRGB;
+    default:
+      return ColorSpace::kSRGB;
+  }
+}
+
 }  // namespace flutter
diff --git a/lib/ui/painting/image_encoding_impeller.h b/lib/ui/painting/image_encoding_impeller.h
@@ -17,6 +17,8 @@ namespace flutter {
 
 class ImageEncodingImpeller {
  public:
+  static int GetColorSpace(const std::shared_ptr<impeller::Texture>& texture);
+
   /// Converts a DlImage to a SkImage.
   /// This should be called from the thread that corresponds to
   /// `dl_image->owning_context()` when gpu access is guaranteed.
