Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup Skia includes in image_generator/descriptor #38775

Merged
merged 2 commits into from
Jan 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions lib/ui/painting/image_descriptor.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -38,7 +39,7 @@ class ImageDescriptor : public RefCountedDartWrappable<ImageDescriptor> {
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
Expand Down
1 change: 1 addition & 0 deletions lib/ui/painting/image_generator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <utility>

#include "flutter/fml/logging.h"
#include "third_party/skia/include/core/SkBitmap.h"

namespace flutter {

Expand Down
6 changes: 5 additions & 1 deletion lib/ui/painting/image_generator.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,13 @@

#include <optional>
#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 {

Expand Down