From 3ebb04d82e37eaeeac4d2cb4518ae5eda8cdc845 Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Wed, 11 Jan 2023 08:31:43 -0500 Subject: [PATCH 1/2] Cleanup skia includes in image_generator/descriptor --- lib/ui/painting/image_descriptor.h | 9 +++++---- lib/ui/painting/image_generator.cc | 2 ++ lib/ui/painting/image_generator.h | 6 +++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/ui/painting/image_descriptor.h b/lib/ui/painting/image_descriptor.h index c712f247df7bc..dc35d73d8d838 100644 --- a/lib/ui/painting/image_descriptor.h +++ b/lib/ui/painting/image_descriptor.h @@ -13,10 +13,11 @@ #include "flutter/lib/ui/dart_wrapper.h" #include "flutter/lib/ui/painting/image_generator_registry.h" #include "flutter/lib/ui/painting/immutable_buffer.h" -#include "third_party/skia/include/codec/SkCodec.h" -#include "third_party/skia/include/core/SkImageGenerator.h" +#include "third_party/skia/include/core/SkData.h" +#include "third_party/skia/include/core/SkImage.h" #include "third_party/skia/include/core/SkImageInfo.h" -#include "third_party/skia/src/codec/SkCodecImageGenerator.h" +#include "third_party/skia/include/core/SkPixmap.h" +#include "third_party/skia/include/core/SkSize.h" #include "third_party/tonic/dart_library_natives.h" namespace flutter { @@ -38,7 +39,7 @@ class ImageDescriptor : public RefCountedDartWrappable { kBGRA8888, }; - /// @brief Asynchronously initlializes an ImageDescriptor for an encoded + /// @brief Asynchronously initializes an ImageDescriptor for an encoded /// image, as long as the format is recognized by an encoder installed /// in the `ImageGeneratorRegistry`. Calling this method will create /// an `ImageGenerator` and read EXIF corrected dimensions from the diff --git a/lib/ui/painting/image_generator.cc b/lib/ui/painting/image_generator.cc index d8dbe8371b4e2..572a7467336ba 100644 --- a/lib/ui/painting/image_generator.cc +++ b/lib/ui/painting/image_generator.cc @@ -7,6 +7,8 @@ #include #include "flutter/fml/logging.h" +#include "third_party/skia/include/core/SkBitmap.h" + namespace flutter { diff --git a/lib/ui/painting/image_generator.h b/lib/ui/painting/image_generator.h index 13b93fc94c3dc..4a57302e39dde 100644 --- a/lib/ui/painting/image_generator.h +++ b/lib/ui/painting/image_generator.h @@ -7,9 +7,13 @@ #include #include "flutter/fml/macros.h" +#include "third_party/skia/include/codec/SkCodec.h" #include "third_party/skia/include/codec/SkCodecAnimation.h" +#include "third_party/skia/include/core/SkData.h" +#include "third_party/skia/include/core/SkImage.h" #include "third_party/skia/include/core/SkImageInfo.h" -#include "third_party/skia/src/codec/SkCodecImageGenerator.h" +#include "third_party/skia/include/core/SkSize.h" +#include "third_party/skia/src/codec/SkCodecImageGenerator.h" // nogncheck namespace flutter { From 1d00882ae1f836682f675677d6389f93607dfa3a Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Wed, 11 Jan 2023 08:32:24 -0500 Subject: [PATCH 2/2] format --- lib/ui/painting/image_generator.cc | 1 - lib/ui/painting/image_generator.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/ui/painting/image_generator.cc b/lib/ui/painting/image_generator.cc index 572a7467336ba..e5648fc24a97b 100644 --- a/lib/ui/painting/image_generator.cc +++ b/lib/ui/painting/image_generator.cc @@ -9,7 +9,6 @@ #include "flutter/fml/logging.h" #include "third_party/skia/include/core/SkBitmap.h" - namespace flutter { ImageGenerator::~ImageGenerator() = default; diff --git a/lib/ui/painting/image_generator.h b/lib/ui/painting/image_generator.h index 4a57302e39dde..4792f3b374b92 100644 --- a/lib/ui/painting/image_generator.h +++ b/lib/ui/painting/image_generator.h @@ -13,7 +13,7 @@ #include "third_party/skia/include/core/SkImage.h" #include "third_party/skia/include/core/SkImageInfo.h" #include "third_party/skia/include/core/SkSize.h" -#include "third_party/skia/src/codec/SkCodecImageGenerator.h" // nogncheck +#include "third_party/skia/src/codec/SkCodecImageGenerator.h" // nogncheck namespace flutter {